/srv/irclogs.ubuntu.com/2009/06/15/#bzr.txt

* Peng_ sneaks /away00:00
jelmervisik7: I've looked into having the Bazaar smart server run over jabber00:00
jelmervisik7: Unfortunately it's only possible to offer services to particular people using XMPP, it's not possible to announce that you're running a Bazaar smart server00:01
jelmerlifeless: btw, related to your [RFC] history editing vs history presentation post, did you see the recent blog post from Linus about workflows in Linux ?00:02
lifelessno, url me up please00:04
james_whttp://torvalds-family.blogspot.com/2009/06/happiness-is-warm-scm.html00:05
jelmerlifeless: and in particular this rant that he links: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html00:05
lifelessthanks00:08
jelmer"Don't change history" may not be very novel in the Bazaar world, but as a git user I found that rant quite useful.00:09
jelmerI'm getting more and more convinced that what people really seem to want is well-working looms for in-progress patches00:09
mwhudsonthe main difference for me from the rant is that merging trunk at 'random' points is ok because trunk is always clean00:09
ftajelmer, hi00:11
jmljelmer: I'm people, and I certainly want that :)00:15
RenatoSilvaI'm looking for a project hosting. I'm considering cvs, svn, hg, bzr and git hostings. I know Google Code, Gitorious and Github for now. Any other suggestions?00:18
poolieRenatoSilva: launchpad.net00:18
AfCRenatoSilva: you don't really need much to host a DVCS branch, certainly not a bzr one. Just a web server and a ssh account, and you can easily host your work.00:22
RenatoSilvapoolie: last time I've checked launckpad I'd have to do complicated stuff to set up my repo, and with some limitations (like I can't put exe files there)...00:26
Peng_RenatoSilva: .....What?00:27
RenatoSilvaYeah, I don't remeber well00:27
RenatoSilvaMaybe I was confused00:27
RenatoSilvaBut how is the set up process today?00:27
RenatoSilvaWhat repos, limitations?00:27
RenatoSilvaI'm afraid only bazaar is supported00:28
lifelessRenatoSilva: setup your project; then bzr push lp:~USERNAME/PROJECT/BRANCHNAME00:28
RenatoSilvadoes it have issue tracker, wiki, and other secondary infra-structure?00:28
lifelessyes no yes00:29
lifelessjelmer: thanks for that link00:31
RenatoSilvalifeless: I'll take a look again, thanks00:32
RenatoSilvaDo you guys think LaunchPad is better than BitBucket?00:32
lifelessyes00:33
RenatoSilvawhy00:33
garyvdmRenatoSilva: You probably will get a very biased answer to that question here.00:33
garyvdmRenatoSilva: I like it. I have never used BitBucket - so I can't compare.00:34
lifelesswell, for starters lp supports bzr. More broadly it has mailing lists, translations and integration with build farms00:35
lifelessAlso, I work @ Canonical so my answer is likely biased :).00:35
lifelessrandom data point - bitbucket has 4000 projects on it apparently, lp has 1200000:37
RenatoSilvaI just don't know why would I want to choose one of bzr, hg, and git rather than other00:37
RAOFI _don't_ work at Canonical, and I'd also recommend launchpad.  It's nicely integrated, it's development is reasonably consistent, and the bzr integration is very useful.00:38
jmlpoolie: btw, I'll be sending a few different release related emails out today.00:38
lifelessRenatoSilva: so choose one; it doesn't matter which. If you find it doesn't work well and the community isn't helpful for you, swiwtch.00:38
lifelesspoolie: In about 10 minutes I'll be going nose-down on check with the world turned off.00:39
* SamB sends jelmer a bzr-svn patch00:39
RenatoSilvalifeless: maybe hg, because Moin uses hg, and my projects are moin plugins00:39
RenatoSilvabut I'd like to use cvs because I'm already using it at work00:40
lifelesspoolie: so if you have stuff you want to chat about, earlier >> later :)00:40
lifelessRenatoSilva: unless you're merging with moin it won't matter that moin is in hg and your plugins aren't.00:40
RenatoSilvais it possible to work with vcs's over http?00:40
lifelessRenatoSilva: using CVS is worse than using any of bzr/hg/git: CVS has many performance issues, few correctness guarantees, is problematic for sysadmins.00:41
RenatoSilvamy work deny access to other ports00:41
lifelessRenatoSilva: to varying degrees, yes. Bzr supports read and write over http. However, *launchpad* hasn't deployed the write module for http.00:42
igc1morning all00:43
=== igc1 is now known as igc
RenatoSilvalifeless: yeah, I mean commit over http. It would be really nice don't you think00:44
lifelessRenatoSilva: mwhudson here can tell you about that vis-a-vis launchpad ;)00:46
lifelessAFAIK its not in the pipeline at the moment.00:46
garyvdmRenatoSilva: you can push to launchpad over ssh - that is quite a common port - If I was you I would check if that is open.00:47
mwhudsonyeah, would be nice00:47
mwhudsonno time though00:47
lifelessmwhudson: btw why were you asking about doing reconcile on launchpad?00:48
mwhudsonlifeless: i thought if it was an overnight job, i could have done it last night00:48
lifelessmwhudson: yes but why are you doing it?00:48
mwhudsonlifeless: it didn't seem like a bad thing to do00:48
lifelessah00:49
lifelessits not, just very expensive00:49
RenatoSilvalifeless: since you work at canonical (which country btw?), I'd suggest you wiki for projects documentation00:49
mwhudsonright00:49
lifelessmwhudson: I'm working on check [a precursor to reconcile] at the moment.00:49
RenatoSilvagaryvdm: I will check if ssh is allowed, tahnks00:49
mwhudsonlifeless: yeah, i know00:49
lifelessRenatoSilva: yes, the developers of launchpad would like to do something along wiki lines00:49
lifelessRenatoSilva: time & design are still up in the air, last that I heard.00:50
lifelessok, nose grinding time. If anyone needs me, SMS please.00:50
RenatoSilvalifeless: if you're going to use moin, you may want to wait for the 2.0 release00:51
mwhudsonRenatoSilva: it's pretty unlikely that lifeless is going to be doing the wiki work00:52
RenatoSilvamwhudson: it's just a suggestion to the wiki guys, he could tell them00:54
RenatoSilvawhere is canonical? London?00:55
garyvdmRenatoSilva: Canonical is registered in the Isle of man, It's head office is in London, but it is a virtual company with most of it employees are from all over the world.00:58
garyvdmAlot of the bzr developers are from Australia00:58
garyvdmRenatoSilva: p.s. I don't work for Canonical.00:59
poolie(back)01:09
poolielifeless: i don't think i want to talk to you urgently01:09
pooliejml, hi, how did you go with the release? want to talk?01:11
* RenatoSilva had an energy crash01:13
jmlpoolie: would love to talk. maybe give me 15-30mins to finish up what I'm doing now?01:13
poolieok01:15
poolieigc, how are you doing today?01:15
igchi poolie - ok thanks01:16
igcpoolie: slept most the weekend so that helps01:16
RenatoSilvaoh, BitBucket is paid, agh.01:21
pooliegaryvdm, igc, i'm using explorer01:22
poolieit's really nice!01:22
garyvdmpoolie: Great!01:22
pooliei wish there was a way to get it to open a browser on the branch's launchpad page01:22
igcpoolie: thanks01:22
poolieor, generically, it's web page, like lp-open01:22
poolieor is there?01:22
igcpoolie: it got zero love over the weekend - too tired sorry01:23
jmlit's really easy to do :)01:23
igcpoolie: we could add that pretty easily01:23
garyvdmigc: I don't think qbzr would need to be extended. You can just run bzr lp-open01:23
igcgaryvdm: right01:24
=== Kissaki is now known as Kissaki^0ff
poolieigc oh it wasn't a complaint01:24
pooliespiv: hi, good morning01:25
pooliespiv, i was wondering on the weekend, where did aaron get up to with the subtree design docs?01:25
pooliedo you know?01:25
garyvdmigc, poolie: What I'm planning to do qmain is to have lots of lp related functionality, but have it implemented in a separate plugin.01:26
garyvdm*to do for qmain01:26
RenatoSilvaBitBucket's HTTP push/pull is commit / checkout over HTTP?01:26
RenatoSilvacheckout / commit01:26
igcgaryvdm: sounds good01:26
igcgaryvdm: and don't forget that explorer let's plugins add their own panels simply by registering them01:27
garyvdmRenatoSilva: with a dvcs, you generally commit to your local repository, and then push that to your central branch01:27
spivpoolie: I'm not sure; there was a small amount of chatter on the list I think (on a tangentially related thread about "merge --pull")01:27
RenatoSilvagaryvdm: ok, but over http?01:28
RenatoSilvagaryvdm: in bitbucket I mean01:28
garyvdmI don't know01:29
spivpoolie: I haven't heard much, although I think we committed the version of the doc we had at the end of UDS (in the devnotes branch)01:29
garyvdmI don't know if they let you push over http01:29
garyvdmI'm sure they let you pull over http though.01:29
garyvdmRenatoSilva: I think you need the bzr-webdav plugin to push to http with bzr01:30
spivpoolie: IIRC we had reached decisions that were acceptable to both of us for all the questions in the "unanswered questions" section, and Aaron was intending on going through all the use cases at the end of the doc and writing the commands to demonstrate how they'd work.01:31
spiv(and thus verify that the use case was actually satisfied)01:31
RenatoSilvagaryvdm: launchpad could include such feature01:31
pooliejml, as RM, https://code.edge.launchpad.net/~mbp/bzr/doc/+merge/742901:31
poolieok that'd be good01:31
jmlpoolie: what happened to the '|' line prefix?01:32
garyvdmRenatoSilva: In theory - yes. I don't think it would be high on their priority.01:32
pooliei removed it so you can more easily copy the text01:33
jmlpoolie: it wasn't necessary for formatting then?01:33
pooliei think it changes it from the equivalent of <blockquote> to <pre>01:34
garyvdmRenatoSilva: as mwhudson said re http push > "yeah, would be nice, no time though"01:34
jmlpoolie: ok. looks good to me.01:34
mwhudsongaryvdm: you don't need webdav, there's bzr+http01:35
RenatoSilvagaryvdm: yeah, :(01:35
RenatoSilvagaryvdm: however would that be hard? It's just about installing the plugin and setting up the http server right?01:36
spivRenatoSilva: and figuring out how to handle authentication01:37
garyvdmmwhudson: Ah - yes.01:38
RenatoSilvaok, anyway, it's a suggestion01:38
mwhudsonand performance implications01:38
lifelesspoolie: are you on the pone at the moment?01:38
lifelessgaryvdm: webdav is not what lp would use01:39
lifelessgaryvdm: lp would use bzr+http - the smart server.01:39
garyvdmyes01:39
lifelessRenatoSilva: launchpad has scaling to consider; its not the same problem for a hosting site that it would be for a single user wanting commit-over-http.01:39
RenatoSilvalifeless: ok01:41
RenatoSilvaas I said: suggestion01:41
lifelesssure. As already discussed its desired but not done yet.01:41
RenatoSilvaok01:42
RenatoSilvalifeless: BitBucket has this feature01:42
mwhudsonRenatoSilva: like everyone, we have a much longer list of things we'd like to do than we have time to do01:43
mwhudsonRenatoSilva: the things you've been mentioning are already on our list :)01:43
RenatoSilvaok thank you01:43
jmlpoolie: want to talk?01:50
igcbbiab01:56
RenatoSilvaSince bzr is a dvcs, but at work I can only use bzr over http, which is not supported by launchpap, I could do the following: have two repos, one at work, and another at launchpad. When changing my code at work, I commit locally, then I take the repo home, and then I push it to launchpad. Is this ok?01:57
thumperRenatoSilva: you could always push home if you install bzr-webdav for http pushes from work with a post push hook to push to LP :)01:58
RenatoSilvathumper: but is my procedure ok too?01:59
* thumper dumps and runs01:59
RenatoSilvaam I realizing it well?01:59
thumperRenatoSilva: sure01:59
RenatoSilvaah ok01:59
RenatoSilvathumper: to carry the repo home by email or pendrive is more easy procedure than pushing twice, isn't it?02:00
thumperis it?02:00
RenatoSilvathumper: I imagine it's just about copying the files02:00
garyvdmRenatoSilva: What thumper was saying is that you can set up you home server so that when you push to it, it automatically pushes to launch pad02:01
RenatoSilvathumper: keep my PC online is a non-go02:01
RenatoSilvagaryvdm: ^02:01
RenatoSilvagaryvdm: oh...02:01
RenatoSilvagaryvdm: I see02:01
thumperRenatoSilva: ok, in which case a pen-drive repo is a good idea02:02
RenatoSilvagaryvdm: seems nice02:02
garyvdmthumper: - I think you would need to use a on tip change hook to do that.02:03
RenatoSilvaDoes a push push the history, or does it work like a "commit" of the local HEAD?02:03
thumpergaryvdm: sure, but it'd work02:03
SamBRenatoSilva: it pushes history, yes02:04
thumperRenatoSilva: push pushes all the revisions that the remote repo doesn't know about02:04
RenatoSilvaSamB: oh, nice then02:04
RenatoSilvaNow I can forget BitBucket02:04
SamBbut if you had any uncommitted changes, it would not push them02:04
RenatoSilvaSamB: ok, we just have to commit locally before pushing...02:05
SamBwhich is generally a good thing, unless you lose the working directory ;-)02:05
RenatoSilvaIs bzr easy to learn? If I read a quick guide (where?) in 20 minutes, would I be able to set up a project in launchpad and do the basics (including the above procedure)?02:07
garyvdmRenatoSilva: Oh yes02:07
* garyvdm finds url to quickstart guide02:07
garyvdmbzr in 5 min: http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html02:08
thumperwhat format string should I use for a new bbc format with the 1.16rc for `bzr init-repo --no-trees --2.0?`02:08
RenatoSilvagaryvdm: thank you, I just found it at the same time. I hope it's enougth02:09
Peng_thumper: --2a maybe?02:09
Peng_thumper: What do you mean?02:10
RenatoSilvais http://bazaar-vcs.org/BzrEclipse usable?02:11
RenatoSilvastable?02:11
thumperPeng: I mean that I used to say --development-rich-root02:12
thumperPeng: but now we have an alpha format02:12
thumperPeng: I was wondering what the short name is for the init-repo commadn02:12
garyvdmRenatoSilva: I believe so. (I don't use Eclipse)02:13
garyvdmRenatoSilva: you may also want to look at http://bazaar-vcs.org/QBzrEclipse02:13
RenatoSilvagaryvdm: ok thanks02:18
RenatoSilvaok, I'm leaving. Thank you guys for the help. Bye.02:20
jmlpoolie: I guess you missed my earlier ping.02:59
pooliehi03:00
pooliewas on the phone03:00
poolietalk in 15m?03:00
poolieor maybe just now?03:00
=== garyvdm_ is now known as garyvdm
igcabentley: please bounce bb when you get a chance03:47
* igc lunch04:09
garyvdmigc: Please can you subscribe to the qbzr mailing list with you @internode.on.net addresses so that we we have to manually approve messages sent with that address?04:35
garyvdm*your04:35
garyvdm+ a don04:35
garyvdm+ a don't in there somewhere...04:36
fullermdSpeaking of qbzr...04:37
fullermdI had qlog croaking yesterday...04:37
garyvdmfullermd: On the latest of lp:qbzr?04:38
pooliejml, when you file bugs, please mark them confirmed and set some reasonable priority04:38
* fullermd checks to see if it's repeatable.04:38
pooliesomeone else can always override you if they disagree04:38
garyvdmfullermd: maybe bug 38661804:38
ubottuLaunchpad bug 386618 in qbzr "[regression] qlog FILE is broken for files from qbzr src (trunk revno.770)" [Critical,Fix committed] https://launchpad.net/bugs/38661804:38
poolielike bug 38711704:38
ubottuLaunchpad bug 387117 in bzr "ListOption doesn't respect param_name" [Undecided,New] https://launchpad.net/bugs/38711704:39
jmlpoolie: ahh ok.04:40
fullermdHm.  Well, it doesn't do it now...04:40
jmlpoolie: bzr doesn't use the New status as a drive-to-zero style inbox then?04:40
fullermdYeah, going back to r774 gives what I remember.  So I guess it's fixed  :)04:41
garyvdm:-)04:41
igcgaryvdm: done04:50
garyvdmthanks04:51
pooliejml, in practice no05:05
pooliei have mixed feelings about whether we should05:05
pooliehowever, whatever we're doing with it, there's no point having another roundtrip when a developer files a bug to classify it05:06
poolieany of us including you can make an assessment of a bug we're filing05:06
jml:D05:12
bialixhi, I want to use http://en.wikipedia.org/wiki/Bazaar_(software) to improve Russian wikipedia page. Can somebody confirm this page is enough up-to-date?05:46
bialixgaryvdm: hi05:49
garyvdmHi bialix05:49
bialixI'm thinking about your revision selector05:49
bialixyour approach is interesting, I'm just want to ask why we don't want to use existing qlog for this?05:50
garyvdmYes - that is a option.05:51
bialixe.g. when user need to select revision then we open separate qlog-like window and allow to select revision or range of revisions there?05:51
garyvdmigc also had some ideas regarding this.05:51
bialixwe can remove some elements, e.g. search05:51
* bialix looks05:51
bialixdo you have bug number by hands?05:52
garyvdmI'm not sure If loged a bug - let me see05:52
bialixpoolie: around?05:52
bialixgaryvdm: it's indeed files05:52
bialixfiled05:53
bialixBug #32859805:53
ubottuLaunchpad bug 328598 in qbzr "Create a revisions selector widget. Use in commands like push/pull." [Medium,In progress] https://launchpad.net/bugs/32859805:53
bialixwell, using igc suggestion it's really make sense to create separate window to select05:54
bialixwhile I'm not sure about date05:55
garyvdmSo whether we display a dialog or a custom widget in a combo box does not mater too much05:55
bialixwhy somebody need date when there is full log?05:55
garyvdmThe latter is easer.05:55
bialixum, no the difference is huge05:55
bialixqlog-like dialog allow you to browse revisions, see their details and get the diff05:56
bialixeverything like in qlog05:56
bialixIIUC combobox only allow you to see summary for revisions05:56
garyvdmHe want's the date option so we cater for people who have branches that take a very long time to load like mysql/ooo05:56
garyvdmbialix: yes - a dialog gives a more space to work with.05:57
bialixah, this makes sense for Date then05:58
garyvdmI'm thinking in my mind: tabs at the top to select Revno (log) | Date | Tag | Other (branch:, submit: etc)05:59
pygigaryvdm: tabs are evil :-/06:00
bialixsuch construct is better suited for separate dialog IMO06:00
bialixpygi: not in this case06:00
garyvdmLineEdit at the bottom to the left of the ok button - which shows you what you have selected/can edit manualy.06:00
garyvdmHi pygi06:01
garyvdmbialix: do you have any gdb skills06:01
bialixLineEdit is OK06:01
bialixa bit06:01
igchi bialix, pygi, garyvdm06:01
bialixhi igc06:01
bialixglad to see you06:01
bialixI hope you're better06:01
igcbialix: I am thanks06:01
bialixigc, you send some mails from you internode account06:02
bialixthis address is not subscribed to qbzr ml06:02
igcbialix: it should be now06:02
bialixI've tried to subscribe you directly but can't06:02
bialixok06:02
garyvdmbialix: ha ha - I asked igc to subscribe that acocunt just now :-)06:02
igcthanks to garyvdm pointing that out earlier :-)06:02
bialixgaryvdm: :-D06:03
bialixigc, can you confirm http://en.wikipedia.org/wiki/Bazaar_(software) this page is good enough to use for translation to Russian?06:03
bialixwe desperately need to improve Russian wiki page06:04
bialixit's hard to write something original in wikipedia, so I've decided to just translate English one06:04
garyvdmbialix: I'm getting a segfault with some code I have written. I can't figure out how to get gdb to give me a stack trace.06:04
bialixsegfault or traceback?06:05
garyvdmbialix: I can spot 1 error - I think bzr-git is more advanced than it claims.06:05
bialixhmmm06:06
garyvdmI'm getting a segfault - and I want to get a trackback for that segfault06:06
bialixI'm not sure I understand correctly06:06
bialixusually when you get segfault the python died, is not?06:06
garyvdmYes \06:06
bialixso you can't get traceback06:06
garyvdmApparently you can with gdb - but I can't figure out how.06:07
bialixoh06:07
bialixsorry06:07
bialixI've misread first time06:07
bialixgdb, not pdb06:07
bialixno, sorry06:08
garyvdmOk - never mind - I should probably go and read the manuals....06:08
bialixmy linux skills is rather small06:08
igcbialix: that page looks ok to me06:08
bialixso I'll translate it, thanks igc06:08
garyvdmThe code that is segfaulting: lp:~garyvdm/qbzr/trees - run qbrowse - expand a folder.06:08
* bialix looks06:09
bialixigc, do you have experience in building deb packages for PPA?06:09
igcbialix: no sorry06:10
lifelessigc: ping reminder on command hooks06:10
bialixgaryvdm: segfault on windows too06:10
bialixyou did something bad with PyQt I guess06:11
igclifeless: sure. next on my list after looking at an eol bug report06:11
bialixusually to segfault python one have to deal with C-extansions06:11
bialixmaybe incorrect usage of malloc/free06:12
bialixmaybe you try to read data that was deleted from memory06:12
bialixor outside bounds of array06:12
bialixgaryvdm: thanks for fixing regressions, I'm unblocked now06:13
bialixwe need to think hard about unittesting06:14
garyvdmbialix: sorry about those.06:14
bialixI've used another branch to commit, in the end we have DVCS!06:14
garyvdmYes re unit tests06:15
garyvdmThere is just so many to be written - It is quite daunting.06:16
bialixyes, a bit06:16
bialixhow to eat the elephant?06:16
garyvdmI spent about 3 days writing tests for loggraphprovider, and I only covered the first 2 methods :-(06:17
bialixthis is disapponting, I know06:17
garyvdmOk - so I very new a writing tests.06:17
bialixask vila for help06:17
garyvdmvila helped me alot at uds!06:18
bialixvila likes tests06:18
* bialix summons vila!06:18
bialixnope, does not work06:18
bialixok, Gary I have to go to work, see you later06:18
garyvdmOk - bye06:18
igclifeless: I'll get on to that Command.hooks re-review now06:37
RenatoSilvain CVS each dir is a module. In Bazaar, each dir is a branch?06:52
luksno, branch is a directory06:55
RenatoSilvathen yes, don't?06:55
RenatoSilvaare sub dirs of the branch branches themselves?06:56
luksI meant to point out that it's the other way around :)06:56
RenatoSilvasub dirs of a CVS module are modules themselves.06:56
luksso no, not every directory is a branch06:57
luksbut every branch is a directory06:57
lifelessbzr is nothing like CVS :)06:57
RenatoSilvawhat's a module / project in CVS repos? It's just a dir in the repo tree. Is this the same with Bazaar or other tools?06:57
RenatoSilvaluks: ok I've got it06:57
luksthere isn't anything like that06:57
luksin bzr you generally work with the filesystem06:58
luksso if you want to group branches, you can use a directory06:58
RenatoSilvait seems that branches are like the CVS repos themselves, not their modules06:58
luksyou can't really compare cvs and bzr06:58
RenatoSilvaok06:59
vilahi all07:11
pooliehi vila07:25
vilahi poolie !07:26
lifelessigc: I replied07:26
lifelessigc: one more from you should do it07:26
igchi vila!07:54
lifelessigc: ping07:54
lifelessigc: See above07:55
igclifeless: looking now07:55
lifelessdanke07:55
lifelessEODing08:10
lifelesspoolie: check is refactored to ~ where I want it; tuning somewhat now - reconcile's core needs fixing too, and the performance is odd - tracking down details now.08:11
poolienight lifeless08:17
RenatoSilvawhere is the output files for bzr init?08:22
RenatoSilvawhere are08:23
=== abentley1 is now known as abentley
RenatoSilvaoh bzr is smart, .bzr is /ah under windows08:28
RenatoSilvais there any problem if I remove the hidden gflag?08:28
RenatoSilvaflag08:29
vilaRenatoSilva: I don't think that will be a problem, but if you encounter one: 1) Restore it, 2) File a bug08:51
Spabbygood morning bzr experts09:02
vilaSpabby: hi09:04
poolievila, i'm writing up a patch for the bug process stuff09:06
vilapoolie: cool09:07
Spabbycan anyone help me install the automirror plugin please? I have followed the instructions for installing plugins on the bzr website and also in the readme but I cannot get it working!09:13
vilaSpabby: can you elaborate ? Note that I don't know the plugin, but we'll see09:18
Spabbyyes09:20
Spabbyone second sorry09:20
Spabbyfirstly it says to install to ~/.bazaar/plugins and the directory didn't exist09:21
Spabbyso I created the directory09:21
Spabbyand copied the automirror directory there09:21
SpabbyI then added the post_commit_mirror parameter to the branch.conf file09:21
Spabbybut when I commit nothing happens09:22
vilaSpabby: do you have bzr installed on the remote server ?09:22
Spabbyyep09:22
Spabbyif I commit to the remote server it works fine09:23
Spabbyand if I do a bzr update on the remote server that also works great09:23
vilaSpabby: more importantly (as far as I understand the plugin intent), do you have a remote branch there ?09:23
Spabbyyes09:23
viladid you look at your .bzr.log file ?09:23
Spabbyah09:23
Spabbyno09:23
Spabbyis that in the .bzr dir?09:23
vila'bzr version' will tell you where it is09:23
Spabbyah09:25
SpabbyI suspect the plugin is in the wrong place ;)09:26
Spabbyno it looks right09:27
Spabbyshould it list plugins installed after "looking for plugins" line?09:27
RenatoSilvawhat's this output in $bzr launchpád-login?09:32
RenatoSilva[-                   ] https >      0KB     0KB/s |09:32
lifelessjml: argh; could you please make sure the RM notes make it clear to preserve NEWS headings?09:33
vilaSpabby: 'bzr plugins -v' should answer that09:33
* igc dinner09:33
lifelessjml: otherwise everyone landing stuff collides for the first period after; and hilarity *doesn't* ensue.09:33
vilaRenatoSilva: it's an artifact of the progress reporting, I think there is already a related bug on launchpad.net for it, but may be not for the launchpad-login command09:34
Spabbysuper duper the plugin is installed09:34
Spabbyright so it must be the config that is borked09:35
RenatoSilvavila: I only receive this output, and push is not working09:35
RenatoSilvaI don't know if I'm authenticated or not09:35
vilaRenatoSilva: Are you behind a firewall ?09:35
RenatoSilvaI'm at home09:36
RenatoSilvahum let me see09:36
vilaRenatoSilva: some homes come with firewalls :)09:36
RenatoSilvaon the windows :)09:37
Spabbythis is frustrating the hell out of me, it should be so simple!09:40
RenatoSilvavila: what is the exact process to allow09:40
RenatoSilvabzr.exe? pageant.exe? putty.exe?09:42
vilaRenatoSilva: Ha :-/  Relevant bug is #186920 I think09:42
vilaubottu: bug #186920 ?09:42
Spabbycan I update a remote branch using bzr?09:42
ubottuLaunchpad bug 186920 in python "bzr launchpad does not handle proxy when used for name resolution " [Unknown,Confirmed] https://launchpad.net/bugs/18692009:42
Spabbyplease?09:42
vilaSpabby: As long as you're not using lp, yes09:43
vila:-/09:43
Spabbyi mean I can ssh in and do an bzr update09:43
Spabbybut can I do it locally or do I have to do that09:43
RenatoSilvavila: what is the process to allow? pageant? bzr? putty?09:43
vilaEerk, sorry guys, Spabby: forget my last message09:44
vilaRenatoSilva: sorry, I meant proxy, not firewall09:45
Spabbyok I have written a bash script that will commit changes and update remote host, it will do!09:45
RenatoSilvaNo proxy. I deactivated firewall and it didn't worked09:46
spivSpabby: you might like to try the push-and-update plugin09:46
Spabbyspiv, I'll be honest I don't understand the difference between "push" and "commit"09:46
spivSpabby: or perhaps the bzr-upload plugin09:46
spivSpabby: https://launchpad.net/bzr-push-and-update and https://launchpad.net/bzr-upload09:47
vilaRenatoSilva: what does your .bzr.log file say ?09:47
LarstiQSpabby: commit creates a new revision, push publishes it09:48
spivSpabby: commit adds a new revision to a branch with the contents of your working copy on disk.  push updates one branch from another branch.09:48
RenatoSilvavila: where?09:48
Spabbyok so I definitely want to be using commit09:48
vilaRenatoSilva: 'bzr version' will tell you09:48
Spabbyas I want to be working locally until a module is complete then committing it to the central repo09:48
RenatoSilvavila: is this log cleanned from time to time btw?09:49
vilaRenatoSilva: yes09:49
vilaRenatoSilva: renamed to .bzr.log.old to be precise, and .bzr.log.old is deleted if present at that time09:50
RenatoSilvafor lp login: failed to import pycurl: No module named pycurl09:51
RenatoSilvafailed to instantiate transport <bzrlib.registry._LazyObjectGetter object at 1034800, module='bzrlib.transport.http._pycurl' attribute='PyCurlTransport'> for 'https://launchpad.net/': DependencyNotPresent(Unable to import library "pycurl": No module named pycurl)09:51
vilaRenatoSilva: shouldn't be a problem, what bzr version are you using ?09:51
RenatoSilva1.15-209:52
vilaRenatoSilva: that's strange anyway, I thought the windows installer included pycurl09:52
vilaRenatoSilva: how did you install ?09:52
RenatoSilvafor push: http://pastie.org/51227609:53
RenatoSilvavila: hum, 1.15-2 is a self-extracting zip09:53
LarstiQRenatoSilva: is this still about 'command-line: line 0: Bad configuration option: ClearAllForwardings09:54
LarstiQ?09:54
RenatoSilvay09:54
LarstiQRenatoSilva: then fix your openssh config :P09:55
LarstiQalthough bzr might be passing that option in09:55
LarstiQRenatoSilva: according to the log you pasted, openssh is used, not putty/pageant09:56
RenatoSilvahow do I see the ssh client?09:56
RenatoSilvaset09:56
spivYes, bzr will pass that option in if it is spawning openssh.09:57
RenatoSilvait seems that I need some python dependecies, pucurl etc09:57
RenatoSilvapyculr09:57
RenatoSilvapucurl09:57
spivpycurl is an optional dependency.09:57
RenatoSilvapycurl!09:57
LarstiQRenatoSilva: no, you can ignore pycurl09:57
Spabbynot bzr related at all but can you remember the name of the scripting software that allows you to basically record your command line as a macro?09:57
Spabbymental block09:57
RenatoSilvaparamiko and pycrypto too?09:57
Spabbyits ok I remember, it's expect09:58
LarstiQRenatoSilva: those two are pretty essential for ssh09:58
RenatoSilvamaybe I should try the installer 1.15-1 instead of my 1.15-209:59
spivIIRC paramiko is only necessary for SFTP (as the actual SSH bits can be done with openssh/putty/whatever).09:59
spivAnd IIRC pycrypto is only necessary for paramiko.10:00
spivI'm curious about which version of OpenSSH you have that doesn't recognise the ClearAllForwardings option, though.10:00
RenatoSilvahow do I set the SSH client?10:01
lifelessspiv: it may be an ssh.com version or some such10:01
spivlifeless: right10:01
LarstiQRenatoSilva: BZR_SSH=plink10:01
spivlifeless: (although we try to detect that too, IIRC)10:01
LarstiQRenatoSilva: environment variable10:02
RenatoSilvaLarstiQ: shouldn't it be the full path?10:02
spivRenatoSilva: set the BZR_SSH environment variable to one of paramiko, openssh, ssh, plink.10:02
LarstiQRenatoSilva: no, just the type (paramiko, openssh, ssh, plink)10:02
spivRenatoSilva: I'm curious, what does "ssh -V" report?10:04
RenatoSilvaLarstiQ: bzr: ERROR: [Error 2] O sistema nÃ’o pode encontrar o arquivo especificado (file not found)10:04
spivRenatoSilva: I guess plink.exe isn't on your %PATH% then.10:04
RenatoSilvaspiv: I only have ssh because of MSYS: OpenSSH_2.9p2, SSH protocols 1.5/2.0, OpenSSL 0x0090602f10:05
LarstiQ2.9!?10:05
RenatoSilvaspiv: that's why I said: I need the full path!10:05
spivAh, that is a pretty damn old OpenSSH10:05
spivRenatoSilva: why is setting %PATH% harder than setting %BZR_SSH%?10:06
LarstiQspiv: why is bzr_ssh not in `bzr help configuration`?10:07
spiv(I mean, it would be nice if it were possible to specify a full path, but that feature doesn't exist yet.  Patches welcome!)10:07
spivLarstiQ: a bug, I guess.10:07
LarstiQspiv: yes :P10:08
RenatoSilvaspiv: I set the apth10:08
spivLarstiQ: also, for no good reason (probably just historical) it doesn't get looked up by the regular config machinery, i.e. you can't set it in bazaar.conf10:08
* LarstiQ nods10:08
RenatoSilvaThe server's host key is not cached in the registry. You have no guarantee that the server is the computer you think it is. The server's rsa2 key fingerprint is: ssh-rsa 1024 ******.10:08
RenatoSilvaConnection abandoned. bzr: ERROR: Connection closed: please check connectivity and permissions10:08
spivLarstiQ: it's just environment or autodetect or default. (in that order)10:08
LarstiQRenatoSilva: do you have access to server logs? Are you using the correct user? Is the key you supplied allowed to login? etc10:09
spivRenatoSilva: so perhaps all that's needed is for you to manually do "ssh bazaar.launchpad.net" and accept the host key so it gets saved in the registry.10:09
RenatoSilvaI opened a session with PuTTY10:12
RenatoSilvabzr: ERROR: Target directory lp:~renatosilva/+junk/solenoid-moin-theme already exists, but does not have a valid .bzr directory. Supply --use-existing-dir to push there anyway.10:13
RenatoSilvait's better error now :)10:13
RenatoSilvaooohhhh \o/ it's working10:14
spivRenatoSilva: cool10:14
RenatoSilvaspiv: I had to store the server keys10:14
RenatoSilvamy first branch \o/10:17
RenatoSilvahttps://code.launchpad.net/~renatosilva/+junk/solenoid-moin-theme10:17
RenatoSilvathank you guys, you are _so_ helpful10:17
RenatoSilvabtw: http://moinmo.in/ThemeMarket/Solenoid10:20
RenatoSilvahttp://bazaar.launchpad.net/~renatosilva/%2Bjunk/solenoid-moin-theme/annotate/head%3A/htdocs/css/msie/style_ie8.css10:32
RenatoSilvawhy does it show the 1st line only?10:32
lifelessthats very odd10:34
lifelesscould you please file a bug at https://bugs.launchpad.net/loggerhead ?10:34
RenatoSilvalifeless: it seems that for some reason the file has Mac-style  line breaks10:36
spivRenatoSilva: mention that in the bug report :)10:37
RenatoSilvaspiv: this is a dump of the file "/* Width was too short */\rdiv.wrapper10:38
spivRenatoSilva: I can see the file content already... a bug report is what's needed at this point.10:40
RenatoSilvaspiv: https://bugs.launchpad.net/loggerhead/+bug/38722510:44
ubottuLaunchpad bug 387225 in loggerhead "File content not entirely displayed" [Undecided,New]10:44
RenatoSilvaI will commit the windows-line-break version10:44
RenatoSilvahow do I link to the bug?: the complete URL?10:45
lifelessspiv: http://bazaar.launchpad.net/%7Erenatosilva/%2Bjunk/solenoid-moin-theme/revision/1 does the file list look like it has something odd at the top to you?10:46
lifelessRenatoSilva: link to it where10:46
RenatoSilvain the commit comment10:47
RenatoSilvaThis change is because of this bug: xxx10:48
lifelesshowever you like :). you can also say '--fixes lp:<number>' in the command line when you commit10:48
RenatoSilvain eclipse you can put just 'bug 123', when shown in bugzilla a link is created to that bug10:49
ubottuLaunchpad bug 123 in rosetta "There's no direct way to see the project info when translating it" [Medium,Fix released] https://launchpad.net/bugs/12310:49
RenatoSilvalifeless: the commit doesn't fix, but is caused by the bug :)10:49
james_w 10:49
lifelessRenatoSilva: oh right. In Ubuntu the convention is10:49
lifelessLP: #<Number>10:50
RenatoSilvawho told ubottu to write that?10:50
spivlifeless: yes10:51
RenatoSilvabug 1234510:51
ubottuLaunchpad bug 12345 in isdnutils "isdn does not work, fritz avm (pnp?)" [Medium,Fix released] https://launchpad.net/bugs/1234510:51
RenatoSilvaoh10:51
james_wRenatoSilva: if you say "bug <number>" in a bug comment then it is linked correctly, perhaps loggerhead could do that too10:51
james_win fact, I think it's done for the comments that LP shows on the branch page, it's just because loggerhead is a bit separate that it doesn't currently10:51
RenatoSilvais a bug id unique among the projects?10:52
james_win launchpad, yes10:52
spivlifeless: there's an empty <li class="files"></li> that's causing it, I think.10:52
lifelessthe root perhaps10:52
lifelessanyhow bug sent10:52
spivYeah.10:52
lifelessLarstiQ: so, know where jelmer is?10:53
spivlifeless: in fact almost certainly the root, judging from how it renders other directories.10:53
RenatoSilvajames_w: so I can just type exactly "Thsi commit is because of bug 387225."10:55
ubottuLaunchpad bug 387225 in loggerhead "File content not entirely displayed" [Undecided,New] https://launchpad.net/bugs/38722510:55
spivlifeless: "/" shows along with other files as something you can click & expand to see changes.10:55
james_wRenatoSilva: yeah, it won't do anything yet, but it probably should :-)10:55
spivAnyway, that's enough internet for the evening...10:55
james_wRenatoSilva: you may also want to use the "--fixes lp:" thing, as that tells LP to link the branch and the bug10:56
RenatoSilvaactually, "Launchapd bug"10:56
RenatoSilvajames_w: the branch is not a fix10:56
james_wok, then don't :-)10:56
lifelessspiv: bug 387227 if you want to comment11:03
ubottuLaunchpad bug 387227 in loggerhead "odd rendering of files list" [Undecided,New] https://launchpad.net/bugs/38722711:03
RenatoSilvahwo to store a default merge location?11:07
=== bialix_ is now known as bialix
RenatoSilvaRenatoSilva:  --remeber.11:09
RenatoSilvaIs this stored under my prefs or under the branch?11:09
RenatoSilvatiased: the branch11:09
* RenatoSilva read the 5-min tutorial in a few hours o.O11:14
RenatoSilvathank you guys, I'm leaving, bye.11:28
lifelessciao11:28
LarstiQlifeless: no, last time I saw him was previous saturday in Amsterdam. I have noticed him being on irc less lately.11:30
gioelehello.11:48
gioeleIs it me or the PPA has not been updated for bzr 1.15.1?11:49
gioeleI see 1.14.1 and 1.15 only11:49
LarstiQyou are right. The beta ppa has 1.16-rc111:54
fullermdHow odd.  the MD5 for the 1.16rc1 tarball is a dead link...11:55
fullermdAnd bzrtools too.11:57
bialixigc: ping12:37
bialixigc: is this branch still needed? https://code.launchpad.net/~ian-clatworthy/qbzr/explorer-prototype12:37
igcbialix: no12:37
bialixmark it as abandoned please12:38
igcbialix: I can delete it if you like12:38
igcbialix: ok12:38
bialixthx12:39
bialixbtw, qversion in the trunk12:39
bialixluks: I see you have uploaded packages for qbzr 0.11, thank you. We need packages for 0.12 too, because it's version compatible with bzr 1.1612:41
TheJoshHi I am having some problems with some scripting with bazaar13:10
TheJoshI am making a PHP script which merges in changes from one branch to another13:11
TheJoshbut exec, shell_exec and friends don't return any script output - even though when I execute these commands in my shell they actually return output13:11
TheJoshHow can I get the output out of these commands?13:11
=== TheJosh is now known as TheJosh1337
lifelessit may be that the output you're looking for is on stderr13:13
fullermdAs is customary, the PHP manual tells you everything but what you care about, but AFAIK all those commands give you stdout, but not stderr.13:13
lifelessmost chatter is on stderr13:13
fullermdAnd in some cases, bzr might give you different output if it's not run on a terminal, I'm not sure.13:13
TheJosh1337so why does bzr output to stderr? Isn't stderr for, like errors?13:14
TheJosh1337and can you trick bzr into thinking it is a terminal? set TERM env or something?13:14
lifelessstderr is for output that isn't the main output13:14
fullermdTry using proc_open().13:15
TheJosh1337When I run the command with 2>&113:15
TheJosh1337I get the output, but I get other junk too13:15
TheJosh1337No handlers could be found for logger "bzr"13:15
TheJosh1337[27093] 2009-06-15 21:38:58.811 INFO: Nothing to do.13:15
TheJosh1337Nothing to do.13:15
fullermd(of course, like most PHP executing functions, that still calls a shell for the execution.  Sigh.  A continuing irritatnt...)13:15
lifelessthats very odd output13:16
TheJosh1337what is this 'logger "bzr" stuff'. I don't want that13:16
TheJosh1337I guess I can regex it out but that's a bit crappy13:17
lifelesswe use python's logging facilities to do output13:17
lifelesssomething is causing bzr's setup routines not to run13:17
lifelessor it may be related to trminal detection (but even then we should setup a logger)13:18
lifelessyou can fool bzr yes, it honours TERM etc13:18
TheJosh1337so If I set TERM=bash, that might fix it?13:19
* fullermd doesn't see that in his termcap...13:20
=== mrevell is now known as mrevell-lunch
TheJosh1337hmm13:21
TheJosh1337TERM=xterm13:22
TheJosh1337that will fool it13:22
fullermdSomething like vt100 is usually the LCD, but yah, that'll work fine.13:22
fullermdProbably doesn't matter too much unless you get exotic.13:22
TheJosh1337setenv('TERM=vt100') doesn't fix it. I'll have to try with proc_open which allows setting env vars13:24
AfCI just upgraded a bzr.dev in format "pack-0.92" at revno 3638 to "1.14" and 76.7 MB later pulled to revno 4441. And it completed. How about that.13:25
fullermdI'd guess the std{err,out} issues are more likely to be your issue than terminal detection, though.  I'd try with just that first.13:25
=== ddaa1 is now known as ddaa
TheJosh1337I changed my code to use proc_open and now it doesn't return anything at all13:36
TheJosh1337can I set the logger somehow, so it doesn't throw the stupid messages?13:36
lifelessTheJosh1337: file a bug about the messages please. Also what version of bzr are you using?13:38
TheJosh13372.6.2113:38
TheJosh1337my bad13:38
TheJosh13371.6.113:38
TheJosh1337that's quite an old version isn't it.13:39
fullermdFairly, yah.13:39
TheJosh1337I am running Ubuntu Intrepid13:39
TheJosh1337I guess its time to upgrade to Jaunty13:40
TheJosh1337well im off then - Have an upgrade to do13:42
TheJosh1337cya13:42
=== mrevell-lunch is now known as mrevell
=== KX is now known as MemoBot
=== ddaa1 is now known as ddaa
=== MemoBot is now known as EmoBot
=== EmoBot is now known as MemoBot
GPHemsleyHow do I change the push branch listed in `bzr info`?13:59
lifelessbzr push --remember <URL>13:59
GPHemsleythanks14:01
gioelelifeless: is there another way to set the push branch location?14:05
AfCgioele: $ vi .bzr/branch/branch.conf14:05
lifelessgioele: bzr help configuration14:08
gioelelifeless: ah, great. I'm adding that to the Location wiki page14:11
gioeledifference between the public and the submit branch? Both seem to be used by the 'bzr send' command14:13
fullermdY'know, it may be time to stop having a separate section in there for branch6...14:13
vilajelmer: ping, unless we chat, I'm afraid we will stay out of phase :-) I'm sure we're close to agreeing though :)14:35
jelmervila: hi!14:35
jelmervila: Did you see my last reply?14:36
cyberixaeDoes bazaar always retrieve full history of a branch, when I branch from it?14:39
jelmercyberixae: if you don't specify --stacked, yes14:39
SamBjelmer: well, if he creates a new branch in the same repository, there is no need for it to do any fetching, is there ?14:41
cyberixae"The new branch will depend on the availability of the source branch for all operations."14:41
cyberixae"all operations"?14:41
SamBjelmer: got my patch, btw?14:41
cyberixaeWhat is the point of having one then?14:41
jelmerSamB: yep, it's already in the 0.6 branch14:41
jelmerSamB: thanks14:41
SamBno problem14:41
SamBit was an easy fix14:42
cyberixaeLook, our project has some big files in the main branch and I was considering to move them out of the way into another branch and deleting them from the main branch.14:42
cyberixaeBut this is useless, if the history is downloaded everytime anyway14:43
cyberixaeIs this correct?14:43
SamBwell, not quite useless14:43
SamBat least you wouldn't have to have them in the working directory then!14:43
SamBbut yeah, they'd still get downloaded14:44
cyberixaethe speed of download and amount of disk space were the concerns here.14:44
SamBwell, not having it in the working directory would obviously save some disk space14:45
SamBbut not really any download14:45
cyberixaewhy?14:45
cyberixaethe version history is compressed?14:45
SamBwell, probably14:45
cyberixaeBut the files are compressed already anyway14:46
SamBbut what I mean is that instead of having the copy in the history *and* the one in the directory, you'd just have the one in the history14:46
cyberixaewe have some jpegs, mp3s and oggs in there14:46
SamBah.14:46
SamBif this were #git, I might be suggesting "git filter-branch"14:46
SamB... does anyone know of something like that for bzr?14:47
bialixoh great masters of [bzrlib] unittesting! can you say me how to test NotBranchError?14:52
bialixSamB: you mean fast-import-filter14:53
jelmerbialix: test what about it?14:55
jelmerbialix: btw, any news on your bzr-git windows porting effort?14:55
bialixjelmer: I'm writing helper method for qbzr to open working tree and show errors NotBranchError/NoWorkingTree errors in GUI14:55
bialixIIRC there is fake tree created at temp dir root14:56
bialixso how can I force NotBranchError in my unit test?14:56
RenatoSilvacan a branch contain anotehr branches?14:56
jelmerbialix: there shouldn't be a fake tree created at the temp dir root14:57
bialixjelmer: re bzr-git: it means your bzr<->git roundtripping means for me that I should wait until each my patch lands before I can start to work on next one14:57
jelmerbialix: the bzr testsuite relies on that not being the case14:57
jelmerbialix: I think you mean *lack* of roundtripping, with roundtripping there wouldn't be a problem :-)14:58
bialixI mean rebasing14:58
jelmerbialix: You can send me multiple patches in one go though, as long as you don't have any unpublished work based on the stuff you've sent me14:58
igcbialix: bug 387241 is fixed now14:58
ubottuLaunchpad bug 387241 in bzr-explorer "bzr explore fails to open branch with out-of-date working tree" [High,Fix released] https://launchpad.net/bugs/38724114:58
RenatoSilvacan I tag a previous revision?14:59
igcbialix: but qgetupdates doesn't work14:59
bialixjelmer: you've rejected my test script, it was a little blocker for me. and then I digressed on other things15:00
igcbialix: there's a radio button to refresh the working tree, it runs, it completes but the OutOfDateTree exception doesn't go away15:00
bialixigc: hm?15:00
bialixgile a bug?15:00
bialixigc: I'm about to finish simpler qupdate dialog15:00
jelmerigc: qile a bug ? ;-)15:00
bialix:-P15:01
bialixs/gile/file/15:01
igcbialix: shall do. why qupdate when qgetupdates already exists?15:01
bialixqgetupdates is too much for this IMO15:01
bialixit's a swiss knife15:01
bialixwhat does not work actually?15:02
igcqgetupdates seems to update the *branch* but not the working tree15:02
bialixjelmer: how you mock GTK widgets for testing?15:02
bialixigc: there is radio button with 2 variants15:02
bialixsecond variant should update wt15:03
jelmerbialix: I think we basically create them but don't call show15:03
igcbialix: maybe qgetupdate just needs more options put into an extension panel15:03
jelmerbialix: but jam should be the expert on that, he did the testing stuff15:03
bialixigc: qgetupdates and qgetnew designed by Mark Hammond15:03
igcbialix: anyhow, I'll file a bug15:03
* SamB wants "bzr clog"15:03
bialixclog for what?15:03
bialixjelmer: did you see my email about saved commit data?15:04
SamBbialix: color log15:04
bialixah15:04
* bialix reads about unittesting in Qt but found QtTest approach a bit limited15:08
bialixigc: q about English15:11
bialixigc: you're using Adds, Modifies in bzr explorer view15:11
bialixwhy not Added, Modified?15:11
bialixjust curious15:11
bialixI want to understand difference15:12
igcbialix: it should be Added, Modified - I'll tweak15:13
fullermdNo need to get tense about it   8-}15:13
RenatoSilvaI'm new to bzr. I tagged a specific revision, but when I commit or push, it stands that there's nothing to change. Why?15:16
fullermdWell, you don't commit tags, so that's half the answer.15:16
fullermdThe other half is that push doesn't say when it pushes tags.  I think it just does anyway, but it may not if there aren't revisions to push too; can't remember.15:16
RenatoSilvafullermd: that's why I also tried to push15:17
RenatoSilvafullermd: it's kind of bug isn't it? for example...15:17
RenatoSilvafullermd: I pushed 2 revisions, but 'forget' to tag rev 1 as 'RC_2009.6.14'15:18
RenatoSilvafullermd: then I pulled the branch, tagged revision 1, and then I want the local and remote branch (in launchpad) to contain the new tag15:19
RenatoSilvafullermd: maybe forcing the commit? how about it?15:19
bialixigc: btw, I'm working with bzr explorer all day today. It's very nice shaping15:20
fullermdThere's no commit.  Tags are on a different timeline.15:20
fullermdpush probably _should_ push the tag anyway, even if there are no new revisions.  It may; I don't remember.15:20
fullermdDid you check?15:20
igcbialix: nice to hear15:20
bialixI need qswitch very soon otherwise I can't work with my plugins15:20
bialixI'm using lightweight checkouts for plugins15:20
* igc does his fix commit and push using explorer --gtk15:20
RenatoSilvafullermd: how do I browse tags?15:22
igcs/fix/first/15:22
fullermdRenatoSilva: `bzr tags [$LOCATION]`15:22
RenatoSilvafullermd: oh, bzr log15:22
igcmust be time for some sleep :-)15:22
fullermdigc: Well, hopefully it was a fix too   ;)15:22
igcfullermd: I guess it was :-)15:23
bialixigc: look at new qupdate from bzr+ssh://bazaar.launchpad.net/~qbzr-dev/qbzr/qupdate/15:24
RenatoSilvafullermd: I pulled it onto a new dir, and the tags is there...thanks15:25
RenatoSilvaI just can't see it trhough launchpad15:26
bialixbzr tags -d lp:your-lp-url-here15:26
fullermdLP may have the tags cached, I dunno.  But if they show up in a new pull, they're there, so it'll work out.15:27
RenatoSilvabialix: as I've pulled and it had the tag, such command should work15:28
RenatoSilvabialix: and works15:28
RenatoSilvabialix: I can't see it through the web interface tough15:28
fullermdThat may be a LP bug.  Might try getting somebody there to check.15:29
RenatoSilvaa loggerhead bug maybe15:30
RenatoSilvafullermd: https://bugs.launchpad.net/loggerhead/+bug/24673915:33
ubottuLaunchpad bug 246739 in loggerhead "tags are not available" [Wishlist,Triaged]15:33
igcbialix: I'll took a look tomorrow sorry15:35
igcnight all15:35
bialixok, night15:36
balorI have a patch in the middle of my tree that I'd like to revert.  Is there any way to just throw away that patch?  Or even better, just mark the patch as thrown away?15:36
* RenatoSilva found weird that he could push the tag without launchpad-login15:38
bialixbalor: shelve?15:39
balorbialix: That seems to shelve all changes since the revision in the middle of the tree.  I just want to remove one revision from the revision history.15:41
bialixoh, you can't15:41
balorbialix: thanks15:41
bialixyou need to reqrite entire history15:41
bialixreqrite15:41
bialixrewrite15:42
bialixrats15:42
balor:)15:42
bialixyou can look at rebase plugin15:42
balorSo branch at -r n-1 and then replay -r n+115:42
bialixbut old and new history will be incompatible after replay15:42
bialixyes, something like that15:42
RenatoSilvacan I change commit comments?15:46
bialixafter commit?15:46
RenatoSilvayes15:47
bialixyou can't15:49
bialixhistory is immutab;e15:49
bialiximmutable15:49
bialixyou only can uncommit and then commit again with new message15:49
RenatoSilvayes, thant's ok15:50
RenatoSilvabialix: uncommit -r 10 for a range of 1..20 will uncommit all the 11..20 commits right?15:50
bialixlook at `bzr uncommit -h`15:51
RenatoSilvait doesn't mention that15:51
bialix  If --revision is specified, uncommit revisions to leave the branch at the15:52
bialix  specified revision.  For example, "bzr uncommit -r 15" will leave the15:52
bialix  branch at revision 15.15:52
RenatoSilvamy mistake sorry15:52
RenatoSilvathen it's like I tould you15:52
bialixvila: ping15:53
vilabialix: pong15:54
bialixis there any way I can trigger NotBranchError in the tests?15:55
vilaraise NotBranchErro ? I think I don't understand the question, that's too obvious >-/15:56
bialixok, lets pastebin first15:56
bialixhttp://pastebin.com/m1f001ece15:57
bialixthis test fails because error is not raised15:57
vilaright15:58
bialixhere is open_tree http://pastebin.com/m695017ea15:58
bialixwhy?15:58
vilabecause there is a workingtree ?16:00
bialixin temp root?16:00
bialixwhat should I do then?16:00
vilabialix: try checking what WorkingTree.open_containing(directory)[0] is returning16:00
bialix1sec16:01
vilabialix: in temp root ? that's strange, but put a breakpoint before open_containing and look there16:01
vilaor better put the breakpoint in your test and do 'pp self.test_dir' and look there16:01
bialixit returns <WorkingTree4 of C:/tmp/testbzr-g8nxvt.tmp>16:02
bialixas I remember bzrlib creates fake working tree at the temp dir root16:02
bialixto prevent leaking tests outside testing jail16:03
vilanope, fake repo, not fake wt AFAIR16:03
bialixbut in fact it's WT here16:03
LarstiQcyberixae: for a stacked branch, it does not download the full history when you branch it.16:03
bialixshould I intialize empty bzrdir then?16:03
LarstiQcyberixae: if you perform an operation that needs it, like, say, log, it will at that point contact the stacked-upon branch to retrieve it.16:03
LarstiQcyberixae: if that branch is no longer reachable, you can't log the revisions you didn't have in the first place16:04
vilabut open_containing search upwards by design, why don't you use open() instead ?16:04
vilabialix: ^16:04
bialixwhy I should?16:04
bialixI'm using open_tree as substitution for WorkingTree.open_containig16:05
vilabialix: well, open_tree docstring says: "Open working tree at specified directory." not 'specified directory or above'16:05
vilabialix: ha ok16:05
bialixok, i'll change docstring16:05
vilabialix: wow, you're right, I was wrong, bzr creates a working tree not a repo16:07
bialixnew docstring:http://pastebin.com/m289b92c016:07
vilabialix: cool16:10
bialixvila: self.make_bzrdir does not help16:10
bialixI'm getting NoWorkingTree with it16:10
bialixso... it's imporssible?16:11
vilawhat happens if you use /I/do/not/exist as a path ? still NoWorkingTree ?16:11
bialixum16:11
bialixlet me check16:11
bialixyep, it works16:12
bialixthank you!16:12
vilabialix: you're welcome16:12
bialixI'm inventing simple mocks to testing qbzr16:13
bialixI'm curious how you test bzr-gtk16:13
vilabialix: way to go !16:13
vilabialix: from memory: classes than can raise dialogs define a self.dialog_class that tests override with nockups16:14
vilamockups even16:14
bialixaha16:14
bialixso I'm using something similar then16:14
vilabialix: yup ;)16:14
bialixoki16:15
bialixwoot!16:25
=== Kissaki^0ff is now known as Kissaki
jammorning vila16:58
vilajam: hi ! Looking at your better heads right now16:59
vilaI mean reviewing16:59
jamsounds good16:59
fullermdBetter head?  Is there something wrong with the one he has now?17:07
=== jelmer is now known as Guest44014
vilafullermd: tsk tsk headS, we need more like him, so we multi-head him17:08
fullermdIs that really advisable?  I'm of two minds about that...17:08
vilatwo is bad, use three to avoid ties17:09
Takpff, good enough for zaphod...17:10
vilajam: lp is driving me mad, there is a '_counters = [0,0,0,0,0,0,0]' in your code that doesn't appear in the mail for your merge proposal, grr17:17
vilajam: I review it from your branch >-/17:17
jamvila: well, I updated my branch a lot since the submission17:18
vilaHa ! That explains a lot :) Well, so I review the good bits, right ?17:19
jamso the original idea of whether we want it or not17:20
jamis certainly present17:20
jamthe latest version has some bug fixes17:20
jamand more optimizations17:20
vilajam: for both implementations ?17:23
jamvila: the test suite passes for both implementations... so yeah17:23
jamI didn't do as many optimizations  for the python code17:23
jambut it at least has the correctness fixes17:23
jamThere wasn't a lot of algorithm diff between python & pyrex17:23
jammostly just Dict/List tuning17:23
jamoh, and heaps are quite a bit faster if you can use peek + heapreplace() rather than pop + push17:25
jamsince it doesn't resize the list17:25
jam(possibly causing reallocs, etc.){17:26
vilajam: review sent, I've got revno 4411 here17:27
jamvila: yep, 4411 is my latest17:27
ronnyoh damn, missed jelmer again17:27
vilajam: EOD for me then17:32
jamvila: have a good night17:32
The_User|afkHi! After a bzr update some of my branches don't work anymore. I get errors when I try branch, log, checkout and some other command. I get "KeyErrors" and an Exception-Backtrace18:00
=== The_User|afk is now known as The_User
The_Usersorry, it works after a downgrade to 1.818:04
dashhmm18:28
dashthere is a guy in my office who is using git18:29
dashour code is all in svn18:29
dashi am wondering how i should pitch bzr to him18:29
dashhe doesn't seem like a git zealot, just a guy who heard there was a better thing than svn18:29
LeoNerdI use bzr at work against a svn repo, largely so I have "bzr shelve"18:47
mneptokdash: "SVN is a great system. Just like Eminem is a popular musical artist. You know, if we're in 2002."18:58
dashmneptok: the issue is git, not svn :)18:58
mneptokdash: sorry, i read "never heard"18:58
mneptokthere's nothing *worng* with git. you just have to accept is was built with a certain audience in mind. if you're willing to adjust your thinking to be that audience, it will work for you.18:59
mneptokpersonally, i want my tools to match my workflow and mindset, not vice versa. bzr does that.19:00
Takwell, bzr has a high command/interface correlation with svn19:00
Take.g. svn revert blah => bzr revert blah || git checkout -- blah19:01
fullermdActually, I think one of the options to git reset is more like revert...19:01
dashyeah, that was the main thing I came up with19:02
fullermd(and another is like uncommit, and another is like pull...)19:02
dash1) 'svn foo' can be replaced with 'bzr foo' in nearly all cases 2) bzr gets by without history editing a lot better19:02
Takcrossplatform usage?19:03
Takreduced inter-language fragility?19:07
Takdo the dev tools you're using support either git or bzr?19:09
LeoNerdI don't think any of my dev tools support svn, cvs, rcs or sccs either... yet still I manage :P19:12
TakI bet they do ;-)19:12
Takbut either way, if they support bzr, that would be additional ammunition19:13
LaneyHow do I break a lock if the break-lock command I'm told to paste throws an "Unsupported protocol" error?19:20
mneptokdash: bzr also has professional paid support. git does not. you may never need it, but it's nice to know the net is there.19:20
fullermdI'm sure you could find somebody good with git who'd be happy to take your money...19:23
james_wLaney: against launchpad>19:24
Laneyjames_w: right19:25
james_wLaney: you ignore what it tells you to do and use a different URL instead19:25
james_wbzr break-lock lp:~user/project/branch19:25
Laneyapparently I locked it 864 hours ago19:25
Laney(u-d-t)19:25
Laneyok that worked, thanks19:26
=== thekorn_ is now known as thekorn
jelmerhi Tak19:32
Takjelmer: hello19:33
Peng_Pfft, can't diff while pulling. Darn dirstate lock.19:38
dashmneptok: hm! an interseting point19:48
dashanyway19:48
dashthe dev environment is eclipse on OSX19:48
dashhow's eclipse support these days19:48
* fullermd boggles.20:28
* Peng_ scrabbles.20:29
Peng_Or something!20:29
fullermdSo I just updated my bzr.dev, which was 4 revs behind (those made today)20:30
fullermdCombined, the commit mails for them, which include the diffs, come to about 150k.20:30
fullermdThe pack file pull created was 7 megs.20:30
Peng_fullermd: Yeah, something has been wrong for a while now.20:31
Peng_fullermd: Nowadays I pull from lp:bzr since it behaves normally and then http://bazaar-vcs.org/bzr/bzr.dev/ in case there's anything newer.20:32
Peng_I wonder if it has to do with changes to make sure stacking or CHKs have all the necessary data which somehow screwed things up for other formats too.20:33
* Peng_ shrugs.20:33
Peng_Someone should probably care about this, but that someone ain't me.20:33
Peng_For me the annoying part is that it always transfers 5 MB (or 8 MB this time). I don't notice the disk space.20:34
fullermdHm, yeah.  branch'ing it off and pulling from lp:bzr gives a 400k pack.  That makes a lot more sense.20:38
Peng_It's nice to know I'm not just crazy. :)20:39
* fullermd scribbles up an email.20:40
garyvdmCurrently when I try view a file in loggerhead on launchpad, I get "internal server error"20:40
* Peng_ starts running bzr pull with various -D options.20:40
garyvdme.g. http://bazaar.launchpad.net/~garyvdm/qbzr/trees/annotate/head%3A/lib/browse.py20:40
Peng_garyvdm: There's some stacking-related bug.20:40
Peng_garyvdm: At least that's the popular theory, IIRC.20:40
garyvdmPeng_: is there a work around?20:41
Peng_garyvdm: Don't think so.20:42
garyvdmIs there maybe a cat page, I don't need annotate.20:42
garyvdmOh - there is a small little icon on the right hand side.20:43
Peng_If you have some bandwidth, you can run "bzr cat" and annotate on remote branches.20:44
Peng_Hehe, running bzr pull from a GigE connection is fun. :D20:46
garyvdmPeng_: I'm posting a question to stack overflow, and I want to put a link to the code.20:47
Peng_garyvdm: Ah.20:48
Peng_fullermd: FWIW, I here's a log of pulls (just revision 4443) with various -D options (though I didn't combine them): http://cheezum.mattnordhoff.com/tmp/.bzr.log20:52
Peng_Err, s/I //20:52
fullermdMay be a useful followup to my mail.20:53
Peng_Where'd you send your mail? The list?20:54
fullermdYah.20:54
* Peng_ pokes at his mail client.20:54
solarionany idea why bzr would eat up all my RAM and then go get itself OOM killed?20:59
SamBsolarion: because it was doing too much allocation?21:00
SamBer, no idea!21:00
solarion"Build phase:Adding file con"21:00
SamBwhat were you doing ?21:00
solarionbzr co --lightweight <repo with 4G of PDF files>21:00
Peng_solarion: Would the file "con" happen to be larger than your RAM?21:00
solarionit is effing annoying21:02
solarionthere it goes again21:07
ronnyjelmer: hi, aware of any rules when extending what object types dulwich gets? (i'd like to add some own stuff for my personal hacks)21:10
jelmerronny: basically just register in dulwich.objects21:11
ronnyjelmer: aware if git has any rules for those extensions21:12
jelmerronny: in dulwich.objects.type_map and dulwich.objects.num_type_map21:12
ronnylast time i asked that in #git they acted like i was xenu21:12
jelmerronny: I don't know what the C git implementation will do with objects of types it doesn't know about21:12
jelmerronny: dulwich will raise a KeyError I think if it encounters objects of types it doesn't know about21:13
jelmerthumper, mwhudson: How hard would it be to do imports to a non-default repository format on launchpad?21:18
jelmerthumper, mwhudson: (on a case-by-case basis)21:18
mwhudsonjelmer: we don't really have anywhere to store the information that there's a different format wanted for this import21:28
mwhudsonjelmer: it could be done, but would be work21:29
jelmermwhudson: ok21:29
jelmermwhudson: (some bzr-git imports will work into the 2a format, since it doesn't squash xml-invalid characters)21:29
mwhudsonjelmer: why do you ask?21:29
mwhudsonah21:29
mwhudsonwell, hopefully there will be a new default format fairly soon :)21:30
mwhudsonwe can make all git imports 2a more easily21:30
SamBdo new SVN imports use bzr-svn yet?21:31
=== afk is now known as mthaddon
Peng_jam: <3 for lp:~jameinel/bzr/1.15-pack-source21:49
jamPeng_: did you test if it works for you?21:51
Peng_jam: No. If you think it's safe enough, I'd be happy to, though.21:55
jamPeng_: should be safe, the tests still pass :)21:55
Peng_jam: OK, but if it is somehow broken, will it lead to tracebacks or horrible corruption?21:56
Peng_The former is ok. The latter, not so much.21:56
jamPeng_: if it was horribly broken, I suppose you could get some missing objects21:57
jamlike it wouldn't fetch a referenced text key21:57
jametc21:57
jamyou could always fill those in later if it was really bad21:57
jamor you could just do  a test in a copy of your repo21:57
jamand tell me if the download was correct :)21:57
jamand not worry about using it 'live' as much21:57
jamoh, and you can 'cp -rl' if space is a concern21:58
jam(we don't append to pack repos, so they are fairly safe to hardlink)21:58
Peng_Pulled 1933 KB. That's definitely an improvement over 8+ MB!21:59
Peng_jam: I've already run "cp -ai" on the repo like 8 times today. 1 more isn't gonna hurt!21:59
Peng_jam: Oh. I didn't check that it didn't horribly corrupt the repo, though.21:59
Peng_jam: Want me to?22:00
jamPeng_: as long as you can "bzr log -vp" the newly pulled revisions22:00
jamI'm pretty confident22:00
Peng_Argh, I already deleted it. :P22:00
jamsince that would have to extract all the data that we should have referenced22:00
jamPeng_: well as you said, only 1MB :)22:00
Peng_jam: Yeah, but now I have to copy the repo again22:00
Peng_jam: "bzr log -vp -r -1" worked.22:01
Peng_Will "bzr pack" completely eliminate the duplicate data?22:02
Peng_Or whatever?22:02
jamPeng_: yes22:03
jam'bzr pack' will remove the duplicates22:03
abentleylifeless: in bzr.dev 4441, aliases now override main command names.  Concretely, "bzr help shelve" now uses the bzrtools version.22:03
pygijam: it seems that it also backs up previous packs22:03
pygiI've seen cases where bzr pack doubles repo size...22:03
jampygi: rm .bzr/repository/obsolete_packs/*22:04
pygijam: I know :p22:04
jamand yes, it is 2x the size until that gets cleaned out22:04
pygiothers don't tho :)22:04
jambut I'm pretty sure Peng_ knows that, too :)22:04
pygijam: can't we get bzr pack clean? :P22:05
pygiat least in 2.x, where we supposedly focus more on the UI :)22:05
Peng_jam: Good to know. I'm probably too lazy to run around "bzr pack"ing everything, though... :P22:06
lifelessabentley: I will file a bug immediately and look at it shortly.23:21
lifelessabentley: to be clear; bzrtools has old-shelve which has an alias shelve?23:22
Peng_jam: FYI, I ran "bzr check" too, and it was ok. (Bunch of inconsistent parents, but that's always the case.)23:24
Peng_lifeless: "shelve1", not "old-shelve", but yes.23:25
lifelessjam: morning23:27
lifelessjam: still around?23:27
Peng_I could swear I had reconciled that repo... where did the inconsistent parents come from? new revisions?23:30
james_wmorning lifeless23:32
james_wmorning poolie23:32
lifelessPeng_: did it get upgraded to rich roots rececntly?23:34
Peng_lifeless: Nope, still 1.9.23:34
Peng_It's totally possible that I didn't ever reconcile it. I have a lot of repos lying around.23:34
pooliehello all23:43
jmlpoolie: hi.23:44
garyvdmHi poolie, jml23:48
=== visik71 is now known as visik7
jmlgaryvdm: hi23:50

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!