2012/01/19/#bzr.txt

[00:24] <poolie> hi all
[00:28]  * fullermd waves.
[01:27] <wallyworld_> poolie: why isn't --forward the default for bzr log? normally one wants to see the last revisions and it's easier if the earlier ones scroll off the top of one's terminal and the latest ones are what's seen
[01:29] <poolie> i guess normally people run it with |less
[01:30] <poolie> or --limit
[01:30] <poolie> it would be a waste to print the whole history just so you see the last few bits, i suppose
[01:31] <wallyworld_> sure, valid points. but log is fast and for files with shortish histories, it's easier OOTB to just 'bzr log' rather than bzr log|less or bzr log --limit xx and the like
[01:49] <fullermd> Backward through less makes it easy to go as far as you need back without knowing in advance how far that is.
[01:49] <fullermd> 's also why every other VCS back to RCS and probably beyond runs that way.
[02:09] <wallyworld_> fullermd: using less i can see how it is better. running without less in a terminal it is easier by far to use forward. so i just use an alias :-)
[02:12] <wallyworld_> trouble with using less through is that when you quit out, all the logs also disappear
[02:12] <wallyworld_> so you are forced to run log again to look at something else if you need to
[02:13] <wallyworld_> eg i often want to log at the log and use info from there to run another bzr command. but it's harder to do if i am forced to use less since i can't start typing the command and then look back at the log
[02:15] <fullermd> Only if you're on Linux, or some other system with broken termcap   ;p
[02:16] <wallyworld_> them there are fighting words :-)
[02:17] <wallyworld_> i would have thought the vast majority of bzr users are on linux anyway :-)
[02:17] <fullermd> Yeah, that's kinda what I do   8-}
[02:18] <wallyworld_> i am surprised that more folks on linux don't have the same issues as me with using less and bzr log
[02:18] <fullermd> In fairness, I should note that I often use my 'flog' alias.
[02:20] <wallyworld_> yeah, it's easy to set up an alias; i just would have thought that the OOTB defaults would make the majority use case, and given the issues with less, i would have thought --forward would be the most desirable
[02:20] <fullermd> Generally, it's only useful when you're specifying a -r anyway.  Otherwise you sit a long time watching 5 year old revs fly by.
[02:21] <fullermd> (or 20 year old revs, depending on the project...)
[02:21] <wallyworld_> true. i normally want to use it with -r
[02:22] <wallyworld_> but that's what --limit is for
[02:22] <wallyworld_> and my brain prefers to look upwards to see earlier revs
[02:23] <fullermd> You could setup an alias to make log use --forward, and then have a blog alias or something to switch to backward.
[02:23] <fullermd> (my flog actually has --forward and --short)
[02:24] <wallyworld_> yeah, i've got all the aliases set up for me. i was just musing as to why the defaults are the way they are
[02:24] <wallyworld_> after all, anyone who doesn't work like me is clearly wrong :-P
[02:25] <fullermd> Oh, so YOU'RE the one who stole my line.
[02:26] <wallyworld_> yep :-)
[02:26] <fullermd> Right.  That does it.  You're on my list.
[02:26] <fullermd> Not the top, sadly.  But I can slot you in right behind "the entire western hermisphere".
[02:27] <wallyworld_> where you from?
[02:27] <fullermd> Well.  The western hemisphere.
[02:27] <wallyworld_> hah
[02:27] <fullermd> That just makes it convenient, see.  No long travelling   :)
[02:27] <wallyworld_> i like travel
[02:28] <wallyworld_> although it took 50 hours door-door to get home from budapest this week
[02:28] <fullermd> Anyway.  I don't think there was every any long public discussion about default direction.  But the (AFAIK, exceptionless) universality of future->past in every VCS suggests it's largely approved of.
[02:28] <wallyworld_> well they are all clearly doing it wrongly :-)
[02:29] <fullermd> In general, of course.  But not in this case, 'cuz I'm happy with it   ;p
[02:29] <wallyworld_> well at least it can be easily configured to suit one's tastes, unlike certain other products that shall remain nameless
[02:30] <fullermd> Pfui.  Other products are easier to configure.  You don't need to mess with aliases, you just write a simple little kernel module, and...
[02:32] <ISK> Hey
[02:34] <ISK> I want translate the doc "Bazaar in five minutes". Who should I contact?
[02:35] <wallyworld_> poolie:  can you help? ^^^^^^^
[05:23] <astraljava> Hi guys. I've got a problem with a src tree I copied over from another machine. It's stuck on an older revision, when I do `bzr up`, it says it's up-to-date with rev. 1280, but on LP, I see that the repo is already up to rev. 1300. What do I need to change so that it sees the correct location?
[05:26] <fullermd> If it's an independent branch, wouldn't you want to use 'pull' to update it relative to the branch on LP?
[05:27] <astraljava> fullermd: Yes, you are correct. That did the job. Thanks a lot!
[07:03] <wgz> pre-morning all
[07:44] <vila> hola people
[08:19] <mgz> morning all!
=== Quintasan_ is now known as Quintasan
[09:07] <LarstiQ> mgz: morning
[09:07] <LarstiQ> vila: thanks for merging!
[09:07] <vila> LarstiQ: my pleasure !
[09:07] <LarstiQ> vila: do you have any hints on how to dig deeper into the hanging http requests?
[09:08] <vila> yup, let me scollback
[09:08] <fullermd> No, he only handles the htpp requests...
[09:08] <vila> tsk tsk hhtp
[09:08] <vila> LarstiQ: in case your read the log, I suspect you're re-trying a request that failed, we want the first failure as the server is not supposed to receive more than one request which is probably why it's hanging
[09:09] <vila> LarstiQ: but talk to wgz/mgz too who did some experiments yesterday
[09:11] <mgz> I could suggest a few things, if you start by getting a minimal set of tests you can get the hang with,
[09:11] <mgz> then we can do some of the debugging things vila tried with me yesterday
[09:12] <vila> mgz: any issues with the windows installer for 2,5b5 ?
[09:12] <vila> s/,/./
[09:13] <mgz> not tried it yet
[09:14] <mgz> need to find out how/if bzr-svn is borked
[09:18] <LarstiQ> mgz: -Dhttp / setting DEBUG in _urllib2_wrappers?
[09:19] <LarstiQ> mgz, vila: I did a full run excluding a couple of tests, and that completed (failures=54, errors=8476, known_failure_count=28)
[09:19] <LarstiQ> next thing is to see if running those excluded tests by themselves hang all the time
[09:21] <vila> IIRC, you identified a single tests that was hanging when retrying a request. The BadStatus server expects a single request so we know why it hangs. Why the first request failed is the interesting bit
[09:21] <LarstiQ> right
[09:23] <mgz> LarstiQ: so, something like `./bzr -Oselftest.timeout=0 selftest -s bt.test_http` with the debug stuff set, then breaking in and getting the test log may be useful
[09:24] <mgz> also, if you kept the log of that full run and have a few classes of failure/error from it, file bugs tagged pypy
[09:24] <mgz> I had a couple of commonly occuring ones yesterday
[09:24]  * LarstiQ nods
[09:24] <LarstiQ> mgz: I have some select(-1) too
[09:25] <LarstiQ> mgz: but the vast majority seem to hit the limit for amount of open files
[09:25] <mgz> right, I get that too, so it's worth a bug
[09:26] <vila> jelmer: Are you working on #917733 or can I steal it ? I think I have a low-risk simple fix for 2.5 and I'm working in this area for trunk anyway ?
[09:26] <vila> s/?$//
[09:26] <mgz> hm... fd limits... I got massive mem usage, so we may need to check trunk to see if test cleanup is still working
[09:30] <LarstiQ> hrmf
[09:31] <mgz> another option is to hack in a gc.collect() after each test and see if that helps
[09:32] <mgz> bzr has too many cyclic objects
[09:32] <LarstiQ> switching DEBUG from 0 to 2 lets it complete
[09:32] <LarstiQ> at least, when I run only TestBadStatusServer.test_http_has
[09:33] <mgz> probably just slows it down enough to avoid a race
[09:33] <mgz> try with -s bt.test_http.
[09:33] <vila> which would imply that pypy introduced a new one :-(
[09:34] <mgz> or that refcounting saves us from other issues
[09:34] <LarstiQ> mgz: now it hangs indeed
[09:34] <vila> ok, I bite, why are you talking about ref counting here, pypy changed something in this area ?
[09:34] <mgz> it doesn't refcount vila.
[09:35] <vila> different gc algorithm ?
[09:35] <LarstiQ> vila: yeah
[09:35] <mgz> it has several different pluggable gcs, the main one is...
[09:35] <mgz> whatever the name is for a gc that relocates objects
[09:36] <LarstiQ> vila: http://doc.pypy.org/en/latest/garbage_collection.html fwiw
[09:36] <vila> and you're suspecting that we run into a case where our tests succeed because an object is *not* gc'ed ???
[09:37] <vila> (our: cpython)
[09:38] <mgz> we have a bunch of subtle assumptions about object lifetimes still, one of these may cause this issue, or it might be something else entirely
[09:39] <LarstiQ> running _just_ `../pypy-1.7/bin/pypy ./bzr -Oselftest.timeout=0 selftest -s bt.test_http bzrlib.tests.test_http.TestPost.test_post_body_is_received` hangs too
[09:39] <vila> LarstiQ: set a breakpoint in retry_or_raise and check the first failure
[09:40] <vila> mgz: The only part of the code matching this pattern I can think of is the smart server and its daemon threads... (Not involved here)
[09:40] <LarstiQ> vila: hmm
[09:41] <LarstiQ> vila: afaics it doesn't get to that point
[09:42] <vila> can you get back to the BadStatus test hanging ?
[09:42] <LarstiQ> vila: http://paste.debian.net/152791/ is all the output
[09:42] <LarstiQ> vila: sure
[09:43] <vila> DEBUG alone gives incomplete and possibly confusing output, you probably want -Dhttp and the magical thingy that allows such flags to get passed for selftest
[09:45] <mgz> hm, thinking about the fd limit again, if enough tests fail, that have self.branch or similar, they all end up in a list and will be kept for the whole run, so without refcount to close fds that could run us out.
[09:46] <mgz> the general testcase cleanup seems to be working, but I could fix a few more cases
[09:47] <LarstiQ> mgz: iirc the last time I only looked at blackbox tests because my hardware couldn't run more than that
[09:48] <LarstiQ> mgz: it looks like at least some non-blackbox tests do things like file(foo).read()
[09:48] <mgz> LarstiQ: vila means `bzr -Oselftest.timeout=0 -Dhttp -Eallow_debug selftest ...`
[09:48] <vila> yeah, that ! :)
[09:48] <mgz> LarstiQ: right, and my change since then should have improved things somewhat
[09:49]  * vila rings jelmer's alarm clock
[09:49] <mgz> vila: but that only adds stuff to the testcase log, so LarstiQ would also need to break into a hung test, go up till he gets back to the test case, then print self.get_log() to some file
[09:49]  * LarstiQ gives -Eallow_debug to selftest instead of bzr :)
[09:50] <mgz> right, that :)
[09:50] <vila> hehe, one more hint that this worked at some point in the past...
[09:50] <LarstiQ> vila: it doesn't hang with DEBUG higher than 0 by itself.  Not sure having pdb break in retry_or_raise will hide the race or not
[09:50] <vila> mgz: ha crap, yeah
[09:51] <mgz> LarstiQ: waiting for the hang, then doing ctrl+\ and using pdb should work
[09:51] <mgz> to see the log/symptoms at least, if not to observe the actual problem
[09:51] <vila> LarstiQ: get rid of DEBUG then, I'm not chasing the race by itself but I'd like to know why it fails for the first request
[09:52] <vila> mgz: I'm not sure you can still get enough details about the first failure by waiting for the hang
[09:52] <mgz> by first failure, do you mean in a seperate test?
[09:53] <mgz> the preceeding test was passing for me
[09:53] <vila> no
[09:53] <LarstiQ> first http request failure?
[09:54] <mgz> then the request will be in the log at least, if not in enough detail
[09:54] <vila> the BadStatus hang occurred when re-trying a request (when LarstiQ first talked about it), I'm talking of the first http request against the server
[09:54] <vila> LarstiQ: yup
[09:55] <LarstiQ> vila: breaking in on the hang, going up the stack, retry_or_raise is called with first_try=True
[09:56] <vila> so, what is exc_type, exc_val, exc_tb
[09:57] <fullermd> Excitement by type, excitement by value, and excitement by tuberculosis?
[09:57] <LarstiQ> vila: <class 'httplib.BadStatusLine'>, 'HTTP/1.0 0 Bad status\n\r' (guessing at the whitespace), <traceback object at 0x0b8fad58>
[09:57] <vila> hehe
[09:58]  * vila blinks
[09:58] <LarstiQ> \r\n according to the repr
[09:58] <vila> ...
[09:59] <mgz> yup.
[10:00] <vila> httplib.BadStatusLine is caught and... calls retry_or_raise without changing first_try ? O_o
[10:00] <vila> meh, scratch that
[10:00] <LarstiQ> vila: well then it gets into  reuqest.connection.close(); response = self.do_open(http_class, request, False) on line 575
[10:00] <vila> yeah, misread
[10:00] <LarstiQ> (with a commented out pdb, so probably line 574)
[10:02] <vila> right, so, my first intuition was wrong
[10:02] <vila> the test *relies* on the fact that the request *is* retried
[10:03] <vila> but the server asks for the connection to be closed so the second request should open a new connection ?
[10:06]  * LarstiQ acts on a hunch unimpeded by knowledge of what he is doing
[10:06] <fullermd> "... unencumbered by the thought process..."
[10:10] <vila> LarstiQ: is there an easy way for you to try this with a bzr based on a revno < 6000 ?
[10:10] <LarstiQ> vila: bzr branch -r 5999 is simple enough, sure
[10:11] <LarstiQ> fullermd: "niet gehinderd door enige kennis van zaken" is the original
[10:17] <bigjools> can someone check out this bzr failure in a recipe build please? https://launchpadlibrarian.net/90383865/buildlog.txt.gz
[10:18] <LarstiQ> vila: backtracee seems the same
[10:19] <LarstiQ> mgz, vila: so just before the breakin, it does  return self._sock.recv(buffersize, flags=flags), with buffersize=65536 and flags=0
[10:19] <vila> bigjools: sounds like a known issue, but bzr-2.4.0 ?
[10:19] <LarstiQ> I don't know what the semantics are supposed to be, but could it be waiting till it has enough data till it can return buffersize bytes?
[10:20] <mgz> bigjools: bug 915505
[10:20] <ubot5> Launchpad bug 915505 in Launchpad Auto Build System "bzr: ERROR: exceptions.AttributeError: 'cStringIO.StringI' object has no attribute 'split'" [High,Triaged] https://launchpad.net/bugs/915505
[10:20] <vila> hehe, he's even faster than me asking him :)
[10:21] <mgz> needs python-debian update on buildds
[10:21] <bigjools> :)(
[10:21] <bigjools> grar
[10:22] <bigjools> thanks
[10:22] <mgz> could work around in bzr-builddeb, but then we'd just need a builddeb update insteat
[10:22] <vila> LarstiQ: no, most of the responses are far shorter
[10:23] <bigjools> mgz: is someone working on rolling a new buildd?
[10:23] <mgz> LarstiQ: that recv is fine, it returns when it gets something, rather than looping and trying to fill the buffer like higher level read calls
[10:24] <mgz> bigjools: good question... probably not?
[10:25] <bigjools> mgz: I've upped it to critical.  I'll help push it through if someone can tell me what needs changing
[10:25] <mgz> LarstiQ: have you dumped the log from the hung test yet?
[10:26] <LarstiQ> mgz: http://paste.debian.net/152798/
[10:27] <mgz> bigjools: looks like we don't have an rt for updating it yet
[10:28] <mgz> will check with jelmer later today and get back to you.
[10:31] <mgz> LarstiQ, vila: I wonder if we can get log from the test http server too?
[10:33] <mgz> LarstiQ: I think the next thing that would be useful here is to file bugs
[10:33] <mgz> so we don't lose track of what we know about the issues
[10:34] <LarstiQ> mgz: I'll try to do that now before lunch
[10:34] <vila> jelmer, mgz: https://code.launchpad.net/~vila/bzr/917733-cmdline-overrides/+merge/89216 up for review, blocking for tarmac AIUI
[10:35] <vila> tested manually with http://paste.ubuntu.com/809507/ which is a bit silly as the default ui is SilentUiFactory so no output is produced but it doesn't traceback anymore with the fix
[10:36] <ggherdov> Hi all. has anybody tried to use bzr and kdiff3 in combination to preview merges, in the spirit of http://wiki.bazaar.canonical.com/qbzr/Blueprint/diffmerge ? how to do that?
[10:39] <ggherdov> I mean, ok for THIS and OTHER, but I would need to get BASE too (which is computed internally by 'bzr merge') to have input to feed to kdiff3
[10:40] <vila> qbzr supports external merge tools as far as I know
[10:40] <vila> I don't know where this is documented though
[10:40] <ggherdov> vila: yes that's what I read everywhere, but i didn't find any practical example (in the cut-and-paste sense of the term :-)
[10:41] <vila> http://wiki.bazaar.canonical.com/QBzr/ExternalMerge#KDiff3
[10:42] <vila> hmm, not sure it's up to date
[10:42] <vila> ggherdov: what bzr/qbzr versions are you using ?
[10:42] <ggherdov> vila: thx a lot. Actually interesting. How to get BASE ? bzr version: checking...
[10:43] <ggherdov> 2.2.1
[10:43] <ggherdov> qbzr: checking...
[10:43] <vila> with versions recent enough, I think you just need to say you use kdiff3 and the command template is already included
[10:43] <ggherdov> 0.19
[10:44] <ggherdov> ok i'll give it a try. I am not familiar with the GUI, I always use cmd line, so maybe that's why I missed that.
[10:44] <mgz> you need to update your bzr version really, a neater way of configuring was landed since then <https://code.launchpad.net/~doxxx/bzr/mergetools/+merge/40923>
[10:44] <ggherdov> mgz: thx. checking that.
[10:44] <vila> right, mgz is always faster ;)
[10:45] <vila> but I concur with the advice, my remark is based on this proposal (and probably some later tweaks)
[10:47] <ggherdov> thx guy, updating bzr. Actually this imply updating my obsolete fedora 14 to 15... gosh this issue is a fractal.
[10:47] <bigjools> mgz: thanks. If a new buildd is rolled, does it just need to pick up the latest python-debian?
[10:47] <ggherdov> guys*
[10:52] <mgz> ggherdov: you could probably get the extmerge plugin working instead if updating bzr is hard
[10:52] <mgz> bigjools: not sure, will find out.
[10:53] <ggherdov> mgz: good hint. By the way, do you know the 'oldest' stable release that includes the new mergetools stuff you were pointing in lounchpad?
[10:53] <ggherdov> launchpad*
[10:54] <mgz> the linked bug 489915 says fixed in 2.4b1
[10:54] <ubot5> Launchpad bug 489915 in QBzr "[master] external diff/merge configuration needs serious rework" [High,Fix released] https://launchpad.net/bugs/489915
[10:54] <ggherdov> mgz: ok
[10:57] <LarstiQ> mgz: filed bug 918624
[10:57] <ubot5> Launchpad bug 918624 in Bazaar "some test_http hangs under pypy" [Undecided,New] https://launchpad.net/bugs/918624
[10:57] <LarstiQ> and nwo I really need to eat something
[10:58] <mgz> LarstiQ: enjoy
[10:59] <ggherdov> no way , fedora 15 has bzr 2.3 . extmerge is my only way to go.
[11:00] <mgz> uuu, I see, this is ugly, run_bzr really shouldn't be a public function
[11:06] <vila> mgedmin: well, tarmac will cry if we remove it, just found it imports it so I confirm that's how it triggers the bug (and that my fix covers it)
[11:07] <vila> it also calls ui.make_ui_for_terminal directly
[11:08] <mgz> ?mg
[11:08] <mgz> ha, not vi
[11:08] <vila> which reinforces the idea that importint bzrlib should provides sane defaults triggering the least possible amount of IOs
[11:08] <vila> s/importint/importing/
[11:09] <mgz> I take it that was targetted at me vila?
[11:09] <vila> xchat bad habbit of forgetting my settings for completion is really... yes, was for mgz ;)
[11:14] <vila> mgz: landing on 2.5 ??
[11:14] <mgz> it's not an api change :)
[11:15] <mgz> seems odd to have all the new config pain for 2.5 but none of the fewer-writes benefit
[11:15] <vila> hmm, strictly speaking, that's true
[11:16] <mgz> I've got worse things that need to land on 2.5
[11:17] <vila> the annoying bit is that it means plugins won't have a beta test period for that so 2.5.0 can be more brittle that our stable-uber-alles users may expect...
[11:17] <mgz> plugins are always borked on our .0 releases anyway
[11:17]  * mgz takes the cynical view :)
[11:19]  * vila as RM feels he will have to accept this as a reality
[11:19] <fullermd> If you release 2.5.-1 instead, things should work well with .0 a month or two later...
[11:21] <vila> That's a good option and I'd love it if installers builders follow this trend but we're not fully there yet. I'll try to make it clear in the 2.5b5 announcement
[12:42] <LarstiQ> mgz: regarding 'ValueError: file descriptor cannot be a negative integer (-1)', the amount of tests and the precise tests that fail varies from run to run
[12:43] <LarstiQ> mgz: should I file a bug with that info, and then say "might be a race, might be exhausting filedescriptors"?
[12:44] <mgz> if you can do a reduced run that fails with on select with -1 (should be possible, pick a test subset),
[12:44] <mgz> I'm pretty sure that's an independant issue from the fh exhastion
[12:45] <mgz> likewise, any other failures on reduced runs probably warrant bugs
[12:46] <mgz> and an overall bug for running out of fds on the full testrun with pypy seems reasonable, though the exact tests that fail aren't relevent
[12:49]  * LarstiQ nods
[12:49] <LarstiQ> will do
[12:55] <jelmer> vila: hmm, has your cmdline_overrides patch landed yet?
[13:00] <vila> (almost there finishing lunch)
[13:00] <vila> jelmer: yes, on 2.5, any issue with it ?
[13:02] <jelmer> vila: Sorry, PEBKAC
[13:04] <pfarrell> hi! I'm confused by how to specify dates in bzr cat
[13:04] <pfarrell> I have two revisions that happened at these times:
[13:04] <pfarrell> revision 4 @ timestamp: Thu 2012-01-19 12:40:06 +0000
[13:04] <pfarrell> revision 3 @ timestamp: Wed 2012-01-18 17:58:31 +0000
[13:04] <jelmer> vila: actually, there is
[13:04] <jelmer> vila: line 1087 uses config, but it's never imported
[13:05] <pfarrell> and I do bzr cat -r date:2012-01-19 <FILENAME>
[13:05] <pfarrell> but I get revision 4, instead of revision 3!
[13:05] <pfarrell> even if I do bzr cat -r date:2012-01-19,00:00:00
[13:05] <pfarrell> am I doing something wrong? or is it a bug in bzr?
[13:05]  * vila blinks
[13:06] <vila> how on earth did my test succeeded then...
[13:06] <jelmer> vila: not sure :)
[13:06] <jelmer> pfarrell: that sounds like a bug
[13:07] <pfarrell> ok, thanks
[13:08] <jelmer> pfarrell: if you have a moment, it would be great if you could file a bug report. what version of bzr are you using?
[13:08] <pfarrell> 2.2.4-0ubuntu1
[13:09] <pfarrell> in natty
[13:09] <pfarrell> yep, I'm just writing it now
[13:09] <vila> jelmer: ok, reproducced
[13:10] <jelmer> pfarrell: it might be fixed in newer versions, I can't easily reproduce it with current trunk
[13:10] <pfarrell> I wonder is it related to https://bugs.launchpad.net/bzr/+bug/131273
[13:10] <ubot5> Launchpad bug 131273 in Bazaar ""date" revisionspec not returning exact revision when revision time zone differs from local time zone" [Wishlist,Confirmed]
[13:10] <vila> jelmer: and fixed
[13:10] <pfarrell> jelmer: would you mind trying it on my specific repository, if I pm you the details?
[13:10] <jelmer> pfarrell: that might indeed be relevant. Are r3 and r4 in different timezones from you?
[13:10] <jelmer> pfarrell: sure
[13:11] <pfarrell> er, no, it's all London time, I think
[13:12] <pfarrell> but maybe the launchpad server is in another timezone ?
[13:15] <jelmer> it's located in London too (but its timezone shouldn't be relevant)
[13:20] <pfarrell> out of curiosity, where in London?
[13:21] <jelmer> I have no idea :)
[13:29] <jelmer> vila: thanks!
[13:30] <vila> jelmer: will land when you leave pqm breathe ;)
[13:30] <jelmer> vila: :)
[14:34] <ggherdov> Hi all. About the extmerge plugin http://doc.bazaar.canonical.com/plugins/en/extmerge-plugin.html , something that wasn't clear to me at first: you run 'bzr merge /otherbranch/' and --then-- you call 'bzr extmerge /somefile/' , is that right?
[14:35] <ggherdov> I thought that extmerge was somehow a substitute of the 'bzr merge' command
[15:24] <vila> ggherdov: nope, the phrasing is indeed ambiguous on this page but this kind of tool just can't replace bzr merge
[15:24] <vila> jelmer: progress on urllib-verifies-ssl-certs,
[15:26] <vila> the http tests don't hang anymore (they needed the right ssl.ca_certs) and I've fixed some more in test_https_urllib ;)
[15:26] <vila> running a full suite now
[15:28] <vila> ha, more hanging tests in per_transport, of course
[15:31] <ggherdov> vila: thx, i figured that out :-) Anyway: my first day with bzr extmerge + kdiff3, I am totally in love <3
[15:31] <vila> \o/
[15:33] <jelmer> vila: \o/
[15:35] <vila> I missed handling the wrong retry_or_raise call, any cert exception should be propagated, never re-raised...
[15:35] <vila> should inherit from connection error maybe ?
[15:46] <jelmer> vila: it's an error that comes from the ssl module; perhaps we should just be always letting those thorugh?
[15:46] <vila> yeah, both
[15:47] <vila> err
[15:47] <vila> waitasec
[15:47] <vila> what's the purpose of match_hostname then ?
[15:48] <jelmer> vila: the ssl module verifies the certificate and then returns the certificate info
[15:48] <jelmer> vila: match_hostname then verifies that the certificate has the same hostname as what we connected to
[15:48] <vila> ha right, sry, haven't followed the python imp closely enough, yeah, people complained in the past about the hostname not being verified
[15:51] <vila> great, tests are properly failing now
[15:51] <vila> SSLError: [Errno 1] _ssl.c:503: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
[15:52] <vila> not super user-friendly, worth re-raising as a CertificateError instead ?
[15:53] <jelmer> vila: not sure, do you have a good way of extracting a user-friendly message from the SSL error?
[15:54] <jelmer> I think printing the SSL error is probably nicer than just saying "Something went wrong in the SSL handshake"
[15:54] <vila> k
[15:54] <vila> wfm, can be refined later, my changes so far are pretty clear so it won't be hard to find the right place back
[15:55] <vila> so, the config trick is really a hack that don't work for all cases, I think we want dedicated parameters (still defaulting to the config options) for all tests and provide a test_permutation like we do for pycurl
[15:57] <vila> yeah, and you already provide some context when they occur
[15:57] <vila> so, 58 failures for a full test run so far
[16:05] <lamont> bzr: ERROR: exceptions.AssertionError: get_next() called when there are no chars left
[16:05] <lamont> what did we decide was the right answer when bzr st says that (2.3.4-0ubuntu1)
[16:07] <vila> lamont: isn't it a symptom of a broken dirstate file ? (more traceback can help)
[16:07] <mgz> lamont: `bzr repair-workingtree`
[16:07] <lamont> vila: I can beleive that.  how do I fix it?
[16:07] <lamont>  bzr repair-workingtree
[16:07] <lamont> bzr: ERROR: unknown command "repair-workingtree"
[16:07] <lamont> I shall see if 2.4.0 has that
[16:08] <vila> https://answers.launchpad.net/bzr/+faq/940
[16:09] <vila> is the shortest I can come with, repair-workingtree uses a slightly shorter implementation IIRC
[16:10] <lamont> I need to make 2.4 install in my little silly world
[16:14] <lamont> vila: turns out that just branching and smacking .bzr/checkout over the top of the old branch seems to be sufficient to my needs
[16:14] <vila> lamont: right, and you can run 'bzr st' to refresh it
[16:17] <mgz> this is nearly the exact same conversation we had last time
[16:19] <jelmer> yup :)
[16:22] <lamont> yeah.  it fell out of brain-cache
[17:09] <vila> jelmer: more progress... the *server* was hanging too because an exception was raised about an unknown ca
[17:09] <vila> so, yeah, getting details from ssl errors is hard, python seem to just rely on openssl and that's where the errors are coming
[17:11] <vila> I don't quite get why the server complains about the ca... but it does so only when the client do the handshake...
[17:12] <vila> it's a bit like: (client) oooh, this server is bad, (server) OMG a client said I'm bad !!
[17:12] <vila> what's the point ?
[17:12] <vila> anyway, down to 22 failures and no more hangs
[17:14] <jelmer> vila: \o/
[17:16] <jelmer> vila: what are the remaining 22 errors?
[17:20] <vila> [Errno 1] _ssl.c:503: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
[17:20] <vila> because the *transport* don't use the right ssl.ca_certs config option, mentioned earlier
[17:21] <vila> but I wanted to fix the server hangs first (we're not supposed to encounter them anymore by the way...)
[17:21] <vila> not sure I will be able to finish tonight but I know where to dig
[17:23] <vila> basically the config should be used as a fallback as it requires disk resources which led to my own bazaar.conf being erased.. endless fun and some wtf moments :)
[17:23] <jelmer> hehe
=== yofel_ is now known as yofel
[18:21] <vila> jelmer: gotta go, only one test still failing: bzrlib.plugins.launchpad.test_lp_directory.TestXMLRPCTransport.test_direct_request(https)
[18:21] <vila> will have to inject the right server and transport there, not the default ones
[19:55]  * LarstiQ grumbles at blackbox tests leaving 120 open files
[19:56] <wgz> LarstiQ: I bashed all the non-test-specific ones I could find a while back
[19:56] <wgz> but at that point there was no need to go through and edit tests to do file handling sensibly when refcounting works
[19:57]  * LarstiQ nods
=== deryck is now known as deryck[lunch]
[20:06] <poolie> hi all
[20:18] <wgz> hey poolie
[20:18] <LarstiQ> heya poolie
[20:20] <wgz> LarstiQ: so, the yellow here should correspond with your issues <http://float.endofinternet.org/xmlbin/dev_r6442_non_per>
[20:20] <exarkun> What kind of server-side hooks are available when not using the smart server?
[20:20] <wgz> if you click on one and it says 'unclosed file' that's a likely issue on pypy
[20:20] <LarstiQ> exarkun: none?
[20:21] <exarkun> LarstiQ: Why the "?"?
[20:21] <LarstiQ> exarkun: I'm not sure I understand the context
[20:21] <wgz> exarkun: everything that's not a smart server hook, but they get run on the local machine against the remote object
[20:22] <jelmer> exarkun: the nature of dumb servers make it impossible to do server side hooks
[20:22] <jelmer> hi poolie, wgz, LarstiQ, exarkun
[20:22] <exarkun> Say I'm developing an application in a bzr branch and I want to update the deployment of the application by pushing the branch to the deployment environment.
[20:22] <exarkun> Should I achieve the effect some other way?
[20:23] <LarstiQ> exarkun: ah, that way
[20:23] <jelmer> exarkun: a smart server can do that for you, or you could have the client do it if you're not using a smart server
[20:23] <LarstiQ> exarkun: specifically for that usecase there is bzr-upload
[20:24] <LarstiQ> wgz: thanks! test_merge is not as yellow as I'd expect it
[20:24] <exarkun> I don't really know anything about smart servers, except I guess there is some special software implementing at least one kind (the one launchpad uses).  It seems like maybe I'd rather avoid having to deploy one of those.
[20:24] <LarstiQ> exarkun: usually it's just bzr
[20:24] <exarkun> LarstiQ: Hm.  I probably need to restart a process on the server, so it uses the updated code, so I don't know if bzr-upload is sufficient.
[20:24] <wgz> LarstiQ: that's useful to know, implies an actual behaviour difference, what are the files you get leaked there?
[20:25] <exarkun> LarstiQ: Oh.  Maybe I misunderstood, then.  How do I know if there is a smart server or not?
[20:25] <jelmer> exarkun: all a smart server over ssh needs is having bzr installed on the remote side
[20:25] <jelmer> exarkun: if you're using bzr+ssh:// you're using the smart server
[20:25] <LarstiQ> exarkun: if you can use bzr+ssh://
[20:25] <exarkun> Oh, okay, well that's pretty easy then.
[20:26] <LarstiQ> exarkun: (or well, you could do smart server over http, but bzr+ssh is the most common)
[20:26] <LarstiQ> wgz: let me see about gathering that
[20:26] <exarkun> So I can use the SmartServerHooks... Perhaps "server_stopped" is a good one to use for this use-case?
[20:27] <wgz> exarkun: or any of the other hooks, installed server side
[20:27] <exarkun> wgz: Oh
[20:28] <exarkun> Any of them, really?  Like "post_push"?
[20:28] <wgz> that wouldn't be relevent if the server is being pushed to.
[20:29] <wgz> it would run when bzr on the server pushes to some other location though :)
[20:29] <jelmer> exarkun: something like the post branch tip change hook should work
[20:29] <exarkun> jelmer: Ah
[20:29] <exarkun> Any reason to prefer that over server_stopped?
[20:29] <exarkun> (it sounds nicer, I want to prefer but, but I don't know why)
[20:30] <LarstiQ> exarkun: if nothing gets changed, no need to restart the process
[20:30] <wgz> post_branch_change_tip is what's normally used
[20:30] <wgz> otherwise your code runs if someone does `bzr log bzr+ssh://...`
[20:30] <wgz> etc.
[20:30] <exarkun> Ah, I see.
[20:30] <LarstiQ> oh, that's a good reason too :)
[20:31] <LarstiQ> exarkun: and it doesn't matter if it's push/pull/uncommit, same hook
[20:31] <LarstiQ> with a difference between those on _where_ the hook runs
[20:31] <wgz> jelmer: can you give LarstiQ any hints on debugging fd exhaustion issues?
[20:32] <LarstiQ> wgz: I've got a list now
[20:32]  * LarstiQ cleans it up
[20:35] <wgz> heh, my check for pypy not having the pythonapi was wrong
[20:36] <LarstiQ> wgz: http://paste.debian.net/152865/ gathered from running "ls /proc/`pgrep pypy`/fd" once a second
[20:38] <LarstiQ> wgz: ooh, the Unclosed file: bits are really spiffy
[20:38] <wgz> okay, niece fed, now it's my turn, will be back shortly
=== deryck[lunch] is now known as deryck
[21:31] <mwhudson> jelmer: hey, you might know this
[21:32] <mwhudson> jelmer: would you expect repo.revision_trees([revid, revid]) to return a 1 or 2 element list?
[21:32] <jelmer> mwhudson: deux
[21:32] <mwhudson> jelmer: has this changed recently?
[21:33] <mwhudson> jelmer: per https://lp-oops.canonical.com/oops.py/?oopsid=OOPS-90422eb49bf1e605dc0161ef0b9f916d
[21:33] <jelmer> mwhudson: hmm, it might have actually
[21:33] <jelmer> I don't think any of those changes are deployed on lp yet though
[21:34] <mwhudson> indeed
[21:34] <mwhudson> that would explain why i couldn't reproduce the bug though
[21:35] <jelmer> I don't remember ever seeing explicit tests for that though
[21:35] <jelmer> it would be nice to add something that tests that.
[21:36]  * mwhudson wonders if repo.revision_trees(['null:']) still explodes
[21:37] <jelmer> mwhudson: I think it's repo.get_inventory() that explodes on null, revision_trees() hasn't for as long as I can remember
[21:38] <mwhudson> jelmer: my survey says BZZT: http://paste.ubuntu.com/810091/
[22:08] <jelmer> mwhudson: hmm, wtf?
[22:09] <jelmer> mwhudson: ah, I think it's revision_tree() that does 'null:'
[22:11] <mwhudson> jelmer: ah hah
[22:11] <mwhudson> yes you are possibly right
[22:11] <mwhudson> i guess there shoudl be some bugs filed out of this
[22:15] <exarkun> given a Branch, how do I figure out where its checkout is?
[22:18] <jelmer> exarkun: branch.bzrdir.open_workingtree()
[22:18] <jelmer> mwhudson: file away please :)
[22:20] <lifeless> exarkun: in general you cannot, because there may be many, and they may be anonymous
[22:20] <lifeless> exarkun: if its colocated, jelmer is correct. If that raises (NoWorkingTree), then it doesn't proove there is no checkout, just none colocated
[22:20] <exarkun> What's a "workingtree"?
[22:21] <exarkun> http://people.canonical.com/~mwh/bzrlibapi/bzrlib.html is half helpful
[22:22] <lifeless> editable source code on disk + metadata
[22:22] <exarkun> at least it lists what classes and methods exist
[22:22] <exarkun> but it's not actually enough information to use most of the APIs
[22:22] <exarkun> because I don't know what kind of object open_workingtree returns
[22:22] <lifeless> bzrlib.workingtree.WorkingTree
[22:23] <lifeless> (or subclasses)
[22:23] <lifeless> http://people.canonical.com/~mwh/bzrlibapi/bzrlib.workingtree.WorkingTree.html
[22:23] <exarkun> it would be nice to have more information in the API docs
[22:26] <exarkun> So if there is no colocated checkout, then is there some way to find where the branch is?
[22:27] <lifeless> hang on
[22:27] <lifeless> you started with 'given a Branch'...
[22:27] <lifeless> http://people.canonical.com/~mwh/bzrlibapi/bzrlib.branch.Branch.html
[22:27] <lifeless> '.base'
[22:30] <exarkun> well, "filtered-138970476:///~/some-path/" is /like/ a directory
[22:31] <exarkun> is there an api in bzrlib that takes something like that and gives me an actual directory though?
[22:31] <exarkun> I'm guessing .base[22:] is not the brightest idea
[22:32] <exarkun> on the other hand maybe I don't care
[22:32] <lifeless> you can poke under the hood if needed; what are you trying to accomplish ? [note that the api supports entirely in-memory branch objects and soft chroots as well
[22:32] <exarkun> it might be better to just create a new checkout every time
[22:32] <exarkun> There's some code in the branch, I want to run it, I'm writing a post-push hook
[22:32] <exarkun> actually a post change branch tip hook I guess
[22:33] <exarkun> thanks, bbl
[22:33] <lifeless> so indeed
[22:33] <lifeless> post-push on a server won't have a working tree at all
[22:34] <lifeless> and there is no guarantee that what was committed matches what is on disk (because of partial commits)
[22:34] <lifeless> so making a clean checkout will be much more repeatable
[22:34] <lifeless> bbl myself
[23:17] <AuroraBorealis> so
[23:17] <AuroraBorealis> with the recent email about colocated branches almost being done
[23:17] <poolie> hi
[23:17] <AuroraBorealis> does that mean if we start using them, will we able to use them as 2a branches?
[23:18] <AuroraBorealis> cause it says it has to be a different format for the time being
[23:18] <poolie> we are going to turn them on a way that doesn't require a bzr-upgrade flag day
[23:19] <AuroraBorealis> ok so they are basically 2a branches
[23:20] <AuroraBorealis> and these colocated branches are NOT using a plugin? and should work with all the commands?
[23:23] <jelmer> AuroraBorealis: yes
[23:24] <jelmer> AuroraBorealis: although specifying them may still be a bit icky for some commands, because you need to specify a URL at the moment
[23:24] <AuroraBorealis> will that be fixed by the time its final?
[23:25] <AuroraBorealis> like doing switch trunk2 instead of .bzr/branches/trunk2 or whatever
[23:25] <jelmer> AuroraBorealis: yes, that's the plan
[23:25] <jelmer> AuroraBorealis: it's not .bzr/brnches/trunk2, but rather "file:,branch=trunk2"
[23:25] <jelmer> AuroraBorealis: eventually it will just be 'trunk2'
[23:25] <AuroraBorealis> yeah, thats how it is in the plugin right now
[23:25] <AuroraBorealis> where are the branches stored?
[23:26] <jelmer> AuroraBorealis: .bzr/branches
[23:26] <AuroraBorealis> ah ok
[23:26] <AuroraBorealis> same place
[23:26] <poolie> o/ jelmer
[23:26] <jelmer> AuroraBorealis: the format is different though
[23:27] <jelmer> hey poolie
[23:27] <AuroraBorealis> is it still a repository?
[23:27] <AuroraBorealis> the branches folder or whatever
[23:27] <jelmer> AuroraBorealis: how do you mean?
[23:27] <jelmer> AuroraBorealis: if there is a repository, it's in .bzr/repository
[23:28] <AuroraBorealis> i'm still kinda new to how these work , so you can have a folder with multiple co-located branches but no repository?
[23:28] <jelmer> AuroraBorealis: just like you can currently have a folder with a branch but no repository.
[23:28] <AuroraBorealis> ah. makes sense
[23:29] <AuroraBorealis> will checking out a branch when your current working directory is inside a colocated branches folder, add another colocated branch?
[23:29] <jelmer> AuroraBorealis: I'm not sure if I follow. each folder can only hav ea single working directory
[23:30] <AuroraBorealis> yeah i know, but if you want to add another branch to your colocated branches
[23:31] <AuroraBorealis> normally you just branch it and have the location be inside a shared repository, is it the same here?
[23:32] <jelmer> AuroraBorealis: sure, you can do something like "bzr branch lp:... file:,branch=colocatedthing"
[23:32] <AuroraBorealis> and that will put it under the 'colocatedthing' branch inside the folder?
[23:33] <jelmer> yep
[23:33] <AuroraBorealis> ok! thanks =)