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

Gnx-well yeah you're right, actually it'd be pretty simple to just alias a command to do that after the update00:00
jmlgood morning00:01
Gnx-still..beats versioning mysql db00:02
bob2should the sqlite db even be in bzr?00:03
Gnx-well it doesn't need to be, but then you'd have to move it around separately with each update00:04
lifelessbob2: no particular reason not do00:04
lifelessbob2: and if it is tied to source code, good reasons to do so00:04
Gnx-I could also just move the fixtures, but that creates some more tedium then for each rev00:06
Gnx-and tedium is ..tedious;)00:06
jmlpoolie: ping00:08
pooliehello00:08
poolieperfect timing, hi jml00:08
poolieand james_w and ilfeless00:08
jmlpoolie: hi :)00:09
lifelesshi poolie jmll AfC  etc ;)00:12
jmllifeless: hi :)00:14
poolieso, jml, do you want to talk about my breakfast? (brocolini and eggs) or something else?00:15
jmlpoolie: your format naming patch didn't land.00:16
lifelesswe're looking for an adjective that says 'do not use unless you have read the docs'00:16
lifelessfor the 2.0 format command line option name00:17
lifeless[this is not why it failed to land]00:17
jml:)00:18
jmlI offer "runcible".00:19
lifelessI think 2a won't provoke this because users are not /used/ to dealing with distributed databases00:19
lifeless[and those users that are are probably in the 'clueful' set already]00:19
jmlalternatively, "alpha".00:19
poolierubicund00:19
jelmermoin *.{au,nz}00:21
jml"A runcible spoon is a utensil suitable for runciation. This of course is in contrast to an irruncible spoon, which one runciates at one's peril"00:22
fullermdHm, 'zat mean I'm on {au,nz} time today?00:22
jmljelmer: hello.00:22
jmlfullermd: no idea :)00:22
* fullermd feels so cosmopolitan.00:23
AfClifeless: Good morning Robert00:23
pooliejml, lifeless, so let's think about this in updating a document about how formats work00:25
fullermdObviously, the correct answer is "Schrodinger's 2"  :p00:25
pooliefor now, i'll resubmit that branch00:25
jmlpoolie: with the syntax error fixed, yes?00:25
poolie:)00:26
jelmerjames_w: have you seen this before:00:35
jelmertar: ./usr/bin/smbtorture: file changed as we read it00:35
james_wouch00:36
james_wno00:36
james_wwhat operation was that?00:36
jelmerI keep getting that from bzr builddeb now all of a sudden00:36
james_wcould you pastebin the output please?00:36
jelmerhttp://pastebin.ubuntu.com/193851/00:37
jelmerthat's the tail of the output00:37
jelmerit seems to work sometimes, in particular if I haven't run bzr builddeb in a while00:37
james_wouch00:37
jelmerbut if I run it, fix something and then run it again it seems to always feel this way00:38
james_wI wonder if something isn't getting killed or similar00:38
jelmers/feel/fail/ :-)00:38
james_wheh00:38
james_wyou ^C it?00:38
jelmerno00:39
jelmerI'll try outside of bzr-builddeb, perhaps it's unrelated00:40
jmllifeless: yesterday you said you were surprised that the fix I did needed a client-side change.00:40
lifelessjml: I am00:40
jmllifeless: would you be able to look at the patch and tell me if you spot a way to avoid it?00:40
lifelessjml: is your branch up to date, I'm pulling00:40
rchadyHopefully a quick question: Is it possible to do a branch or checkout in to the current directory ?  Providing '.' as the target to branch resulted in an error that the directory already existed (bzr: ERROR: Target directory "." already exists. |)00:40
lifelessrchady: you can 'bzr checkout .' to create a tree where a branch already is00:41
lifelessrchady: but you can't make a branch where one already is00:41
jmllifeless: it is. r4433 in trunk.00:41
SamBbut why does it complain about "." rather than ".bzr/branch"00:42
SamB?00:42
rchadyI'm not super familiar with bzr so please bear with me -- I have a remote repo I want to check out to my current directory.00:42
lifelessSamB: because .bzr/branch is internals and not useful00:42
rchadyI was trying: bzr branch <remote repo> .00:42
lifelessrchady: is the current directly already bzr controlled?00:42
SamBwell, in that case, it could complain "you already have a branch here"00:42
rchadyno00:42
SamBnot complain about "."00:42
lifelessSamB: you could file a bug or a patch perhaps00:43
SamBit specifically complains about the directory "." already existing, see?00:43
lifelessrchady: so bzr branch does a mkdir of the output directory00:43
SamBpersonally, I suspect the error message corresponds with why it's failing00:43
lifelessrchady: is there any reason you can't just remove the directory you're in and do bzr branch <dirname> ?00:44
rchadyit is my home directory... so yeah00:44
lifelessrchady: ok. In that case you're probably best off doing 'bzr init' then 'bzr pull'00:44
rchadyOk00:45
rchadyI'm hoping to be able to manage my home dir with bzr.. we'll see, heh.00:47
rchadyI have way too many logins on way too many disjoint, remote systems.. hoping to be able to make that a bit easier.00:47
rchadyI had made a rpm for my home directory, but that is rather rigid for making changes on the fly00:48
jdubyo jelmer, can i bother you with a weird bzr-svn merging problem?00:48
=== Kissaki is now known as Kissaki^0ff
jelmerjdub: hey00:49
jelmersure00:49
jdubjelmer: merging two branches of the same svn tree results in conflicts on some files00:50
jdubi can either describe how to do it00:50
jdubor upload an example somewhere ;)00:50
jdub(i have a number of branches of wordpress svn in a bzr repo, trying to merge 2.8 into 2.7...)00:51
jelmerjdub: Are those branches public?00:51
SamBI think they're public if he was gonna describe how to do it?00:52
jdubi haven't put htem anywhere useful yet, but i can make a tarball of my freshly-reproduced repo for download00:52
jdub38M bz200:53
jelmerjdub: That'd probably be the easiest way for me to reproduce it.00:53
jdubmsged you a download location00:53
jdubin that repo there's branches fro "trunk", svn branches "2.7" and "2.8", and the attemped "merge" of 2.8 into 2.700:54
jdub(with resultant conflicts)00:55
jdubi thought this could have been messy long-lived branches, but i reproduced it immediately with fresh repo+branches00:55
jelmerjdub: the merge was created simply by "bzr branch 2.7 merge; cd merge; bzr merge ../2.8" ?00:56
jdubyeah00:56
jduboh, and those were done with bzr stable ppa packages on hardon00:56
jdubbut i got the same result with bzr beta ppa packages on jaunty00:56
jelmerit looks like there are a lot of cherry picks between those two branches00:58
jelmeryeah, that seems to be the main source of the conflicts00:59
jelmerbzr doesn't recognize that some of the commits in the two branches actually contain the same changes, and if there were other independent changes to that area of code as well that causes conflicts01:01
GungaJinAre there any merge tools for Bazaar?01:01
jelmerjdub: We can't do much about this unfortunately until Bazaar starts supporting cherrypick tracking.01:01
jdubjelmer: boh!01:04
lifelessjdub: are you getting huge conflicts?01:04
lifelessjdub: try --reprocess01:04
jdublifeless: not huge ones, just lots01:04
pooliehello jdub01:04
jdubyeah, tried --reprocess and some of the other merge strategies01:04
lifelessjdub: are they jen-u-wine?01:04
pooliejml, what happened with bug 284038?01:04
ubottuLaunchpad bug 284038 in bzr "push should warn about uncommitted changes" [Medium,Fix committed] https://launchpad.net/bugs/28403801:04
jdubdifference of between 50 and 44ish conflicts01:05
jdubyo poolie01:05
jmlpoolie: there's an outstanding review01:05
poolieregand regarding bug 385453, i think it's ok to slip it, but we should be extra careful that the files are included in the tarball and deb01:05
ubottuLaunchpad bug 385453 in bzr "make dist should fail if C files don't exist or can't be built" [Medium,Triaged] https://launchpad.net/bugs/38545301:05
poolievila didn't do it overnight?01:05
poolieok01:05
jmlpoolie: yeah. extra care will be taken.01:06
jdublifeless: they do look like the kinds of things that would be cherry-picked01:07
lifelessjdub: and they are different on both sides?01:07
jmlpoolie: btw, I'll get the release going as soon as your format patch lands, or as soon as you tell me you're not going to land it.01:10
pooliei'm distracted by other bugs01:11
pooliewhich are less important01:11
* poolie gets undistracted01:11
poolieit's in pqm now01:14
jdubjelmer: thanks, i feel comfier knowing i'm not an idiot, and that this is not an unknown condition (the bug, not my idiocy, which is legend)01:14
jmlpoolie: thanks.01:14
lifelessjdub: crikey mate!01:15
lifelessjdub: fwiw if these are cherrypicks, merging more often may reduce their impact.01:16
lifelessjdub: also, you could try merge --weave01:16
jdublifeless: tried weave and lca01:16
jdubyeah, trouble is that this is wp 2.7.1 -> 2.801:16
jdubeven merging trunk had the same issue01:17
jdubwould rebase trickery help at all?01:17
pooliejml, i submitted it to trunk, i can send it to 1.16 too01:18
lifelessjdub: I don't think so.01:18
jdub(btw, this is all theoretical now, as i worked around it -> my changes were usefully separate from the core code)01:18
lifelessjdub: in theory this is whats happened01:18
pooliealso, jam suggested just dropping development7 now01:18
jmlpoolie: I reckon I'll just merge trunk into 1.16 once that lands.01:18
lifelessleft side: ... patch A01:18
lifelessright side: ... patch A(cherrypicky) .... change to B01:18
lifelessper file merge bases might help01:18
lifelessbut we don't track per file cherrypicks either yet even when the file ends up fully merged01:19
jmlpoolie: r4435 and r4436 are simple and valuable.01:19
jdubclearly the wordpress dudes need to be encouraged to shift away from svn ;-)01:19
lifelessanyhow, lca etc don't see the patchA's as the same, so the change from A-cherrypicked to B doesn't supercede the other side ending up on A01:21
lifelessjdub: using a loom could help though by keeping your changes logically distinct01:22
lifelessjdub: and if you where using a solely rebase workflow where your patches 'float' on top of trunk then that too would permit bzr to not conflict01:22
pooliespiv, hi, good morning01:26
spivpoolie: good morning01:27
pooliejml, ok, just merging trunk makes sense01:35
jmlcool.01:35
pooliehm what do i do now then? read vila's patch probably?01:36
pooliespiv, what are you up to today?01:36
jmlpoolie: I'm looking at ways to work around the "Launchpad won't work with Bazaar 1.15" issue.01:39
fullermdpoolie: Well, I'd appreciate eyes over that revno/rev-id stuff    :)01:39
jmllifeless: have you had a chance to look at it yet? http://paste.ubuntu.com/193874/ has the relevant diff.01:41
lifelessjml: I was updating local copies and context switched01:42
jmllifeless: understood :)01:42
lifelesswhat is that pastebin for?01:43
jmlit's the patch that I landed w/ both client- & server-side changes.01:43
lifelesshttp://paste.ubuntu.com/193874/ ? is not.01:44
jmllifeless: oh, my bad.01:44
lifelessYou may have wanted it to be.01:44
spivpoolie: finishing my patch for VFS-free "bzr pull -r123 $stacked_smart_url"01:44
spivpoolie: after that... not sure, probably reviewing.01:44
jmllifeless: I meant '-c' not '-r'01:45
fullermd(if there's approval-in-concept of both patches, I may have time this weekend to try resolving jam's changes to both and make one combined patch)01:45
spivpoolie: also, filing a bug against LP code reviews :)01:46
pooliespiv, you have heaps of approved patches01:54
pooliesmall heaps at least :)01:54
pooliejml, it passed all tests in non-ascii mode01:55
poolieso it should be ok now01:55
jml\o/01:55
pooliespiv, what do you think about just landing the patch you originally put up for bug 10914301:56
ubottuLaunchpad bug 109143 in bzr "hpss does not support ~ (tilde) for home dir access on bzr:// or bzr+ssh://" [High,In progress] https://launchpad.net/bugs/10914301:56
spivpoolie: I don't think it'll be very hard to do it better (i.e. your way), just a matter of finding a half-day or so... perhaps I should JFDI today or Monday?01:58
poolieprobably02:01
pooliei really think we should finish up outstanding stuff02:01
poolieone way or the other02:01
SamBso ... anyone have any idea why bzr-bisect doesn't have a "skip" subcommand?02:02
jmlspiv: if I wanted to disable the InitializeEx verb for 1.15 clients, could I somehow register a new request handler in its place that checks the 'Software version' header and then either forwards to the real or raises some sort of exception?02:04
jmlspiv: by which I mean, what's the best approach for disabling the InitializeEx verb for 1.15 clients? :)02:04
GungaJinWhy does bzr ask me to merge when I do 'bzr up'?02:04
SamBGungaJin: you have locall commits02:05
GungaJinI just want to move to a different revision.02:05
SamByou didn't get them merged upstream02:05
spivjml: I'm not sure if the header is being passed along to the request-handler02:05
GungaJinhmmm... not that I'm aware of.02:05
GungaJinHow do I check where they are?02:05
SamBbzr missing02:05
jmlspiv: ahh, suck.02:05
GungaJinbzr status?02:06
spivjml: probably not hard to fix, but02:06
SamBshould show you commits on both sides02:06
jmlspiv: where would I have to hook in then?02:06
spivjml: maybe we ought to remove the verb entirely and replace it with a new one with a slightly different name?02:06
jmlspiv: you mean in 1.16?02:06
spive.g. BzrDirFormat.initialize_ex_1.16 or something.02:07
spivRight.02:07
jmlrather than an LP compatibility kludge02:07
SamBGungaJin: there's also a slight possibility that upstream rebased, though they really shouldn't ...02:07
GungaJinbzr missing didn't work.02:08
jmlI can see that working.02:08
spivIt seems a shame to penalise clients when there's no stacking involved, but on the other hand the offending verb has only been in one release.02:08
SamBGungaJin: what'd it say?02:08
GungaJin"bzr: ERROR: No peer location known or specified."02:09
jmlspiv: could you please do that for me? I'd wager you'll be able to do the right thing much faster than I.02:09
spivjml: which one?  I don't have a strong feeling on which solution to take...02:10
jmlspiv: out of the concrete solutions I've heard so far, I think renaming the verb sounds the least bad.02:11
poolieok, so i think i'll take over bug 284038 and try to finish vila's changes02:12
jmlspiv: do you agree?02:12
ubottuLaunchpad bug 284038 in bzr "push should warn about uncommitted changes" [Medium,Fix committed] https://launchpad.net/bugs/28403802:12
lifelessjml: so were you going to paste the actual diff?02:12
poolieit would be nice to do for this release but imo it should not stall the release02:12
mwhudsonrenaming the verb sounds fairly clea02:12
mwhudsonn02:12
jmllifeless: I pastebinned it, but forgot the url -- sorry. http://paste.ubuntu.com/193877/02:12
spivjml: I guess I do lean that way.  I wonder if lifeless will have any insights now that he's got your diff...02:13
lifelessjml: what happens if you don't change bzrlib/bzrdir.py02:14
lifelessjml: it looks to me like that was a first approximation fix and likely unneeded02:14
jmllifeless: it tries to evaluate the stack_on as local path02:14
lifelessjml: what are the tests to run02:15
jdublifeless: yeah, i should start using looms02:15
jml./bzr -Dhpss --no-plugins selftest -Eallow_debug -s bb.test_push push_smart_with_default_stacking02:16
jml$ ./bzr -Dhpss --no-plugins selftest -Eallow_debug format_initialize_on_transport_ex02:17
lifelessok02:20
lifelessstack_on_pwd in UseExistingRepository is essentially required to be an abspath02:20
lifelessif its a relpath its considered relative to .02:21
lifelessI don't see any way around it02:21
lifelessI'm inclined to issue a 1.15.202:21
lifelesswhat did intrepid ship?02:21
jml    * 1.6.1-1: amd64 i38602:22
spivlifeless: jaunty has 1.13.102:22
spiv(https://launchpad.net/ubuntu/+source/bzr)02:22
lifelessoh right, i, J, k02:22
lifelessyeah. I'd ship a 1.15.2 with this patch cherrypicked02:23
jmlrather than renaming the verb?02:23
lifelessor version the verb02:23
lifelessjml: one or other; whoever is doing the work can choose IMO02:23
jmlcool.02:24
spivIt's a great opportunity to s/_ex/1.16/ , which must be a good thing ;)02:24
lifelessspiv: Don't drop the _ex please02:24
lifelessspiv: because the method is _ex02:24
spivlifeless: yeah, I know, just trolling.02:24
spivlifeless: see above where I suggested "BzrDirFormat.initialize_ex_1.16"02:25
jmlspiv: would you mind doing the version bump then?02:25
spivjml: sure, I'll put that together for you now.  I should do it on the 1.16 branch I suppose...02:25
jmlspiv: actually against trunk is still fine02:25
spivjml: oh, they are the same?02:26
spivConvenient.02:26
jmlspiv: trunk has a revision or two that I'm going to pull in :)02:26
spiv(Also, lp:bzr/1.16 doesn't work yet)02:26
jmlta02:26
jmlI knew I forgot something last night.02:26
lifelessoh, isn't 1.16 hosted on lp?02:27
lifelessthat was a goal for it02:27
lifelessspm: ping02:27
spmlifeless: pong02:27
jmllifeless: we arranged the PQM set up in the dead of night.02:27
lifelessjml: oh02:28
lifelessjml: I thought the branch was made a while back... shrug02:28
lifelessspm: I _really_ want to get pqm and lp talking02:28
spmlifeless: they are, aren't they?02:28
lifelessspm: its very important. RT was filed. I know you are poking at it from time to time, but how can we get it into 'poke until it works' mode?02:28
lifeless18:09 < spiv> spm: yep, lp: URL in merge request still vanishing without a trace.  I'm going to workaround it with http:// again.02:29
pooliejml, on consideration i don't see bug 284038 as sufficiently urgent for me to steal it from vila02:29
ubottuLaunchpad bug 284038 in bzr "push should warn about uncommitted changes" [Medium,Fix committed] https://launchpad.net/bugs/28403802:29
poolieso i suggest we just slip it02:29
poolieand let him finish it tomorrow or watever02:29
jmlpoolie: cool. :)02:29
pooliewhatever*02:29
lifelessspiv: I'm not sure that lp: urls will be opened through the right codepath to do resolution; bzr+ssh please02:30
spmlifeless: ARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHH! /me expresses mild frustration02:30
lifelessspiv: or did you mean bzr+ssh failed?02:30
lifelessspiv: and if it fails please don't change to http, lets debug and fix. small red button time.02:30
spmlifeless: last time we fixed, was due to the authentication.conf getting a busticated version. *somehow* - unknown as yet, that old and busted was put back. I'd since added a ro file to stop the behaviour from repeating.02:31
lifelessspm: *interesting*02:32
lifelessspm: did you document it last time, to avoid other sysadmins running lp-login?02:32
spivlifeless: I meant what I said; I tried an lp: URL, I wasn't aware I should avoid them.02:32
lifelessspiv: I'm not sure that you should.02:32
spmlifeless: emailed them of the issue/solution, but not the lp-login - is that what creates that file? cause that's a Big Clue to me.02:32
lifelessspiv: but lets start with bzr+ssh02:32
lifelessspm: lp-login creates it. (I did in fact detail this for you at the time).02:33
spm'k02:33
spmgiven the values that go in there, that helps me narrow it down to possibilities. something in that other (unused) build/setup going awry.02:34
spivlifeless: I'm typically in favour of stop-and-fix, but delaying the release for my patch seemed like a worse option...02:34
lifelessI hear its traumatic when one starts02:35
lifelessjml: bug 76616 did you look into the claim of a bad merge?02:41
ubottuLaunchpad bug 76616 in bzr "confusing message about ignored files on add" [Low,Fix released] https://launchpad.net/bugs/7661602:41
jmlno, I didn't.02:42
lifelessjml: I think you should, or change the status down to fix committed02:42
spivjml: rename patch submitted02:51
spivjml: (for review)02:52
jmlspiv: thanks.02:52
spivjml: I haven't run the full test suite, but relevant subsets seem happy, and the grep output looks sane.02:53
lifelesspoolie: http://www.overcomingbias.com/2009/06/why-yes-men.html02:55
lifelessI'm going into deep hack mode on check02:57
lifelesstwo days of bugs and writing have driven me battty02:57
lifelessSMS or ring to get my attention02:57
jmlpoolie: can you please review https://code.edge.launchpad.net/~spiv/bzr/rename-init_ex-verb/+merge/736602:59
jmlpoolie: I've had a look & I think it's good, but would appreciate the double check.02:59
pooliewilco03:12
pooliedone03:16
jmlpoolie: thanks03:16
spivpoolie: yeah, it seems to work fine against an older server (lp, which is in fact 1.14 I think?)03:18
jmlyep.03:18
jmlthe other check is 1.15 client vs dev server03:19
spivjml: that'll fallback in precisely the same way that 1.15 does against 1.14 (i.e. LP) now03:20
jmloh of course :)03:20
spivspm: so, should I try lp: or bzr+ssh: URLs on PQM again?03:20
spmspiv: I would yes. the fix from last time is still in place so *hopefully* it'll all work...03:21
spivspm: ok, will let you know shortly :)03:21
spmheh03:22
spivspm: ok, it's on PQM now... let's see what happens.03:22
* jml afk for a bit.03:22
spivspm: and at 02:23:04 it disappeared.03:23
* spm swears, sighs, and starts looking03:23
spivspm: that was with a lp: URL.03:24
spmI think I'm gunna cry.03:24
spm[Errno 13] Permission denied: '/home/pqm/.bazaar/authentication.conf'03:24
spiv\o/03:24
lifeless[machine crashed] spiv please try bzr+ssh03:24
lifelessspiv: and don't try lp: until bzr+ssh are working03:24
spivlifeless: given the above error, I don't think bzr+ssh would help :)03:24
lifelessspiv: if lp: is trying to write to it, bzr+ssh probably won't03:25
spmI'd agree. I need to find out what's doing the lp-login and terminate with prejudice.03:25
lifelessspiv: specifically I *do* think it will help.03:26
spivlifeless: well, spm is the one driving the debugging, so I'll happily do what he asks.03:28
spmspiv: ha! if lifeless reckons it'll work, I'm happy to let you try? :-)03:30
lifelesshere are my thoughts03:30
lifelesslp: is special. pqm might not use the right apis. it might need firewall ports opened.03:31
lifelessbzr+ssh will let us be sure that the ssh aspect is working03:31
lifelesswe should get bzr+ssh working for source branches before trying lp at all.03:31
spivSubmitting bzr+ssh merge request.03:32
lifelessthat way, if lp: requires more stuff, or indeed is even breaking things, we'll be able to diagnose that directly.03:32
spmspiv: that looks to be working!03:33
spivYeah.03:34
lifelessanother data point03:35
spmso what is it about the LS pqm stuffo that causes the auth stuff to foobar bzr pqm. /rhetorical03:35
lifelessas we won't be doing lp-login with the current plan, and http:// doesn't have a smart server, using lp; urls will be slower.03:35
lifelessso even if lp urls work, we shouldn't use them.03:35
spmwell it's warmed up to a balmy 2degC here, so time to get outside and have some lunch in the sunshine! bbs.03:37
spivlifeless: that's a shame, because I'd prefer to have lp URLs as my public_location in locations.conf.03:39
lifelessspiv: I agree, and I think we should work up to that03:41
spivAlso, I don't care much about the speed of HTTP within the data centre.03:41
lifeless:P03:42
spivEspecially compared to the speed of running the test suite twice ;)03:45
lifelesswell03:45
lifelessparallel++03:45
spivYeah, using more cores if they're there is certainly a good idea.03:46
lifelessthe C check has saved my bacon way too often03:46
lifelessok lappie seems stable again. -> deep hacking.03:46
spivIt would be interesting to have stats on the tests that PQM most commonly trips on.03:47
lifelessoh, one lsat thing03:47
lifelessigc: I think my command hooks patch is blocked on your replying to my reply to your review.03:48
tedglifeless: Hey, is there a way to regenerate the indices?04:06
tedgI'm getting an odd error: bzr: ERROR: Error in data for index GraphIndex('file:///home/ted/Development/inkscape.newbzr/.bzr/repository/indices/1d2b8fb37e32a1e94a733fbc3d195756.tix').04:06
spivtedg: I haven't seen that error before...04:12
* tedg seems to have special skills in breaking bazaar :(04:12
spivtedg: off the top of my head I don't think it's possible to regenerate a .tix.  I certainly don't know of any convenient tools to do it.04:22
spivtedg: which repo format?  pack-0.92?04:22
tedgspiv: What ever is default in the nightlies plus rich-root-pack.04:23
* spiv nods04:23
lifelesstedg: file a bug; we'll need to write a repair tool to regen the index for you.04:23
lifelesstedg: the index is zlib'd data04:24
tedglifeless: What should be in the bug, just that single tix file or the whole repo?04:24
lifelesstedg: its mostly (but not entirely) derivable from what you have on disk04:24
lifelesstedg: the one tix which may let us repair it depending on the damage.04:25
lifelesstedg: and this conversation probably04:25
tedgI mean, I'm just trying to get a checkout from SF SVN -- but that takes days and this happened in the middle.04:25
tedgI can start the process over, I don't need that tix specifically.04:25
tedgI'm just trying to avoid starting over.04:25
lifelessthe way we could repair is to read the leaf pages only to get back the kys and values and then reoutput it.04:25
lifelesstedg: if this occured during a fresh branch from svn, well check your hardware - you may have a disk or memory problem04:26
spivlifeless: a little bit odd to get BadIndexError rather than a zlib error if it's bad hardware, though.04:26
lifelessspiv: depends on the try's.04:27
lifelessalso we can look at the index once the bug is filed.04:27
tedgSo, I guess I'm not 100% clear what I should attach to the bug.04:28
lifeless13:19 < lifeless> tedg: the one tix which may let us repair it depending on the damage.04:28
lifeless13:19 < lifeless> tedg: and this conversation probably04:28
tedglifeless: Okay.04:28
AfCWhy in God's name does Launchpad not understand a bzr:// URL?!?04:31
tedgInfo attached to bug 38620304:34
ubottuLaunchpad bug 386203 in bzr "bzr: ERROR: Error in data for index GraphIndex" [Undecided,New] https://launchpad.net/bugs/38620304:34
igchi all04:35
igclifeless: it probably is blocked on that sorry04:35
jmlback04:35
jmlhi igc04:35
jmlAfC: God doesn't pay us.04:36
igclifeless: I've just woken up and feel like absolute crap so ...04:36
igcI'll take a look Monday04:36
igcjml: anything you need from me wrt the release?04:36
jmligc: nope, you're all good.04:36
jmligc: thanks.04:36
lifelessigc: go rest04:36
lifelessigc: health++04:36
igcjml, lifeless: shall do.04:37
AfCjml: ok, I'll try again04:37
AfCWhy in bog's name does Launchpad not understand a bzr:// URL?!?04:37
AfC:)04:37
AfC[bonus points if you get the Heinlein reference]04:37
jmlI counter with "tanstaafl"04:37
igcpoolie: I'm taking today off. Call me if there's anything urgent please04:37
jmlAfC: because we think it's less important than the next twenty things we want to do.04:38
jmlspiv: is your PQM job still running, or is that a resubmit?04:39
spivjml: still running.04:40
jmlAfC: I know that's an unsatisfying answer, but I'm afraid I don't have any others.04:40
spivjml: you can tell it's on the latter half of the run by the [ascii] prefix on the output...04:40
jmlspiv: ahh ok.04:40
jmlhow long does it take to land a branch these days?04:40
spivjml: (you can see from the scrollback that the submission was delayed a little by PQM + lp: URL debuggery)04:41
lifelessback to hacking04:42
spivjml: over an hour :(04:44
mwhudsonwow04:45
mwhudsonthe launchpad pqm was that fast at one point :)04:45
spivjml: judging from the times on PQM (including that my job's time seems to be 1 hour in the future vs. the clock), at least.04:45
spivmwhudson: to be fair, we run our test suite twice :P04:45
mwhudsonwho cares about fair!04:45
spivjml: ah, I think it just finished.04:46
* mwhudson is waiting for make schema, grumpily04:46
jmlpoolie: thoughts? http://paste.ubuntu.com/193945/05:05
pooliejml: i think it's the easiest pastebin question someone's asked me for a while :)05:06
pooliethere is a typo 'on run on huge'05:06
jmlpoolie: dropped 'on run'05:06
spivjml: perhaps add "to it" on the last sentence of the first para, to try disambiguate that users should be cautious about upgrading formats, not about upgrading to 1.16?05:07
pooliei think it's great05:07
jmlspiv: good call.05:07
poolieit's good to have some fresh blood writing it too05:07
pooliealso you can pick a code name if you want!05:07
jml"to the new format"05:07
spivjml: yeah, good call.  "it" should be banned ;)05:08
jmlpoolie: where would I put that?05:08
pooliei think it now goes in the rest keyvalue thing with the dates05:08
pooliethere is another example05:08
pooliethat syntax is a little ugly05:08
poolieoh maybe also run make html-docs and check the syntax of news is all ok05:09
jmlgood idea05:09
jmlalso, say I misguidedly tagged an earlier revision as 1.16rc1...05:10
poolietag --force i think05:10
jmlta05:10
jmlam waiting for a couple of PQM landings before actually rolling out the release.05:40
lifeless~06:39
lifelessless useful exceptions #4507:02
lifelessValueError: Mismatched revision id and expected: 'robertc@lifeless-64-20090612055804-efc1rzfonn6ue0fq', 'robertc@lifeless-64-20090612055804-efc1rzfonn6ue0fq'07:02
* lifeless goes back to it07:03
bialixnice07:03
AfCThose Zero Width Non Breaking spaces (U+FEFF) will get you every time :)07:04
jmlwuuu07:19
bialixjml?07:23
bialixit means you had good sleep?07:23
jmlno, sadly.07:23
bialixand ready to fire 1.16?07:24
jmlit means it's release time :)07:24
bialixlet's rock!07:24
jmlrunning make check_dist_tarball07:27
jmlI'm getting failures running blackbox.test_merge07:30
spivjml: anything I can help with?07:33
jmlspiv: looks like it might be a plugin...07:33
jmlspiv: http://paste.ubuntu.com/194053/07:33
jmlthat's the failure.07:33
spivjml: unexpected success, almost!07:35
spivjml: weird07:36
spivjml: I can't reproduce locally, unsurprisingly07:36
jmlit's one of my installed plugins -- renaming .bazaar/plugins to .bazaar/vogons leaves me with the errors.07:37
spivjml: which plugins do you have?07:38
jmlbzrtools, launchpad 1.16dev, netrc_credential_store 1.16dev, pqm 1.3, qbzr 0.9.2, search 1.7dev07:39
spivjml: (I take it that that test passes for you with --no-plugins)07:39
jmlyes.07:39
spivNone of those jump out at me as a likely culprit.07:39
jmlme neither07:39
jmlremoving search, then qbzr.07:39
spivInterestingly, the merge is still producing conflicts, as it should, so it's just the retcode that's wrong.07:40
jmllooks to be qbzr07:40
spivI will speculate -- I was about to say that :)07:40
jmlhmm. bialix & gary are both gone.07:40
spivjml: qbzr trunk seems to work for me...07:41
jmlit's probably my ubuntu package then.07:43
lifelessI'm about to call it a day07:45
lifelesspoolie: You may hate me for this, but I just found a design problem in bbc that makes check significantly more complex and that we can fix with a small amount of work... but its a format bump.07:45
spivjml: that qbzr version is almost certainly broken w.r.t. to 1.15 too.07:46
lifelessbug 38622707:46
ubottuLaunchpad bug 386227 in bzr "chk_bytes not self describing" [High,Triaged] https://launchpad.net/bugs/38622707:46
lifelesspoolie: I'd like you to look at it and think about it and let me know if you think its worth doing; fornow I'm going to use a[n unreliable] heuristic in check to let me finish the check work.07:47
jmlpulling in latest subunit.07:47
spivjml: (wow, qbzr 0.9.2 is pretty ancient)07:49
lifelessjml: apt-get install should be all you need07:49
jmllifeless: http://paste.ubuntu.com/194067/07:50
jmland I have no subunit or python-subunit package installable.07:50
lifelesshttps://edge.launchpad.net/~subunit/+archive/ppa07:50
lifelessor run karmic07:50
jmlffs.07:52
lifelessjml: or remove subunit07:52
lifelessjml: as the test skips if subunit isn't present07:52
lifelessjml: of course, it should work with subunit too, done() was landed in subunit07:53
jmlI'll remove subunit & see what happens.07:55
lifelessok, EODing. jml - ring ifyou're stuck on the release08:05
jmllifeless: will do, thanks.08:05
jmllifeless: have a good weekend.08:05
vilahi all, have a nice week-end lifeless08:07
jmlvila: hello08:08
lifelessvila: oh vila cool. poolie said to remind you of 2.0 targeted, and generally critical bugs as a priority to ocus ons08:09
vilalifeless: ok08:10
vilalifeless: any specific ones ?08:13
lifelesshttps://edge.launchpad.net/bzr/+milestone/2.008:13
lifelessjust the general thing of keeping our eye on the prize08:13
lifelessit doesn't have to be all consuming08:13
lifelessbut we shouldn't get too distracted with other things08:13
lifelessanyhow, family time now08:14
jmlwoot, new failure.08:18
jmlhttp://paste.ubuntu.com/194100/08:18
jmlis that Python 2.6?08:19
jmllooks like08:20
vilajml: it's a warning from 2.6 yes08:20
jmlvila: ok, so how do I proceed? -- I'm doing a make check-dist-tarball08:21
* jml hacks the makefile to use python2.5 and proceeds from there.08:22
vilahmm, that needs to be addressed :-/08:22
vilajml: that should work :-)08:22
vilajml: can you keep notes or file a bug so that it's not forgotten ?08:22
jmlthe deprecated usage is in the stdlib itself.08:22
jmlvila: sure thing08:23
jml(I should have been doing that from the start.)08:23
fullermdvila: BTW, I did try a selftest run on that new system.  Unfortunately, I couldn't --parallel.  So it still took like 20+ minutes   :(08:27
fullermd(and ended up with a big ole pile of failures of various sorts too  :()08:27
fullermdI've got python 2.6 on that box too...   the bleating about SHA/MD5 at the beginning of selftest from 2.6 is kinda grumy-making...08:28
vilafullermd: 1) Why couldn't you use --parallel, 2) File a bug with all failures (when time permits, I'll add bsd to my test farm and from there...)08:30
vilafullermd: related to 2, it's generally to much pain do diagnose test failures without being able to reproduce it on a real (or virtual) system08:31
fullermdA lot of them were of the form "xyz has no revision [some id that looks like it was just created]".  Not sure what's up with that.  But a few spottests showed it on my current py2.5 system too.  Weird.08:31
fullermdCouldn't --parallel because it wanted testtools, which I don't seem to have an OS package for (and I work hard to not step outside those bounds when avoidable)08:32
jmlwe should fix that.08:33
fullermdI was planning to throw together a mail with the test failures sometime when I had a chance to run it, log it, and dig through the annoyingly verbose output of selftest...08:33
fullermdBTW, it's kinda annoying how there's no documentation about what the options for --parallel are...08:35
vilafullermd: about '--parallel', your right, patch welcome ? :-/ Basically you need testtools and subunit, I understand you desire to stay inside well maintained bounds.08:37
vilafullermd: about test failures: a bug with the full log is perfectly appropriate, don't bother analysing, collecting the data is the most important thing08:38
fullermdFAILED (failures=12, errors=84, known_failure_count=12)08:38
fullermdThat would be a big log   :p08:38
vilafullermd: I've seen worse :)08:39
fullermdI would guess that all the "has no revision XYZ"'s have the same root cause, so it'd worth collating those out at least.  That's the big bulk of the 'errors' ones.08:40
fullermdAt least 3 of the failures are the fails I've previously noted on whatever it was...08:40
fullermd2009-06-09:01:27 <fullermd> test_two_files_different_versions_no_inconsistencies_bug_165071 fails for me on RepositoryFormat's 5, 6, and 7.08:40
fullermd(NFC what possible impact the OS could make on that one...)08:41
pooliehi, i'm back08:41
vilafullermd: NFC as in utf-8 encoding ?08:42
fullermdvila: no, as in No <profane> Clue.08:42
pooliehello vila08:42
vilapoolie: hi :)08:43
pooliejml, are you still here? how did you go?08:43
jmlpoolie: some problems with make check_dist_tarball & python 2.608:44
jmluploading the files to Launchpad now though08:44
fullermd(they all fail upset about getting '2 unreferenced text versions' instead of 0.  What the heck does the OS have to do with that?)08:47
vilafullermd: haaa. that's the funniest part in diagnosing the bug ! I don't to spoil it by telling you now :)08:48
* vila thinks: nice one, should reuse it some day...08:49
pooliejml, make check is dodgy wrt plugins08:49
pooliei think it should run with --no-plugins probably08:50
jmlpoolie: I was thinking about that.08:50
jmland I wrote some of my thoughts down for later elucidation :)08:50
poolieoh jolly good08:51
vilajml. poolie: --on-plugins is a too big hammer, it excludes our own internal plugins08:51
vilahehe nice typo :-) I meant --no-plugins of course08:52
vilajelmer: pinh08:52
vilajelmer: ping08:52
* vila remove his boxing gloves08:52
poolievila, so i'm not sure we should have shipped plugins08:54
poolieoccam's razor08:54
poolieit's kind of a freak08:54
pooliemaybe we should look at what problems if any there would be with just merging that code08:55
pooliei'm not assuming there would be none08:55
vilapoolie: I'm talking about the launchpad plugin and friends here, the ones inside bzrlib/plugins, you want to get rid of them or include more there ?08:56
vilaI thaught we didn't want to merge the lp plugin for licensing reasons (will soon be moot though)08:57
vilaOn the other hand, the plugins are a good starting point for other plugins and as such, there is value keeping them plugins if only to ensure the mechanisms they use are well tested08:58
vilaI'm thinking about the gnu plugin or the python plugins which have been discussed here and there (providing the same server specific URL handling)08:59
poolievila, yes i was talking about the lp plugin too08:59
pooliei'm not aware of any live licencing reason to keep it separate08:59
poolieit just makes web requests to a public service, no problems there08:59
jmlpoolie: can you please update freshmeat for me: http://freshmeat.net/projects/bzr/09:00
=== jml changed the topic of #bzr to: Bazaar version control system | 1.16rc1 released 12 June, 2009 -- please test it! | 1.15.1 released 09 June, 2009 | http://bazaar-vcs.org | http://irclogs.ubuntu.com/
poolieand i think in reality, there is no testing benefit09:01
jmlalso, if you could approve my post to bzr-announce, that'd be ace.09:01
poolieit just adds another case09:01
pooliejml: just post and i'll approve it09:01
pooliedo you have a fm account?09:01
vilapoolie: by "licensing" I meant discussions around bzr "pushing" lp which isn't open sourced. Keeping it as a plugin allows *not* distributing the plugin to whoever feels the need.09:01
jmlpoolie: no, I don't.09:02
poolieok09:02
pooliei'll do that then09:02
pooliei would have made you a coadmin if you did09:02
jmlpoolie: I have posted to bzr-announce already -- waiting for approval :)09:02
pooliejml, actually to save time next time, please just create one09:02
pooliewon't take long09:02
jmlpoolie: will do.09:02
vilapoolie: I think the underlying problem is a lack of a better mechanism to select/activate/desactivate plugins09:03
vilaI'd prefer having more plugins than less :-)09:03
jmlpoolie: can you please give me whatever permissions I need to register on PyPI? my username is jml09:06
poolielist post approved-09:06
jmldanke09:07
pooliepypi done09:07
jmlI assume I don't merge released code back into trunk until the final release, right?09:08
poolieif there are new fixes there you can do it now09:09
jmlthere aren't, I don't think. just the news file changes.09:09
jmlhmm. I think I have a very, very old freshmeat account linked to a defunct email address.09:12
poolieso, um09:18
poolieare you looking for that?09:18
poolieor maybe i should just do this one09:19
wgrantjml: Did you mean to create the 1.16 release on LP, rather than 1.16rc1?09:20
jmlwgrant: I think I meant to create 1.16rc1.09:20
jmlpoolie: I do have a 'jmlTas' account.09:20
jmlwgrant: the instructions on the wiki page & the instructions on Launchpad itself combined for a lack of clarity09:21
jmlwgrant: can I do anything about it now?09:21
lifelessjml:  you should merge back now as part of fixing up NEWS09:21
wgrantjml: You could unrelease it, but that might not be possible now you've added files.09:21
lifelessjml: the docs should be clear about this09:21
wgrant(there's normally a (-) icon next to the release date, IIRC)09:22
jmllifeless: well, they aren't to me.09:23
* jml makes a note09:23
pooliejml ok you should have access on freshmeat now09:23
pooliethanks for doing all this09:23
jmlpoolie: np09:23
poolieit's both a lot of work, and also more work than it should be09:23
jmlI guess I need to change the version numbers again when merging back :\09:24
poolielifeless: i saw your bug about check and chk keys09:24
pooliemaybe we should talk on the list09:24
lifelesspoolie: sure. essentially I'm closing in on having check overhauled.09:24
lifelesssome moderately tricksy stuff remaining but all monday should see it done09:25
wgrantjml: Ah - since you can delete project release files on Launchpad, you can in fact fix it all up.09:25
poolieyou can also ask a duck to rename it09:25
pooliebut that may take a while09:25
fullermdWhy a duck?09:25
jmlwgrant: cool. I'll sort that out.09:26
jmlhmm.... before I register on freshmeat, it seems.09:26
wgrantpoolie: You don't even need a duck.09:26
wgrantpoolie: But that won't work really well, because stuff is milestoned to 1.16, and it would become milestoned to 1.16rc1.09:26
poolieoh i see, yeah09:27
wgrantbut just unreleasing it, creating a new 1.16rc1 milestone, and then releasing that should work. And this UI was just redone to make it simpler...09:27
pooliejml: i gave jmlTas access09:27
poolieok so now i really need to go09:27
pooliebye09:27
jmlpoolie: thanks.09:27
jmlwhat do I advance the version numbers too?09:37
* jml looks in __init__.py history09:37
lifelessjml: 1 17 0 dev IIRC09:38
lifelessand in NEWS it stays IN DEVELOPMENT but the released sections get the header they were released under09:38
lifeless*really going*09:38
jml:)09:39
strkhow do I get a checkout into a specific revision ?09:42
strk'update' has no --revision switch09:42
jmlg'night all.09:43
strkand checkout complains about already existing something (.bzr)09:43
jmlthanks so much everybody for making 1.16rc1!09:43
lifelessstrk: what do you need a specific revision for? is it for testing, or committing on?09:43
strktesting (looking for the commit which introduced a regression)09:44
lifelessbzr revert -r revision09:44
lifelessalso consider using bzr bisect09:44
strkhow to get out of that afterwards ?09:44
lifelessthough it can be a bit confusion09:44
lifelessbzr revert09:44
strkk, thanks (I'll leave bisect out for now, I tried it once but I'm not ready for it yet - I bisect "manually")09:44
strkoh, but 'revno' keeps telling me the new revno, not the one I reverted to09:45
lifelessyes09:45
strkhow do I know the revision I reverted-to ?09:46
lifelesswell this is why bisect is better ;). but for now, your bash history ?09:46
fullermdYou don't, nothing is stored about that.09:46
lifelesssorry I'm being brief, really gotta run09:46
fullermdWell, it's why update -r is better, really.  But that's bug 45719 still.09:46
ubottuLaunchpad bug 45719 in bzr "update command cannot take a revision number" [Medium,In progress] https://launchpad.net/bugs/4571909:46
* lifeless closes irc ssh session09:46
fullermdPast its third birthday now, too.  We forgot to throw it a party...09:47
strkindeed I tried update -r09:47
strk+1 for that bug !09:47
Spabbygood morning my version control loving friends10:01
Spabbyawilkins are you around please?10:13
awilkinsYes10:13
Spabbyhave you got 2 minutes?10:13
awilkinsDon't ask to ask, just ask10:13
SpabbyI just need a little help re: linux permissions if you are ok10:13
awilkins:-)10:13
awilkinsHah, I'm no expert on that but I can comment10:13
Spabbyi've created a new user for myself to use to checkout over ssh, as using root is bad puppy10:14
Spabbybut when I try to bzr update on the server while logged in as the new user I get permission error10:14
awilkinsYou did the initial checkout as root?10:15
bialixvila: hi10:16
Spabbyah10:16
Spabbyi did the inital checkin as root10:16
Spabbythe files where already on the server10:16
awilkinsSomething is probably owned by root that you haven't got rights for as your new user10:17
SpabbyI htink I need to make a new group10:17
awilkinsEither change the ownership to the new user, or create a group for commit rights and change the group ownership to that10:17
Spabbyadd the users to that group and give ownership to that group10:17
Spabbylol10:17
Spabbythanks10:17
vilabialix: hi !10:17
bialixI'm glad you're back10:18
awilkinsI still haven't figured out the setuid bit10:18
bialixor at least you're here10:18
awilkinsBut that's probably not relevant10:18
bialixvila: lifeless asked about filing the bug re broken read-only access10:18
bialixto lp10:18
bialixI dunno maybe you already filed it10:19
vilabialix: nope, I was off-line yesterday (well more like 36hours), lots of backlog10:20
vilaI thought jml said he will talk to spiv about it10:20
vilaif not, I'll file the bug, but the description may be a bit vague10:20
vilaor we may just copy the irc discussion about it10:21
bialixif the doc-ru branch is still has this bug you can use it as example10:30
vilaIt's unclear to me if it's a bzr bug or really a launchpad-code bug though as a bzr client has no way to know whether it is talking to the writable version or the read-only version, and for the fixer script in bug #354036 just *can't* update the read-only branch10:31
ubottuLaunchpad bug 354036 in bzr "ErrorFromSmartServer - AbsentContentFactory object has no attribute 'get_bytes_as' exception while pulling from Launchpad" [Undecided,Confirmed] https://launchpad.net/bugs/35403610:31
vilajelmer: ping10:46
spivjml: (wow, qbzr 0.9.2 is pretty ancient)11:30
spivjml: (d'oh, thanks for combination of suspend+resume and TCP for making me bang random keys into IRC...)11:31
LarstiQjames_w: ho hum. bzr deb:package doesn't work. I add a 'sources.Lookup(name)' in front of the while, and it does11:34
james_wLarstiQ: oops11:35
LarstiQjames_w: so for some reason apt_pkg returns different values for sources.Lookup(name) on the two runs11:35
LarstiQjames_w: (it does work in one go on packages in the main archive, but this one is in /etc/apt/sources.list.d/company.list)11:35
james_wweird11:36
LarstiQquite11:36
james_wit seems like adding an extra call would make the first case fail?11:36
* LarstiQ thinks the apt_pkg interface is weird anyway11:36
LarstiQjames_w: correct11:36
james_wdefinitely weird11:37
bialixvila: am I understand correctly you're author of netrc std plugin?11:38
LarstiQbialix: he is11:38
bialixdoes this plugin really needed on Windows?11:38
LarstiQjames_w: ah, I see.11:39
james_wbialix: I doubt it is11:39
LarstiQjames_w: it can return None on any call, so the while loop won't work11:39
LarstiQbialix: needed? No. does `python -c 'import netrc'` work?11:39
bialiximport itself works11:40
bialixdoes netrc itself works -- I dunno11:40
bialixI don't think netrc is somehow related to vanilla Windows11:42
LarstiQbialix: right. I don't know if people use it on windows, if it can work, that would be ok.11:42
LarstiQbut if it doesn't work, ditch it11:42
bialixI know I'm not using netrc, so I'm just deleting this plugin every time11:43
bialixwhy this support lives in a plugin?11:43
LarstiQbialix: afaik the main goal is to provide a reference implementation of a credential provider11:45
bialixok11:46
bialixbut it could be great example even if it will be in the core11:46
bialixloading more plugins -> more delay at startup11:47
bialix@win3211:47
LarstiQbialix: more of a delay then when netrc would be in core?11:47
bialixwell, I know the difference is negligible small11:48
bialixbut it is11:48
LarstiQbialix: interesting. I'm not opposed to moving it to core, if you'd like to suggest that.11:48
* bialix just ramblings11:49
bialixI've tested converison of qbzr trunk to bbc11:49
bialixeverything seems ok11:50
LarstiQjames_w: no claims that I understand apt_pkg, but: cache = apt_pkg.GetCache(); package = cache[name]; package.VersionList11:50
vilabialix: I doubt netrc is of any use on windows11:51
LarstiQjames_w: scratch that, doesn't seem to relate directly to the sources.Lookup either, meh11:51
* bialix does not like unused things11:51
bialixas jam reported he found any file operations on win32 is much slower than on linux11:51
* vila thinks bialix should suffer like hell when looking the dlls on windows :)11:52
bialixso any unused plugin leads to slow down at start11:52
vilabialix: hmm, I see11:52
vilaBut I don't see an obvious way to avoid that either :-/11:52
bialixwhy it should be a plugin and not in the core?11:53
vilaFunny you ask, poolie raise a similar issue this morning. Larstiq is right though, I intended it to be an *example* plugin people could copy/paste11:53
bialixwow! qbzr repo shrinks after upgrade 4M -> 1M11:54
bialixvila: if this is a pure example, can it be placed in the folder "examples" ;-)11:55
* LarstiQ does actually use the netrc plugin11:55
vilabialix: it;s not pure, it is meant to be useful too :-)11:55
bialixbut not for windows user?11:55
vilabialix: not for the average windows user. I'm sure some of them have managed to use some exotic ftp client that use the '.netrc' file :-D11:57
bialixyep11:57
vila',netrc' is one of those "standard" files from the 70's11:58
bialixis this known effect for bbc: it works much faster when there is only one pack in the repo?11:58
spivbialix: it is known that it helps a lot to pack after upgrade to bbc.11:59
* bialix will keep building custom bzr.exe without this plugin11:59
bialixspiv: it was already packed11:59
bialixI'm testing format 2a in temp dir11:59
sodokuhey, we are doing c prrogramming homework every week at university. Some parts should evolve durings the homeworks. Any suggestions how to manage this with bzr?11:59
bialixspiv: but after upgrade repo has 4 or 5 packs12:00
spivsodoku: possibly a branch per assignment12:00
vilaspiv: are you aware of the strange bug related to #354036: when the fixer script updates the lp branch, its read-only mirror is not updated ?12:00
spivvila: that's a LP issue rather than a core bzr issue, essentially.12:01
james_wLarstiQ: it could just be a bug in apt_pkg of course12:01
vilaspiv: I agree, but that wasn't the question :-) Though I understand the answer to it is yes, right ?12:01
spivI am aware as of today or maybe yesterday, yeah.12:02
bialixthat bug is also about lp12:02
sodoku1spiv: can i remove or add files to branches? as some files don't need to be kept for all assignments12:08
vilajelmer: ping :-)12:11
spivsodoku1: you can always add or remove files from a branch.  I'm guessing you won't be merging much between assignments so you probably don't need to worry about a merge from a later assignment deleting files in an earlier one, for instance.12:11
vilaha, no, I meant jelmer: Ping12:12
spivsodoku1: the other obvious option is just one branch, maybe just tag each assignment when you submit it if you want to refer back to the old assignments easily.12:12
sodoku1spiv: ok, thanks12:12
bialixguys, 2a format is slower for branching standalone branchers12:12
bialixdo you aware of this?12:12
sodoku1spiv: ok, thanks12:13
sodoku1yeah, thats what i thought og12:13
spivbialix: I think so, igc has been doing a fair bit of benchmarking with the "usertest" tool with large branches.12:14
spivbialix: ISTR that being one of the known weaknesses still to be fixed.12:14
bialixISTR?12:15
spivI Seem To Recall12:15
spivIt might be interesting to know the numbers on Windows though, I don't think there's been much benchmarking done there with the new format yet.12:15
sodoku1spiv: which option would you prefer?12:15
spivProbably the results are proportionately the same as other platforms, but it's always worth checking...12:16
bialixon kerguelen maybe?12:16
spivbialix: yeah, that's probably a good option12:16
spivsodoku1: I dunno, it'd depend on what how it turned out :)12:16
bialixI don't have enough channel to download really BIG repo to test12:17
sodoku1spiv: branches would keep different folders for every branch? that would be better, as my dumb teacher doesn't understand bzr ;)12:17
spivsodoku1: I'd start with a branch for the first assignment, then when the next assignment starts decide then if it makes sense as a continuation of that branch, or a branch of that original assignment, or an entirely new branch.12:17
spivRight, there would be a folder for each branch.12:18
spiv(But you could still use a shared repository, see the init-repo command, to save disk-space)12:18
sodoku1spiv: ok, i will do it that way. Big thanks12:18
spivbialix: yeah.  Maybe mail igc with your observations, and ask if he wants to try testing on kerguelen?12:19
spivbialix: or volunteer yourself if you aren't busy enough ;)12:19
bialixno, thanks12:20
spivCertainly it might be good for igc to post an update with his latest numbers so we known where the known issues are.12:20
spivbialix: :)12:20
bialixI've sent some numbers to bz ML12:21
bialixspiv: I'm no more bzr dev12:21
spivbialix: cool, thanks12:21
spivbialix: I appreciate your input and efforts regardless of team membership :)12:21
spivbialix: btw, qbzr is pretty neat!12:22
bialixthx12:22
spivIt and kcachegrind are why I have qt installed on my system :)12:22
bialixunfortunately me and Gary have too little time to make it really cool12:22
bialixspiv: I can't push 2a branch to LP yet?12:28
bialixso12:29
spivbialix: Hmm, I don't think so, but I think they are planning on upgrading their bzr to 1.16 basically at the same time as it releases.12:29
bialixok, I've tried to test time of push12:29
bialixwill wait then12:29
fullermdWhat the frell?12:57
fullermdI can't upgrade from dev6 to 2a because "Does not support nested trees"??12:57
jelmerfullermd: patch pending13:00
fullermdOr dev7...   I thought 2a _was_ dev7, just with a different string...13:00
=== mrevell is now known as mrevell-lunch
LarstiQjames_w: http://apt.alioth.debian.org/python-apt-doc/apt_pkg/cache.html#pkgsrcrecords Lookup docs seems to imply you need to call it once per version.13:02
james_wthat's what the while loop does isn't it?13:03
LarstiQjames_w: except the first version can return None, and the second will return 113:03
LarstiQjames_w: in which case, the while loop will not call Lookup for the second version13:04
LarstiQjames_w: also,  Lookup seems to cycle between versions, so you can't count on StopIteration or the like..13:04
james_wweird13:05
LarstiQyeah13:05
* LarstiQ will go bother mvo with it13:05
sven_hi! is it normal that bzr gives conflicts after uncommit + revert on a fresh branch?13:20
sven_specifically, i did: bzr branch lp:mysql-server ; cd mysql-server ; bzr uncommit -r date:2008-12-01 ; bzr revert13:20
sven_that gave conflicts like "Conflict: can't delete mysql-test/collections because it is not empty.  Not deleting."13:20
sven_and also one conflict like "Conflict adding file mysql-test/include/diff_tables.inc.  Moved existing file to mysql-test/include/diff_tables.inc.moved."13:21
sven_is this a bug?13:21
fullermdI can certainly imagine cases where conflicts would be caused.  I'm not sure whether they apply here though.13:22
sven_fullermd, shouldn't branch+uncommit -r date:2008-12-01+revert be the same as branch -r date:2008-12-01?13:23
fullermdNo, not really.13:26
fullermd`branch + pull --overwrite -rdate:2008-12-01 .` would be more equivalent.13:27
=== oubiwann_ is now known as oubiwann
fullermdPrior to the revert you have a pile of uncommitted changes sitting around, which may conflict with going to the base state.13:27
sven_fullermd, ok, thanks for explaining! i'll try pull --overwrite instead.13:31
fullermdWell, really using branch -r would be the best choice if that's what you want to end up with   :p13:31
fullermdSaves a lot of steps (and copying a fair hunk of data, if you're crossing repos)13:31
sven_fullermd, right, of course :-) i just wanted to know why branch+uncommit+revert didn't work the way i expected13:32
sven_when i run bzr gci, i get this stack trace: http://pastebin.com/m40b8163a . i'm using the latest bzr from http://bazaar-vcs.org/bzr/bzr.dev/ and the latest gtk plugins from http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk/13:50
spivsven_: I think bzr-gtk is a little behind recent changes in bzrlib's API.13:51
pygiit is, yes spiv13:51
vilasven_: a patch is under review13:51
sven_spiv, vila, ok, thanks. any idea which revision of bzr i can revert to?13:52
vilasven_: not from the top of my head, search for a progress bar related commit by martin pool13:53
spivsven_: tag:bzr-1.15.1 is probably simplest.13:53
sven_vila, spiv, thank you!13:53
pygihi vila btw13:56
vilapygi: hi :)13:57
rchadyIs it possible to change the name of the repo?  i.e. configure bzr to use .mybzr or similar?14:06
fullermdNot without hacking bzr.14:07
=== mrevell-lunch is now known as mrevell
gioelehello14:13
rchadybummer ok14:14
rchadyhoped there was a config option14:14
gioeleplaying with bzr fast-import I messed up a branch. Give that I cannot remove the working tree because it contains some valuable but ignored files,14:18
gioeleI was thinking about copying the .bzr directory from the push location over the mangled .bzr directory in the branch. Are the two bzr directories compatible or are they different?14:18
fullermdFortunately, the answer to that is simplicity itself.14:22
fullermd"It depends"   :)14:22
gioelefullermd: on what?14:23
fullermdWell, pretty much on details of what each location is/has/etc.14:23
vilagioele: why don't you try the opposite instead ?14:23
fullermdEither or both have internal repos?  Branch heads at the same revision?  WT state the same?  etc.14:23
vilacopy the working tree over a freshly pulled branch14:24
gioelefullermd: each one is a standalone branch (well, one was before having its .bzr corrupted)14:24
gioeleis it possible to branch into/over a directory that is not empty?14:25
gioeleI can then remove the corrupted .bzr and "bzr branch $pushed_branch $old_wt"14:26
vilagioele: bzr branch --no-tree14:27
vilagioele: and then copy your WT (except .bzr) over there14:27
guilhembivila: hello! more and more colleagues are hitting https://bugs.launchpad.net/bzr/+bug/385191 just by upgrading to the latest bzr.dev; could this be prioritized, please?14:27
ubottuLaunchpad bug 385191 in bzr-gtk "removal of ProgressBarStack has broken bzr-gtk" [Critical,Confirmed]14:27
guilhembivila: they can't commit anymore :(14:27
gioelevila: that could be a good solution14:27
vilagioele: doing it that way will provide you with a sandbox where you can experiment over and over again14:28
guilhembivila: is there a quick fix that could be pushed ?14:28
vilaguilhembi: the fix *is* available at lp:~vila/bzr-gtk/385191-new-pb14:29
vilaguilhembi: it is under review for inclusion in bzr-gtk trunk14:29
guilhembivila: thanks! The faster it goes in the trunk, the least colleagues hit it and have to temporarily downgrade.14:29
vilaguilhembi: hopefully bzr-gtk-0.96 will be released soon after14:29
vilaguilhembi: your preaching the choir !!!14:29
vilaguilhembi: why do you think I marked it critical ? :-D14:30
guilhembivila: the problem is that colleagues are upgrading now, as they have learnt that gcommit saves commit messages when cancelled, in the latest bzr-gtk.14:30
vilaguilhembi: I know, I'm sorry about that :(14:30
vilajelmer: PING14:30
vilajelmer: :-)14:30
guilhembivila: Looking to the future: given that bzr-gtk is so critical, would it be possible that, before there is a push in bzr.dev, this somehow automatically runs bzr-gtk tests to verify that the push it not breaking it (even though the fault is more on bzr-gtk here)?14:31
guilhembi(fault by not changing code though class was deprecated)14:31
vilaguilhembi: 1) Not enough tests in bzr-gtk so far, 2) the class has been deprecated since 1.1214:32
Spabbyawilkins how do I checkout a branch from a central server onto my linux box, it has bzr + olive branch installed14:41
Spabbyhmm14:43
Spabbydo I need to create a local branch first before updating it from the central server?14:43
Spabbyalso is the bzr website down for everyone or just me ;)14:45
spivHmm, it's down for me too.14:45
Spabbybah!14:45
vilasven_: let's try to go forward instead of backward, how about trying bzr.dev and lp:~vila/bzr-gtk/385191-new-pb ?14:45
spivSpabby: it's back14:48
Spabbyyep thanks14:48
Spabby:)14:48
sven_vila, i still get the same crash :-(14:49
vilasven_: this one http://pastebin.com/m40b8163a ?14:53
vilasven_: then you didn't update bzr-gtk, double-check14:53
sven_vila, yes, the same one. i just tried again with the same result: 'cd ~/.bazaar/plugins ; rm -rf gtk ; bzr branch lp:~vila/bzr-gtk/385191-new-pb gtk'14:57
sven_vila, bzr version and bzr plugins say this: http://pastebin.com/m2a9b7b1114:58
vilasven_: bzr plugins -v14:59
sven_vila, http://pastebin.com/m4a4ee23b15:01
vilasven_: also, lp:~vila/bzr-gtk/385191-new-pb was missing a minor cosmetic change, try updating your branch and do 'bzr revno' there it should say 64815:01
vilasven_: hey, that's a different traceback !15:02
sven_vila, ok, i got revno 648, but it still crashes...15:02
sven_oh, is it?15:02
vila#15:02
vilaAttributeError: 'gtksourceview2.LanguageManager' object has no attribute 'guess_language'15:02
vila#15:02
vila 15:02
vilano idea about that one though :-(15:03
vilasven_: but it doesn't happen here15:04
sven_vila, very strange15:06
sven_vila, i can repeat it every time. it doesn't matter which repo i'm in when i issue bzr gci15:06
sven_vila, shall i report a bug or is this an unsupported branch of bzr-gtk?15:07
vilasven_: I'm pretty sure it hasn't been introduced by that branch but by a previous modification in bzr-gtk, additionnally it may be specific to your config, what OS/version are you using ?15:08
sven_vila, Linux riska 2.6.24-24-generic #1 SMP Wed Apr 15 15:54:25 UTC 2009 i686 GNU/Linux15:09
vilasven_: what distro ?15:09
sven_vila, ubuntu15:09
vilahardy, intrepid, jaunty ?15:09
sven_vila, hmm, how do i tell?15:10
vilasven_: Man ! You just *know* it :-D15:10
sven_vila, :-)15:10
* vila shouting: Damn, how do you know which ubuntu version you're using ?15:11
sven_vila, ok, cat /etc/lsb-release says it's hardy15:12
vilasven_: easy then upgrade !15:13
vilaoooops15:13
vilaok, so bzr-gtk@639 says: Merge GtkSourceView2 migration patch.15:13
sven_vila, ok, i guess it was time to upgrade anyways...15:18
vilasven_: ha, the README says: In order to see syntax highlighted diffs:15:18
vila  * GtkSourceView2 Python bindings (on Debian and Ubuntu systems, these15:18
vila    are in the python-gtksourceview2 package)15:18
sven_vila, so you mean it's not supposed to work on hardy?15:18
vilasven_: wait, I was joking, try the above first !15:18
vilaa crash is a bug if hardy is not supported traceback is not a good way to tell you15:19
sven_vila, ok :-)15:19
sven_vila, i have python-gtksourceview2 installed already15:20
vilasven_: and it's still crashing ?15:20
bengeehi, not sure if this is an faq: I have a project with a couple of modules (in sub-directories) and I'd like to allow checkouts of individuals modules, is that possible or do I need a separate branch for each module?15:20
sven_vila, yes15:20
vilasven_: argh, so either I install a VM with hardy or you upgrade to jaunty :-/15:21
vilain any case, please file a bug while you can reproduce it15:21
sven_vila, ok, i filed https://bugs.launchpad.net/bzr/+bug/38635915:35
ubottuLaunchpad bug 386359 in bzr "bzr gci crashes on Hardy w gtk from lp:~vila/bzr-gtk/385191-new-pb" [Undecided,New]15:35
vilathanks15:35
vilasven_: Can you try http://paste.ubuntu.com/194407/15:42
bialixvila: can we talk a bit about SavedCommitMessageManager from bzr-gtk?15:43
vilabialix: EOVERFLOW :-/15:43
sven_vila, yes, that works!15:43
vilabialix: ha, wait :D15:43
vilasven_: great ! At least you're unblocked !15:44
* bialix explodes15:44
bialixand wait15:44
sven_vila, yes, thanks!15:44
vilabialix: I still have a huge mail backlog so if thins have been discussed further on the qbzr ML I may not be up to date15:46
bialixno, it was not discussed yet15:47
bialixbut if you're busy with your mails, maybe I need to wait couple of days15:47
bialixI just have couple of questions about design of that class15:48
bialixit seems you've touched it15:49
bialixbut may be not you wrote it15:49
=== omichael is now known as omichael_afk
vilaguilhembi: ping17:04
=== omichael_afk is now known as omichael
=== sabdfl1 is now known as sabdfl
davidstraussHow does bzr detect whether something is a line-mergable text file?18:36
davidstraussbzr gave me a "contents" conflict on a .test file that's actually just php18:36
Peng_davidstrauss: It just checks for the presence of NUL bytes.18:38
davidstrausshmm18:38
LarstiQdavidstrauss: was there a file-kind change involved?18:40
davidstraussno18:40
davidstraussBut there are people editing on Windows and other funky platforms18:40
davidstraussthought line endings are consistent18:40
ronnysup19:00
ronnyLarstiQ: aware of anyone here toyed with the idea of tracking changes instead of snapshoots19:01
LarstiQronny: darcs19:01
LarstiQronny: in essence it is a dual problem19:01
ronnyLarstiQ: that one is not exactly usable out of its user-oriented cli19:02
LarstiQronny: right. Coudld you elaborate on what you're looking for?19:02
ronnyLarstiQ: well, im looking for more things that allow version controll in terms of related changes instead of snapshoots19:03
ronnykills the need for rebase and the most kinds of merges19:03
LarstiQronny: quilt, mq, looms, that sort of thing?19:03
ronnyLarstiQ: those are at best workarounds, changes are not first class members of the history there19:04
ronnyLarstiQ: bascially darcs and camp are the only ones that do at least the basic structure reasonable19:04
fullermdThere are just as many problems that come from states being derived as there are from changes being derived.  They're just different problem.19:05
ronnyfullermd: i want something that can deal with heavy cherrypicking propperly19:06
jelmerronny: subversion >= 1.5 does that to some extent19:07
jelmerronny: better than bzr/hg/git afaik19:07
ronnyjelmer: svn is not distributed, and i doubt they have a sane ui19:09
LarstiQronny: svk? ;)19:10
ronnyLarstiQ: whenever i tried that one it was epic fail19:13
* LarstiQ nods19:14
=== omichael is now known as omichael_afk
=== cprov is now known as cprov-afk
fjlacostemy gpg env seems screwed21:29
fjlacostegpg: problem with the agent - disabling agent use21:29
fjlacosteaborting commit write group: SigningFailed(Failed to gpg sign data with command "[u'/usr/bin/gpg', '--clearsign']")21:29
fjlacostebzr: ERROR: Failed to gpg sign data with command "[u'/usr/bin/gpg', '--clearsign']"21:29
=== fjlacoste is now known as flacoste
flacosteanybody way i could get more info out of this failure21:29
LarstiQflacoste: is gpg agent usable outside bzr?21:30
LarstiQflacoste: wild guess, GPG_TTY?21:30
flacosteLarstiQ: it is running, but kmail doesn't seem to be able to use it either, so i guess not21:30
flacostebut BZR does prompt me for my passphrase21:30
flacostehmm, $GPG_TTY is not set21:31
flacostebut GPG_AGENT_INFO is21:31
LarstiQflacoste: in my case, when that happens, I take out the openpgp card from the reader and reinsert it21:31
flacosteand running gpg from a terminal works (but the agent doesn't there either)21:31
flacostelol21:31
flacostei don't have a card21:31
LarstiQflacoste: GPG_TTY need not be, but in some cases the agent can't find the tty to acquire the passphrase from. Doesn't seem to be this case.21:32
LarstiQflacoste: right :)21:32
flacostei've reinstalled on another computer21:32
flacostein my other working setup, pinentry-qt4 is used21:32
* LarstiQ uses pinentry-curses21:32
flacosteif i run gpg-agent by itself in the terminal21:32
flacostei get21:32
flacostegpg-agent: gpg-agent running and available21:33
LarstiQflacoste: right21:33
LarstiQflacoste: try gpg -d some-encrypted-file21:33
LarstiQflacoste: or ssh-add -L if you've started gpg-agent with --enable-ssh-support21:33
flacostenope, the default ubuntu setup is used21:33
flacosteand gpg-agent is run inside ssh-agent21:34
LarstiQok21:34
flacoste[francis@Casteneda testfix]$ gpg -d zdaemon.conf.asc21:34
flacosteYou need a passphrase to unlock the secret key for21:34
flacosteuser: "Francis J. Lacoste <francis.lacoste@Contre.COM>"21:34
flacoste1024-bit ELG-E key, ID 96196F76, created 2001-01-18 (main key ID 2CB3F937)21:34
flacostegpg: problem with the agent - disabling agent use21:34
flacostegpg: encrypted with 1024-bit ELG-E key, ID 96196F76, created 2001-01-1821:34
flacoste      "Francis J. Lacoste <francis.lacoste@Contre.COM>"21:34
LarstiQright21:34
flacosteentering the passphrase on the terminal decrypts the file21:34
LarstiQflacoste: this may be a case of bzr paying attention to the gpg exit code, even though signing succeeded21:35
flacosteah right21:35
flacoste[francis@Casteneda testfix]$ echo $?21:35
flacoste221:35
flacostethat's after a succesful clearsign21:35
flacostebut with agent problem21:36
* LarstiQ nods21:36
flacosteshould I file a bug about that?21:36
flacostei guess so...21:36
* LarstiQ is checking if there is one21:36
LarstiQwhy is my battery empty _yet again_‽ :(21:38
flacoste#44755 bzr commit fails when GPG agent is unavailable21:38
flacostefix released21:39
flacostei guess not21:39
flacoste(low)   21:39
flacoste#54468 sign-my-commits fails when gpg-agent and pinentry-curses are being used21:39
LarstiQflacoste: from the comments I don't see why #44755 would be fixed21:41
flacostei'm reoping with a suggestion to use Won't Fix :-)21:41
flacosteany idea of where i should go to get help with my gpg-agent problem?21:43
=== omichael_afk is now known as omichael
LarstiQflacoste: did you try the GPG_TTY suggestion?21:44
LarstiQflacoste: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=32293221:44
ubottuDebian bug 322932 in gnupg-agent "gpg-agent does not play well with other programmes" [Normal,Open]21:44
flacostewell, i suspect a deeper issue, since ideally, i'd like also to get it working with kmail21:45
flacostei mean, it's not even working for the gpg command line itself21:45
flacosteah:21:46
flacosteah:21:46
flacostewrite(8, "GET_PASSPHRASE A2B3F83DE11E0C7247"..., 223) = 22321:46
flacostewrite(8, "\n"..., 1)                    = 121:46
flacosteread(8, "ERR 67108949 No pinentry <GPG Age"..., 1002) = 3721:46
flacostewrite(2, "gpg: "..., 5gpg: )                 = 521:46
flacosteseems that gpg-agent thinks there is no pinentry configured21:46
flacostedo you happen to know how this is usually configured?21:46
flacosteah!21:48
LarstiQflacoste: my ~/.gnugp/gpg-agent.conf has: pinentry-program /usr/bin/pinentry-curses21:48
flacosteyep, just found that21:48
flacosteit seems it points to a now non-existent program21:48
flacostethat's what happens when you copy config files voer21:48
LarstiQdoh :)21:48
flacosteLarstiQ: all sorted out now, thanks for the support!21:52
LarstiQflacoste: gladly :)21:53
=== Kissaki is now known as Kissaki^0ff

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