pooliehello bialix00:00
bialixpoolie: do you have any specific plans for 2.2.1?00:00
bialixI mean a more or less precise date00:01
bialixbecause I need to release qbzr 0.19.100:01
poolielet's see00:05
pooliethe actual freeze date for 2.2.0 is over a month ago now00:06
pooliewe could do it pretty soon00:06
pooliewhen do you want to do 0.19.1? sooner, or later?00:06
jelmer'morning poolie00:07
pooliehi there00:07
pooliei wonder what's in the 2.2 branch now?00:08
bialixpoolie: I want to have 0.19.1 sooner or in time with 2.2, so GaryvdM can bundle it into installer00:08
pooliecould you do it early next week and then we'll do 2.2.1 after that?00:09
bialixI'll do it this weekend then00:09
pooliemy fixes for add are in there, plus some smaller fixes00:09
poolieand they had quite a few dupes and would be worth getting out=00:09
* bialix eods00:11
pooliegz, bialix, i'll resubmit the setlocale patch01:07
poolieoh apparently jam sent it, and it's working through pqm01:08
mgzpoolie: what would a fixture for thread leaking entail? for the moment I've kept it all as-is but moved it to the test result (...and then poked various other unrelated things nearby that I probably should have filed seperate bugs on but kept breaking stuff)01:11
pooliebasically just moving everything in to a self contained object that's notified when the test starts and finishes01:13
mgzI think this is pretty low-overhead though, and having to enable it per-testcase will probably mean we miss tests that aren't obviously using threads01:13
pooliei don't know if that's enough01:13
poolieit could be confined to a fixture even if the base bzr testcase always starts it01:13
poolieie you don't need to do it per case01:13
mgzI'll wham what I've done up in a mp as it might be easier to discuss there01:14
mgzbah, this is so going to conflict with my other branch, should have thought of that01:16
=== mlh_ is now known as mlh
pooliehi spiv02:12
spivhi poolie03:04
spivThere's a regression in 2.2 I'm filing now that I'd like to have fixed in 2.2.103:05
poolieoh ok, thanks for filing it03:05
spivbzr+ssh:// to pre-1.6 bzr smart servers fails :(03:06
=== zyga-kids is now known as zyga
spivpoolie: https://bugs.edge.launchpad.net/bzr/+bug/633745 is the bug, btw03:39
ubot5`Launchpad bug 633745 in Bazaar "bzr+ssh to pre-1.6 server fails with AttributeError: 'NoneType' object has no attribute 'close' in close_ssh_proc (affected: 1, heat: 6)" [Critical,Confirmed]03:39
lifelessis that related to the spam we're getting from crontab I wonder?03:39
pooliealmost not critical, but worth fixing03:39
spivIt's pretty shallow, but it's disappointing that hpss to pre-1.6 servers was broken in 2.2, after we had a different bug breaking it in 2.1.03:40
spivOh, I forgot, I have a plugin users can install as a workaround (this bug originally came up IRC yesterday)03:41
spivlifeless: yes, I expect my fix will assist with some noise from various scripts, not sure if it's the spam you're specifically thinking of...03:42
lifelesssomething about ssh and NoneTypes ;P03:42
spivProbably the same, then :)03:43
lifelessplease for the love of puppies fix it.03:45
lifelessits driving crontab mail for lp nuts ;)03:45
spivlifeless: it seems the love of puppies isn't enough to inspire a bug report, though?03:46
lifelessspiv: pretty sure someone was doing one03:48
lifelessspiv: I didn't file one myself because of that03:48
spivlifeless: yeah, I thought there would be too, but a few searches didn't find any.03:49
lifelessException AttributeError: "'NoneType' object has no attribute 'close'" in <bound method SmartSSHClientMedium.__del__ of SmartSSHClientMedium(bzr+ssh://lifeless@bazaar.launchpad.net/)> ignored03:49
lifelessException AttributeError: "'NoneType' object has no attribute 'close'" in <function terminate at 0x24490c8> ignored03:49
lifelessis what I see03:49
lifelessthat case is ec2land, but it looks very similar in cron mails03:49
spivYeah, that's the bug.  Until this manifestation I didn't know it was more harmful than occasional noise on stderr.03:51
* spiv -> lunch04:33
=== oubiwann is now known as oubiwann-away
=== oubiwann-away is now known as oubiwann
lucidfoxIs there an equivalent of git merge --squash? I.e. merging several subsequent commits from a different branch into one?06:41
dashthat's what merges _are_ :)06:41
dashso yes, 'bzr merge'06:42
spivWell, if you really want to act like --squash, I think you'd also need to do 'bzr revert --forget-merges' after 'bzr merge'.06:45
spivBut I may be skimming the git docs too hastily.06:45
lucidfoxWait, then how do I do a merge the way git merge works - preserving commit history from the other branch?06:49
spivThat's just 'bzr merge'.06:49
spivIIRC, 'git merge' with no args is roughly like 'bzr merge --pull && bzr commit'06:53
spivOr if you prefer, 'bzr merge' with no args is roughly like 'git merge --no-commit --no-ff'.06:54
lucidfoxThat's great :)06:55
lucidfoxSo far I've actually found bzr having fewer gotchas and obscure corner cases than git06:55
lucidfoxand more intuitive overall06:55
spivThat's what we're aiming for :)06:55
FryGuy-i think it's only confusing for people that deeply understand git, and can't see why anyone would want to do it differently06:56
lucidfoxWell, it has saner defaults06:57
FryGuy-i really like bazaar's "a branch is a path" over the whole repository thing git has.. having two semanticly different things that you have to deal with confuses me a lot06:58
FryGuy-that too06:58
lucidfoxI actually miss parallel instantly switchable branches06:58
FryGuy-i have that06:58
FryGuy-it's not intuitive how to get it in bazaar though06:59
FryGuy-you can have a path for your working folder be a checkout of a branch, and then bzr switch between branches07:00
spivlucidfox: I'm sure someone in here can walk you through how to set that up in bzr; short description is 'have a lightweight checkout that you bzr switch between (treeless) branches'07:00
FryGuy-and you can do things like bzr qlog \dev\branches\*07:01
poolieok so after all that distraction i'm going back to prompting to break locks07:30
vilahi all !07:49
vilafullermd: lol, catch e: drink more coffee08:06
vilaenthusiasm is good, can't live without it.08:06
lifelesssure you can :P08:06
lifeless^- not enthusiasm :)08:07
vilawell I can... but...08:07
fullermdCoffee doesn't add to enthusiasm.08:07
vilathe sky isn't always blue nor the sun shining, better rely on inside resources :)08:07
poolievila how hard do you think it would be to write textuifactory tests against a scriptrunner?08:07
vilafullermd: being awake helps finding it back :-P08:08
fullermdKinda the opposite, actually.  It makes me more alert, so I better understand the !#&$*%@ my clients try to say, which makes me less enthusiastic about anything other than mass murder...08:08
fullermdBut then, you can't spell "slaughter" without "laughter", so I guess it's not entirely unrelated.08:08
vilapoolie: use '<' ? Oh no, you mean hooking a textuifactory into stdin ?08:08
pooliemm, hooking up the streams08:08
poolieprobably not too hard?08:09
vilayup, if it's not, that's a bug08:09
vilafullermd: see ? Laughing is good, always. Do you think DEATH don't laugh at you ?08:11
* vila shamefully recycles a Desproges's joke :)08:11
vilaerr, shamelessly ?08:11
vilaif I start typoing shamefully as a portementeau between shame and fullermd where will I end...08:12
fullermdMississippi, apparently.  So try to avoid it  :p08:13
poolievila will it cope with input or output that's not a full line?08:15
poolieeg i want a script like08:15
poolieBreak lock?08:15
poolie< y08:15
vilapoolie: no idea, but your input will likely includes a new line. But char-based input... is tricky08:16
pooliethat's ok, i don't need sub-line input08:17
pooliejust for it to cope somehow with an output bit with no trailing \n08:17
pooliei might try it08:17
vilapoolie: c.f. shelve input handling requires setup under emacs for example08:17
vilapoolie: but I don't think textuifactory *allows* char-based input08:17
poolieto tell emacs to send it single keystrokes not lines08:18
vilashelve use a dedicated method for that (~90% sure)08:18
vilapoolie: no, fully different subprocess handling08:18
vilaI set it up once but it was... sub-optimal, so I'm back to 'shelve --all' only08:19
poolieiwbn for it to detect stdin couldn't do single characters, and then read lines08:20
poolieisn't there M-x terminal or something like that, that should send single chars?08:20
poolieoh maybe that's what you mean08:20
viladon't remember the exact mode, but yes, one that doesn't consider stdin to be line-based like the venerable shell-mode08:21
vilaI think that's why I revert, not everything I needed was supported there or the interactions was too much different08:22
=== spm changed the topic of #bzr to: Launchpad down/read-only from 0800-1100 UTC for a code update | Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: poolie | Release Manager: jam | bzr 2.2.0 is officially out
vilapoolie: another way to fix the problem will be to have shelve use a uifactory that could be configured to requires that any input includes a <return>08:24
pooliethat's what i meant08:24
vilaoh, that would be really sweet ;)08:24
poolieif $TERM=emacs, or something a bit smarter08:24
poolieoh, again :/08:25
=== poolie changed the topic of #bzr to: Launchpad down/read-only from 0800-1100 UTC for a code update | Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: poolie | Release Manager: jam | bzr 2.2.0 is officially out | patches welcome: http://webapps.ubuntu.com/employment/canonical_BSE/
poolievila what do you think of something like http://paste.ubuntu.com/490797/08:46
bialixhey vila, poolie, and all all all08:47
spivpoolie: nice /topic update :)08:47
bialixvila: as you work on conflicts again, I would like to ask: is it worth to extend auto-resolve logic to check whether conflicted path still exists, especially when conflict about inability to delete some dir and if there is no such path anymore just mark conflict as resolved?08:48
poolie:) i think that's exactly what he was just oding08:48
vilapoolie: x and y or z hurts08:48
vilabialix: yes08:48
poolieoh, true08:49
bialixI thought vila working on moving garbage to the trash can08:49
lucidfox"Launchpad will be going offline for maintenance in ten minutes." <--- nnnooooo!08:49
pooliei don't normally use it but in that context it's ok08:49
pooliei know08:49
vilabialix: that's related :)08:49
bialixok, then08:49
vilahttp://wiki.bazaar.canonical.com/VincentLadeuil/ConflictResolution for a broader view08:49
vilabialix: moving unversioned files to bzr-orphans dir get rid of some conflicts so they don't even have to be resolved08:50
bialixI think my thought is related but has its own benefits08:50
vilabialix: this also avoid requiring a disctinction between precious and junk files by *not* deleting them08:51
vilabialix: see the wiki above, orphaning is a simpler first step08:51
bialixand may help to fix bug 62856108:51
ubot5`Launchpad bug 628561 in Bazaar Explorer "delete should move files to the trash (affected: 2, heat: 16)" [Low,Confirmed] https://launchpad.net/bugs/62856108:51
* bialix looks08:52
vilabialix: bug #628561 is yet another variation, the patch I'm working on requires the orphan dir to part of the working tree so far,08:53
ubot5`Launchpad bug 628561 in Bazaar Explorer "delete should move files to the trash (affected: 2, heat: 16)" [Low,Confirmed] https://launchpad.net/bugs/62856108:53
vilabialix: I have some ideas about how to allow it to be *outside* of the working tree but it requires more work (basically requiring it to be inside the wt guarantees that we rely on TreeTransform including rollbacks)08:54
bialixyes, because system trash can is very system dependent, I can use your orphan dir as poor man emulation08:54
poolieok https://code.edge.launchpad.net/~mbp/bzr/ui-factory/+merge/34956 posted, with the same diff08:54
vilapoolie: isn't it a good place to start implemeting a simple fixture08:56
vilabah, I should comment on the mp instead08:56
* bialix waves at GaryvdM08:56
pooliefor what? the test ui factory?08:56
pooliehi gary08:57
poolieok, i'm off to take an umbrella to stephane at her office :)08:57
GaryvdMHi all08:57
vilapoolie: make_test_ui_factory08:57
poolievila, it may be08:57
vilapoolie: you've seen my PM ???08:57
pooliei don't know if it would add much when no cleanup is needed08:57
* GaryvdM has been lurking...08:58
vilapoolie: well, it's even more interesting when no cleanup is needed since you don't tie the fixture to the test class08:59
vilaor something08:59
vilaand the other end, make_test_ui_factory not accepting parameters for stdout and stderr while not hinting about it in its name also itches a bit09:00
pooliewell, it was only a tiny change09:00
bialixGaryvdM: any success with your own build host?09:01
vilayeah, no problem, and they can be added later and using a test method also allows for simpler implementations, just mentioning09:01
vilaGaryvdM: tell us yes :)09:01
vilapoolie: I think my point is more: hey, this goes in the right direction for fixtures, way to go !09:02
* poolie feels better now :)09:02
pooliei think tearing bits of test base classes into fixtures would be nice too09:02
GaryvdMbialix: I got stuck where it can't find htmlhelp. I've fix this before on the ec2 server, so this time I'll make sure to document what I did :-p09:03
vilayup. defining such test methods is waaaay better than duplicating their content all over the place09:03
bialixGaryvdM: yep09:03
GaryvdMI was very tired last night, so I did not try to hard.09:03
vilaGaryvdM: way to go (Did I just said that earlier ?)09:03
spivOk, I think I'm done for the day.  See you tomorrow!09:16
vilaspiv: cu09:18
vilaARGH, lp down... iwbn to be able to setup a bzr branch to fallback to a local mirror for ready-only ops...09:18
vilalike in being able to handle 'bzr diff -rsubmit:' without tweaking branch.conf09:19
* vila goes filing a bug on .... idiot09:19
=== bialix_ is now known as bialix
voidspaceso I have a locations.conf in ~/.bzr12:05
voidspaceshould that be ~/.bazaar?12:05
GaryvdMvoidspace: Yes12:13
vilathat makes two questions the same day that could be answered by 'bzr config' or something...12:21
vilavoidspace: the closest today is 'bzr version' which mentions 'Bazaar configuration'12:21
=== Ursinha-afk is now known as Ursinha
voidspacevila: thanks12:34
mgzhey all.13:35
GaryvdMHi mgz13:35
vilamgz: hey !13:50
vilamgz: reviewing lp:~gz/bzr/selftest_leaked_threads_measuring_633462 is high on my TODO list, many thanks for working on that, I wasn't finding the time myself and that was frustrating13:53
mgzI ended up touching more stuff than I intended to, and thought of a way of doing less moving around of code before I fell asleep last night13:54
mgzbut as I'm on a selftest bent I thought I go through and try and knock off all the stuff that has been annoying me for a while13:54
mgzsomething like ~10 bugs... how fast can I squish 'me13:55
vilamgz: try using a loom for that so you can more easily make several submissions13:57
mgzI was using shelve, but the fix broke some unrelated tests that were doing slightly dodgy things, and can't submit a mp with failing tests... it spiralled a little just when I was trying to get to bed13:58
vilaI know the feeling :-/14:04
maxbIs anyone out there running < lucid any more, who could volunteer to test bzr-svn in the proposed ppa/14:10
GlenjaminHi guys, is there any way to force a bzr+https URL to use urllib instead of pycurl?14:41
GlenjaminThe certificate is invalid on the server, but i know its fine.14:41
bialixtry urllib+bzr+https14:42
vilabzr+https+urllib ?14:42
bialixvila knows better14:42
vilabialix: you were right, but order matters14:42
vilaGlenjamin: are you sure you bzr+ in front ? (I don't remember if all combinations are registered)14:43
vilaGlenjamin: are you sure you need bzr+ in front ? (I don't remember if all combinations are registered)14:43
vilaGlenjamin: we probe for a smart server anyway so this shouldn't be required14:43
Glenjaminit's a writable smart server over https14:43
vilaGlenjamin: in fact there is a nosmart+ prefix to *disable* this probe14:43
Glenjaminbzr: ERROR: Transport operation not possible: http does not support mkdir()14:44
Glenjaminbzr push https+urllib://url14:44
vilaor is this error message generic ? Ha, seems so14:44
vilaok, try bzr+https+urllib then14:45
Glenjaminnot registered14:45
GaryvdMmaxb: I have a hardy vm. But I'll only be able to look tommorrow.14:45
Glenjaminis there any way to disable pycurl, or make SSL exceptions? I found a couple of bugs on LP, but they seem to be old14:46
vilaGlenjamin: there are several that relates to that, old, yes, lack of time :-/14:46
Glenjamini'll just turn on http until i get the cert sorted i guess14:47
vilaGlenjamin: there is something weird in your server config that makes the probe fails maybe, to you have a .bzr.log handy ?14:47
vilaGlenjamin: I was 99% sure we didn't need to register bzr+https+urllib since urllib is already the default, let me check14:50
vilaGlenjamin: argh, yes, urllib is the default for http but pycurl is still the default for https14:50
vilaGlenjamin: the idea is that since some people relies on ssl certificate verifications we can't disable it by default14:51
vilaGlenjamin: there is more than one client involved right ?14:51
Glenjaminthere will be, yes14:54
vilaGlenjamin: the best I can offer then is  plugin, but it should be installed on all clients... and uninstalled once you fix your certificate :-/14:54
Glenjaminyeah, i'm planning to put a plugin on anyway for a shortened url scheme14:55
Glenjaminbut normally i'd have the plugin in the repo and have users use the full URL once to get the plugin14:55
vilaGlenjamin: lp:~vila/+junk/defaultToUrllib a bit dusty, but still working without any updates for... OMG, I never committed it :)14:57
vilaGlenjamin: just a sec :)14:57
vilalast modification date is 2008-01-22 16:25...14:58
Glenjamini've just allowed bzr+http access for now14:58
Glenjamini think we've got a cert for this domain somewhere14:58
vilaGlenjamin: which means your passwords are in the clear then (if you use Basic)14:59
Glenjaminits on the same subnet, it'll do for the next few days15:00
vilaGlenjamin: ok, np with me :)15:00
vilaGlenjamin: I didn't hear anything anyway, I wasn't even there15:01
vilaGlenjamin: ok, lp:~vila/+junk/defaultToUrllib is now up-to-date, feel free to copy/paste in your own plugin if you have some deployment policy for it15:02
Glenjamini'm now getting ('error', "'module' object has no attribute 'ElementTree' back from the server =/15:03
Glenjamini'm fairly sure it was working before15:03
vilaGlenjamin: this rings a bell, 'bzr version' on the server ?15:03
vilaI'm pretty sure we've fixed something there quite recently, mgz ?15:03
mgzyeah, get the latest bzr-xmloutput plugin15:04
mgzor... is that the same error? no, something else.15:04
mgzcan you get the full traceback from the .bzr.log on the server?15:05
Glenjamini can, once i figure out how to get the wsgi app to log :)15:06
vila2.1.1... meh, when did your related modification landed mgz ?15:07
vilaGlenjamin: and on the client ?15:07
=== james_w` is now known as james_w
Glenjaminclient: http://pastebin.com/MCXszMBS15:09
vilahmm, bzr-xml-output shouldn't be involved there, this is happening in the server, we need its log :-/15:11
vilaGlenjamin: well, we need the traceback, it should be in the log, but if you find it elsewhere, that's good enough :-/15:11
vilaGlenjamin: and that's cetainly worth filing a bug15:12
vilaGlenjamin: ...unless you have some hooks installed on the server that could involve xmloutput ?15:12
=== zyga is now known as zyga-afk
Glenjaminvila: the server doesn't even have xmloutput =/15:22
vilaGlenjamin: good, one less possible cause15:23
vilaGlenjamin: the weird thing is, I'm pretty sure mgz related change occured only on trunk, not in 2.1 nor 2.215:23
Glenjaminmanaged to get the server log15:24
Glenjaminthe wsgi make_app tries to access stdin/out which mod_wsgi doens't allow15:25
Glenjaminah, it seems to be exactly https://bugs.launchpad.net/bzr/+bug/25427815:29
ubot5`Launchpad bug 254278 in Bazaar "module object has no attribute ElementTree (affected: 2, heat: 7)" [Low,In progress]15:29
vilaGlenjamin: https://code.edge.launchpad.net/~gz/bzr/remove_monkey_patched_elementtree_escaping_614522/+merge/34028 may be relevant too15:35
Glenjaminis that in 2.2?15:37
vilaGlenjamin: I don't think so, checking... no15:39
Glenjamini'll monkeypatch the server then, ta15:40
vilaGlenjamin: can you comment on bug #254278 ? With your bzr version and the log, this probably will be just a backport of the above fix but I can't investigate precisely right now15:42
ubot5`Launchpad bug 254278 in Bazaar "module object has no attribute ElementTree (affected: 2, heat: 12)" [Low,Confirmed] https://launchpad.net/bugs/25427815:42
vilaGlenjamin: oh, if you path your bzr on the server, say so in the bug then !15:42
vilaGlenjamin: oh, if you apply the patch to bzr on your server, give some feedback  in the bug too !15:43
Glenjamindone, thanks for the help :)15:47
vilaGlenjamin: perfect15:51
vilaGlenjamin: thanks to you, knowing that the fix works is a good part of the... work :)15:52
mgzah, so I actually fixed his bug, rather than creating it?15:53
vilamgz: yeah :) All you have to do now, is 1) fire an mp for backporting it to 2.1, 2) assign the bug to yourself..... 4) profit ! ;)15:54
mgzI'd better just check a profile under 2.1 as well to make sure it's not using the hack majorly either15:55
vilaNOOOOO, ff lost my review :(15:58
Glenjaminoh, out of interest - what workflow do you guys use for conflict resolution?16:00
fullermdI like to use physical intimidation and loud profanity, myself.16:03
* bialix is second here16:06
mgzokay, Toshio's post in that bug is the only thing that could make sense, but I can't repo the problem here so there might also be some wdgi import issue going on16:13
mgzGlenjamin: could you get your wsgi script to give you the module path to bzrlib.xml_serializer.elementtree please?16:14
mgz...with conflicts I just generally search through for >>> and double check the diff after resolve, but don't take that as best way16:22
dashsmerge-mode in emacs is nice.16:24
CcxCZvimdiff is also nice16:24
vilasmerge-mode is emacs is nice16:25
vilaGlenjamin: but what do you mean by workflow here ? The way we resolve the conflicts (including the tree-shape ones) or something more high-level ?16:26
tedgUhm, I got an error that I have no clue on:16:27
tedgbzr: ERROR: An inconsistent delta was supplied involving u'/COPYING', 'copying-20100507105513-ntbj8bqjbsjpuvq7-1'16:27
tedgreason: Attempt to add item at path already occupied by id 'copying-20100505091350-s6ph8iovvrnhwpp9-17'16:27
tedgCan someone translate that for me please?16:28
vilabialix, Gary (offline :-/): where is qbzr today on this topic (conflict resolution) ?16:28
vilatedg: -Derror will give a backtrace16:28
tedgvila, Okay.  I have a backtrace, but that doesn't tell me much.16:29
* vila fires qblame16:30
=== zyga-afk is now known as zyga
vilatedg: that's from revno 4553 by lifeless, the comment says: Add checks for inventory deltas which try to ensure that16:31
viladeltas that are not an exact fit are not applied.16:31
tedgvila, Okay, why are my deltas not an exact fit?16:32
vilatedg: I don't fully parse that myself ;)16:32
vilatedg: what was the bzr command ?16:32
tedgvila, merge-upstream16:32
vilaI was afraid you'd say something like that :-/16:33
vilatedg: file a bug16:33
tedgSure, but I need to figure out how to get my work done as well :)16:34
vilaI don't think this can be answered without reproducing and some analysis :-/16:34
vilatedg: this smells like a parallel import problem though as I don't think COPYING is often renamed16:35
vilatedg: and don't forget to tag the bug UDD16:36
tedgvila, Will do.  Doing by hand now to see if I can get more info.16:38
vilatedg: checking the COPYING file-id in both branches should confirm that they are the ones involved16:40
vilajames_w: does tedg problem above rings a bell ?16:40
bialixvila: conflict resolutions? qconflicts or qresolve command16:40
vilagrr, ring, no s16:40
tedgvila, How do I get the file ID of a file.16:40
james_wvila: yes16:40
james_wtedg: it's fixed in bzr-builddeb trunk16:40
vilatedg: here you go :)16:41
bialixvila: if you're lucky enough you can launch external gui merge tool; then say which conflict is resolved16:41
vilaGlenjamin: ^16:41
vilabialix: thanks, that was for Glenjamin16:42
bialixGlenjamin: what is your question actually?16:42
vilatedg: bzr inventory --show-ids | grep COPYING16:43
tedgjames_w, Will that get in Maverick?16:43
james_wtedg: yes16:43
Glenjaminmgz: it was xml.etree iirc16:43
tedgvila, Thanks!16:43
tedgjames_w, Woot!  If I do the merge-upstream by hand now do you expect that to work?16:44
Glenjaminvila: thats pretty much what i mean - i've been thinking about writing a plugin so you can do "bzr resolve --this FILE" or "bzr resolve --other FILE", which basically does mv on .THIS or .OTHER and resolves16:44
Glenjaminbut can't decide if there's any point16:44
james_wtedg: by hand how?16:45
vilaGlenjamin: http://wiki.bazaar.canonical.com/VincentLadeuil/ConflictResolution16:45
mgzGlenjamin: thanks, is that first path through the import maze then. would you mind reverting the hack stripping diff, and try a one line addition higher up for me?16:45
vilaGlenjamin: that's a work in progress16:45
Glenjaminmgz: sure16:46
mgzvila: thanks for the review, hope it won't upset you too much if I poke the branch a bit further16:46
mgzGlenjamin: after http://bazaar.launchpad.net/~bzr-pqm/bzr/2.1/annotate/head%3A/bzrlib/xml_serializer.py#L3316:46
Glenjaminoh hang on16:47
mgzadd import xml.etree.ElementTree16:47
Glenjaminwhat's a good way to revert16:47
vilamgz: not at all, but put the mp to wip then16:47
Glenjamini literally edited the file in dist-packages16:47
mgzvila: not that big a poke16:47
vilamgz: see http://babune.ladeuil.net:24842/job/selftest-windows/161/ and ping again for a refresh16:47
mgzGlenjamin: patch -R with same input?16:48
tedgjames_w,  bzr branch ubuntu -r upstream-0.0.9 work ; cd work ; tar -xvzf 0.0.10 ; bzr commit ; etc.16:48
Glenjamini was lazy and just hacked it out with nano D:16:49
james_wtedg: it's not great as it doesn't get the pristine-tar data in16:49
james_wtedg: and it's probably quicker to use a checkout of bzr-builddeb trunk to run that one command16:49
tedgjames_w, yes, how do I add that?16:49
james_wtedg: you can't do it from the command line16:49
mgzokay, overwrite with http://bazaar.launchpad.net/~bzr-pqm/bzr/2.1/download/john%40arbash-meinel.com-20100217171116-h7t9223ystbnx5h8/xml.py-20050309040759-57d51586fdec365d/xml_serializer.py then16:50
tedgjames_w, Heh, well, I'm at the final step -- so quicker isn't an issue at this point :)16:50
mgz(and make sure the perms don't get mangled)16:50
=== beuno is now known as beuno-lunch
mgzvila: had problems with using result.stream and subunit in the test collection branch, I might need some extra code to make it happy16:52
mgz...I'll stick this in the mp16:53
vilamgz: does it mean the babune run won't complete ?16:54
vilamgz: no idea is an acceptable answer16:54
mgzI didn't get as far as working out why subunit was unhappy last time, and it was a good thing to remind me about16:55
vila'remind me about' ? Me ? When ?16:55
mgzyou mentioned babune in the mp, and I thought "oh, er..."16:55
vilaah, ok16:56
Glenjaminmgz: that appears to fix the issue as well16:56
mgzthis is a slightly different situation so may actually be fine16:56
mgzglenjamin: great, thanks.16:56
Glenjaminis there some sort of weird lazy loading going on in etree?16:57
mgzour code is slightly dodgy and relying on what other people's modules happen to import16:57
mgzvila: I think I might put that one-liner up for 2.1 rather than the monkey-patching strip, it's a less scary diff16:57
=== dorins_ is now known as dorins
TresEquisjelmer: thanks very much for tracking down the KARL3 svn-import issue16:58
jelmerTresEquis: np16:59
Glenjaminheh, conflicts somewhat more complex than my use case :D16:59
vilamgz: sure thing, will ease SRU17:03
tedgjames_w: upstream bzr-builddeb does fix it.17:03
james_wgreat, thanks for testing tedg17:04
james_wit will be uploaded soon, there are just a couple more fixes that I want to include17:04
vilaGlenjamin: you mean you were referring to text conflicts only ?17:04
Glenjamini was referring specifically to the case where i just want to say "use this one" in a text conflict17:05
mgzwith newish bzr you can do `bzr resolve --take-this`17:06
mgzor --take-other17:06
Glenjaminah, thats exactly what i was after17:06
Glenjamincheers for the help today guys, time to go :)17:06
vilaGlenjamin: eerk no, I'm pretty sure --take-{this|other} doesn't work for text conflicts (yet)!17:10
vilaargh, too late :(17:10
vilamgz: for the record (and Glenjamin) see 'Provide additional actions for text conflicts' at http://wiki.bazaar.canonical.com/VincentLadeuil/ConflictResolution,  Implementing --take-this and --take-other first sounds like a bad idea as people may confuse them with --prefer-this and --prefer-other.17:22
mgzit's bad for real conflicts, quite often people have versioned auto-generated things where you just want the stupid17:23
vilamgz: yeah, we need either versioned properties and file-level config variables to set a default action for these specific files17:26
vilamgz: job 161 finished, but no output related to the leaks, expected ?17:43
mgzyeah, see new comment in the mp17:43
vilaha, let see17:44
vilamgz: hehe, so... add comments :-P17:45
mgzwell, there are some things I intend to change but not yet, and it's confusing me :)17:46
vilamgz: I tend to add # FIXME: rumble the wigging -- vila yyyymmdd, even in committed stuff, it's easier to find them back17:47
=== Ursinha is now known as Ursinha-lunch
mgzme too when thinking straight.17:49
mgzgra, and now I rememeber why I did this as well, bt.test_selftest has too many weirdnesses in it17:53
vilamgz: well, be careful there to not reduce the test coverage, otherwise, feel free to rewrite17:56
mgzit's mostly a case of tests taking shortcuts that happen to work, but aren't anything like a real test run17:56
vilamgz: not reduce in test_selftest I meant, but since we have delegated some to testtools...17:57
vilamgz: which one ?17:57
mgzso, passing things that aren't real test cases but just implement the three methods some particular code path happens to use, and so on17:57
mgzor, in this case, doing test runs without doing startTestRun/stopTestRun around it17:58
mgzwhich is more understandable, and I don't think I want to mess with17:58
vilamgz: ha, this kind, hmm, the easiest is to complete the mockups then17:58
vilamgz: unless there is a way to make the tests more specific...17:59
vilamgz: InstrumentedTestResult ?18:00
mgzyup, which isn't all that evil really.18:00
vilamgz: turn it into module-level class and define daughter classes for tests, will be clearer too18:01
mgzI think my plan A was possibly better, which was, invent report_tests_starting, keep startTestRun, deprecate startingTests18:01
vilamgz: I don't know what testtools chose there18:02
mgzwell, report_* is a bzrlibism, but one I quite like.18:03
mgztestools adds startTestRun (as per Python 2.7) and that's all.18:03
* vila needs to go, bbl18:06
mgzbye! I think I'm going to stop worrying and just address your review comments instead.18:07
=== beuno-lunch is now known as beuno
=== deryck is now known as deryck[lunch]
=== zyga is now known as zyga-afk
jammgz: how I learned to stop worrying and just love the review comments...18:57
jam(Dr. Strangelove if you didn't get the reference)19:00
jamspiv: if you get this, IProcessTransport is a load of crap19:00
jamI have been implementing lots of Process attributes because they get used all over the place, which are *not* specified in IProcessTransport19:01
=== gorozco is now known as p4tux
mtaylorbzr: ERROR: An inconsistent delta was supplied involving u'po/POTFILES.in', 'potfiles.in-20100726013555-fcxe3tgefhkh1mxt-1'19:10
mtaylorreason: Attempt to add item at path already occupied by id 'potfiles.in-20100203232321-8hvd3vlf9l7taryv-34'19:10
* mtaylor is sad19:10
mgzokay, done.19:11
mgzjam: a film I really should rewatch at some point.19:12
mgzmtaylor, is that exactly what tedg hit earlier?19:12
mgzin which case, the answer was:19:13
mgz<james_w> tedg: it's fixed in bzr-builddeb trunk19:13
mtaylormgz: ah - I'll try upgrading to trunk and see if it fixes it19:13
mtaylormgz: yes. fixed in trunk. thanks!19:15
=== Ursinha-lunch is now known as Ursinha
=== deryck[lunch] is now known as deryck
=== zyga-afk is now known as zyga
=== oubiwann is now known as oubiwann-away
=== oubiwann-away is now known as oubiwann
=== zyga is now known as zyga-gone
vilamgz: seriously, it would have a been a shame to land without those lovely comments ;)20:28
jelmer'evening vila20:33
vilajelmer: hey !20:33
GaryvdMHi all.20:51
GaryvdMI've got an odd problem. When I try run bzr branch lp:subvertpy, I get this error:20:52
GaryvdMbzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/%2Bbranch/subvertpy/".20:52
GaryvdMThis is at home. If I ssh to a work server, and run from there, it works fine.20:53
vila-Derror ? .bzr.log ?20:57
vilatypo ?20:58
vilaGaryvdM: meh, same here20:59
vilaGaryvdM: ever see this funny %2Bbranch before ?21:02
vilaGaryvdM: lp:~jelmer/subvertpy/trunk works, smells like a lp bug to me21:03
lifelessthis is new21:31
lifelessits thumpers code to support lp: for private branches21:31
lifelessthats +branch21:31
lifelessplease file a bug on launchpad-code21:31
GaryvdMlifeless: Ok21:33
marienzis there a way to create a branch with rich-root support that bzr 1.5 can read using bzr 2.1.2? I'm hoping to be able to pull some code onto a debian lenny system.22:13
marienz"bzr help current-formats" and "bzr help other-formats" don't really show anything appropriate, but the 1.5 user reference claims 1.5 did support some rich-root format already.22:14
marienzthis is complicated by me not having direct access to a debian lenny system22:14
GaryvdMmarienz: Looking at the code, you could use the rich-root-pack format.22:19
marienzGaryvdM: ah, thanks, I was incorrectly assuming the list from "bzr help current-formats" and "bzr help other-formats" would be complete :)22:20
GaryvdMmarienz: Yhea - I'm not sure if there is a help topic to see all the old formats.22:21
marienzno worries, this had better not be a common thing to want to do22:21
marienzarguably I should get a newer bzr installed on that box anyway22:21
GaryvdMmarienz: The formats are in bzrlib/bzrdev.py22:21
marienzI can figure it out now that I know the list I got from help is incomplete22:22
=== Ursinha is now known as Ursinha-afk
pooliegood morning; hi jam23:13

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