[00:03] james_w: guess you're not around? [00:03] spiv, hi? [00:03] hey poolie [00:05] poolie: hey [00:06] poolie: I was thinking about the latest ObjectNotLocked bug (this time in cmd_annotate) [00:06] we should have a chat - now if you like, but i might get some coffee first [00:08] poolie: now or post-coffee are both fine [00:09] I already have one ;) [00:09] I find the phrase "post-coffee" so misleading. It implies that there's such a thing as "pre-coffee". [00:09] That's like "what happened before time began?" [00:15] fullermd: +11111 [00:20] What version of pycrypto should we be using for bzr 2.0.3 and 2.1.0b4? [00:20] Or rather, what should I be packaging in the Mac installers? [00:20] k [00:21] hi poolie [00:21] I am now [00:21] hi [00:21] do you want to talk now, or some other time? [00:23] let's do it now [00:23] save us missing each other again [00:27] k [00:32] poolie, hi [00:33] poolie: you just changed the product of bug 496827 back to bzr, was that intentional? [00:33] Launchpad bug 496827 in bzr-svn ""bzr hooks" throws AttributeError exception on Windows" [Undecided,New] https://launchpad.net/bugs/496827 [00:33] it was accidental [00:34] now it won't let me change it back [00:34] ah, probably because you're not in the bug maintainers group for bzr-svn? [00:34] I've changed it back [00:57] james_w: http://bazaar-vcs.org/Roadmap [01:23] bzr branch with bzr+ssh is currently using 270m of ram on the server side, is this normal? [01:24] For large enough branches, yes, unfortunately. [01:24] 2.1.0b4 should be a little bit better than 2.0.x on memory consumption, but we still use more than we'd like. [01:25] Oh, and doing cross-format fetches tends to consume more memory too (as well as being slower), so upgrade everything to 2a if you haven't already ;) [01:25] That is unfortunate, it's already triggered the OOM killer twice and is making my computer ( "server" and desktop are the same machine ) unusable [01:26] irssi is about the only usable application right now :) [01:26] You can do "bzr branch -r 1000 bzr+ssh://.... foo; cd foo; bzr pull -r 2000; bzr pull -r 3000; ..." etc if necessary. [01:26] Or maybe even smaller increments. [01:27] I assume that also means that subsiquent pulls should reasonable wrt memory usage? [01:28] *should be [01:29] Right, the memory usage is roughly proportional to how much (revisions, file deltas, etc) is being transferred. [01:29] spiv: Thanks [01:29] So incremental pulls of the last few revisions new this week will need much less memory than branching the whole thing. [01:33] spiv: finished on phone, writing up a mail [02:32] poolie: I'm going to grab lunch now; how about I ping you after? [02:59] Is it possible to invoke a command from bzrlib.builtins directly from a python script? [03:05] ..and still get a progress bar? [03:12] maxb: yes [03:12] maxb: to get a progress bar you just need to set up a uifactory [03:12] there is a function to help you do it [03:14] make_ui_for_terminal ? [03:15] right [03:15] thanks :-) [03:15] spiv, sorry, back now [03:32] bzr still seems to use pycurl for me [03:32] i thought we were going to change to urllib2? [03:40] is there a doc / guide on how to maintain a friendly fork with Bazaar [03:42] is there demand for that? [03:47] poolie: ok [03:48] poolie: shall I call? [03:51] spiv, yes, thanks [04:07] jml: gtg again? [04:07] mwhudson, maaybe. [04:07] gutworth, well, I guess I count as demand. [04:07] I'm thinking that looms would be a good fit, actually. [04:14] uploading mac installer for bzr 2.1.0b4 :) [04:20] * fullermd is so happy to have DWIM revspecs... [04:23] jelmer: just hit an assertion in bzr-svn's mergeinfo parser, reported in https://bugs.launchpad.net/bzr-svn/+bug/497280; hope it's not going to be too severe to fix :/ [04:23] Ubuntu bug 497280 in bzr-svn "Assertion hit when pushing merge commit to remote svn repository in parse_mergeinfo_property" [Undecided,New] [04:25] omg [04:26] is random sniping really _that_ much more fun than writing code? [04:26] ... [04:26] poolie: was that directed at me? [04:26] not at all [04:27] someone else (guess) [04:27] not in this channel [04:27] * poolie muffles himself [04:27] I'm confused [04:27] :/ [04:27] poolie: I think you're turning japanese? [04:27] seriously, no offense intended [04:27] just offtopic venting [04:27] none taken, I would write a patch if I had time! [04:28] I se [04:28] If it's not in this channel, it doesn't really exist, does it? :p [04:28] *see [04:28] hello lifeless [04:28] fullermd: bzrgotism? [04:29] poolie: for some people, it certainly seems that it is [04:29] is there an easy way to access a SourceForge CVS project with bzr? [04:29] lifeless/poolie: I'm running bzr selftest --subunit from lifeless' subunit branch on Vista at the moment. === dOxxx1 is now known as dOxxx [04:30] cellofellow: not really [04:30] jfroy|work: If you can get it declared a religion, it's tax-deductible. [04:30] dOxxx: thank you for that [04:31] bzr-cvsps-import or bzr-fastimport seem close. I don't have commit access to the repo and it isn't very active. [04:31] lifeless: you're welcome. seems to be working okay so far. I find subunit output rather hard to read though. I must see if I can get the filters working. [04:31] dOxxx: the patch doesn't require subunit output :) - just run as normal. [04:31] cellofellow: if you can download the cvs repo, you can use fastimport [04:31] lifeless: so I didn't need to run with --subunit? [04:32] dOxxx: if you put the filters on your path (set PATH=%PATH%c:\src\subunit\filters) then you should be able to use them. [04:32] cellofellow: otherwise you can request an import on launchpad [04:32] dOxxx: indeed :) [04:32] dOxxx: for most people subunit streams will be an implementation detail they rarely need to look at. [04:32] lifeless: Okay. So I guess I should try --parallel next. [04:33] ok [04:33] dOxxx: you need --parallel=subprocess on win32 [04:33] yeah [04:36] hi poolie [04:36] lifeless: with --parallel=subprocess, it looks like I'm getting mixed CRLF and LF in the stdout [04:36] dOxxx: what command line did you use? [04:37] lifeless: bzr selftest --parallel=subprocess > tests.out 2> tests.err [04:37] I wouldn't redirect it [04:37] as it will be doing the fancy bzr progress bar [04:37] lifeless: ah yes, you're right [04:38] lifeless: actually, no... I'm getting a lot of spewage [04:38] lifeless: looks like multiple threads writing to stdout concurrently [04:39] lifeless: no progress bar that I can see [04:39] lifeless: in fact I see output very similar to --subunit [04:39] lifeless: albeit garbled [04:39] ok, thats not the goal :) [04:39] someone recently had a patch to make --parallel=subprocess work at all on win32; but it should be merged. [04:41] lifeless: should I try merging trunk into this branch? [04:42] poolie: btw, the 405 is apparently from .bzr/branch-format, not .bzr/smart, even so treating it more like a 404 does seem more useful in practice. [04:43] i know [04:43] dOxxx: I've merged trunk already [04:43] hello lifeless! [04:43] spiv, i was going to try TransportNotPossible [04:43] hello poolie! [04:43] it's just possible it'll come up in other places [04:44] in other news, I really need to improve the mac build process so that it checks for missing tarballs *first* [04:44] waiting 20 minutes while it builds only to discover that I typo'd a tarball name in the config really sucks [04:45] doing this three times in a row..... priceless. [04:46] dOxxx: I'm running --parallel-fork, I am getting the normal progress bar: [04:46] [407 in 1m18s] per_repository.test_repository.TestRepository.test_item_keys_introduced_by(Reposit [04:46] trying subprocess now [04:48] dOxxx: subprocess working for me [04:48] dOxxx: I'll speculate that stdout in the child processes isn't wired up correctly. [04:51] poolie: which PPA, if any, would you like me to upload python-testtools into, and which versions of ubuntu for? [04:51] good idea doxxx [04:52] i'd like it to be possible to run selftest on the packaged bzrs [04:52] therefore, for it to be in at least ~bzr for ubuntu versions that don't ship it [04:52] well, i guess ~bzr-beta-ppa [04:52] though the betas may not be in there yet [04:52] there are also ppa dependencies, but i think that's only for building? [04:52] so, hardy, jaunty, karmic ? [04:53] ppas have been sufficiently successful to create new problems :/ [04:53] yes [04:53] lucid will have the right versions once various archive syncs catch up [04:54] lifeless: silly question, but are you actually running on a multi-CPU machine? [04:55] lifeless: now I'm not getting the problem... [04:56] dOxxx: yes, 2 cpu [04:56] lifeless: I mean the garbled output problem. it seems coherent now, but still subunit-like spam. [04:56] and no progress bar [04:57] lifeless: I'm not running it through any subunit filter. Should I be? [04:57] no [04:57] it wires one up internally [04:57] there are two possibilities [04:58] either stdout on the child is attached to the terminal, not a pipe to the parent [04:58] or something is introducing noise into the pipe and confusing the parser [04:58] could it be my method for installing subunit? I just copied the python modules into my site-packages dir since I couldn't use the makefile [04:59] dOxxx: that should have worked fine [04:59] at the moment there isn't any C code needed [05:00] it looks like I only get the garbled output when I press Ctrl-C to stop [05:00] ah [05:00] I suspect that stderr and stdout are mixing [05:00] perhaps the chilren are not being killed appropriately or something [05:02] if I recall correctly, ctrl-c is sent to all subprocess associated with the terminal, in win32 [05:02] * lifeless shrus [05:02] if, when you don't hit ctrl-C, [05:02] you get a process count and test name showing [05:02] then robert is happy [05:03] this is what I'm getting, and lots of it: http://pastebin.com/d7623943b [05:05] i was hoping someone would say "how about you help?" - go nmb [05:06] what does "IllegalUseOfScopeReplacer" mean? http://paste.ubuntu.com/342421/ [05:06] I'm trying to follow a review suggestion to use lazy import [05:07] poolie: I'm still trying to refine the process of building mac packages. :P [05:07] ffs [05:09] jml it means [05:10] oh, blah [05:10] it means fiddle with the way you're using it [05:10] make it a global [05:10] i've read the review but i don't recall the details [05:10] essentially i think you should have your __init__ only lazy_register_command()s [05:11] and then the command module can load its heavy dependencies [05:12] uploading bzr 2.0.3 package for mac :) [05:12] poolie, lazy_register_command might be the ticket, thanks. [05:12] jml: it means that something outside the module accessed the lazy import [05:14] dOxxx: that pastebin is raw subunit [05:14] lifeless, so what should I do about that? [05:14] jml: don't do that :). its likely one of your other modules. They should import (lazily if possible) it themselves. [05:14] poolie, lazy_register_command doesn't seem to be a thing [05:14] rather than doing foo.bar.baz [05:15] lifeless, hmm. why isn't this a problem if a plugin fails to lazily import trace, say [05:16] jml: I'm leaving the house, you can ring me and I will help you happily, if you give me 3 minutes before ringing. [05:17] lifeless, ok, thanks. [05:17] lifeless: so I guess that means that the filter is failing [05:18] poolie: on the subunit branch for bzr, I hope I'm not coming across as pushy, I'm just trying to execute on somethings you've been saying for a bit. [05:18] yeah [05:18] i think you're being appropriately pushy [05:19] i just wanted to make my comment more clear [05:19] i'd rather merge it now than after the last beta [05:19] jml if you push or pastebin or gobby your code i will look [05:19] poolie, thanks. [05:22] poolie, this diff: http://paste.ubuntu.com/342430/ from https://code.edge.launchpad.net/~jml/bzr/lp-login-oauth-2/+merge/15897 -- branch lp:~jml/bzr/lp-login-oauth-2 is up-to-date [05:25] oh you're trying to lazy import a submodule of the current module? [05:25] poolie, I guess I am. [05:25] or whatever the right word is [05:25] this is from [05:25] Also, it seems like it might be nicer to lazily import lp_registration. [05:25] ? [05:26] s/from/motivated by [05:26] poolie, that's right. [05:26] quick call? [05:26] poolie, sure. +61362643170 [05:41] mac installers are build and uploaded so I'm going to bed. good night! [05:58] jml http://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Release_history [05:59] so quite a few are still supported: dapper (server only), hardy, intrepid, jaunty, karmic [05:59] and in a sense lucid [05:59] poolie, citation needed! [05:59] :) [05:59] "moving violation" [06:00] poolie, where are they getting our support policy from? [06:01] jml: if you do "from from bzrlib.plugins.launchpad import lp_registration as _lazy_lp_registration" in the __init__.py, does that fix it? [06:01] spiv, maybe. [06:01] i don't know [06:01] it's consistent with my memory of it [06:01] spiv i think we solved it [06:01] spiv, I've abandoned the lazy registration angle, I'm afraid. [06:02] (and s/lp_registration/_lazy_lp_registration/, obviously) [06:02] jml: :) [06:37] hi [06:37] http://paste.ubuntu.com/342486/ -- from win32utils [06:37] is the second import as unnecessary as it looks? [06:38] also, is "WindowsError" a builtin on win32? [06:48] * spm must fight temptation to suggest it's a ground state of being.... [06:51] jml: file:///usr/share/doc/python2.6/html/library/exceptions.html#exceptions.WindowsError implies yes [06:51] spiv, thanks. [06:51] spiv, that's probably a bug in pyflakes then [06:52] jml: yes, that second import looks redundant (and weird) [06:52] spiv, I actually deleted the first one [06:52] Well, arguably it's the first import -- right. [06:57] hmm. [06:57] actually, it's probably not a bug. [06:57] it's just annoying. [07:02] hm [07:02] google code is either flaky or intermittently banning me [07:02] or both [07:23] could someone test https://spyderlib.googlecode.com/.bzr/branch-format for me? [07:23] actually nm [07:24] really just down [07:27] hi all [07:42] vila, hello [07:42] hi jml ! You're up early ! [07:42] :D [07:43] vila, well, the sun is shining [07:43] jml: Lucky you [07:43] and it's well over 20 degrees celsius [07:43] I thought [07:43] why not be awake [07:43] https://code.edge.launchpad.net/~jml/bzr/lp-login-oauth-2/+merge/15897 -- I've replied to John's review [07:43] it's ready for another round. [07:44] Oh yeah, 3 minutes ago :) [07:45] vila, why wait even that long! [07:45] hello vila [07:45] jml, i'm pretty much ok with it but [07:45] i greedily want to finish my own patch first [07:45] vila, it's very common for Launchpad branches to be landed within a day after submission for review. [07:45] and to talk to vila! [07:46] * jml is off to eat food. [07:46] It looks like you don't need piloting, you're doing well and already have one core reviewer :) jam sounded ok so I don't see why he would not approve. [07:46] Your branch is on my radar anyway, I've just not come to it yet [07:47] jml: Do you need two votes here ? You have pqm access right ? [07:47] vila, I have PQM access. [07:47] vila, I only need one vote [07:47] * poolie will look, it's paged in [07:47] poolie: ok [07:48] I'd really love to rewrite the Launchpad plugin from scratch. [07:48] except that's always a terrible idea [07:48] jml: pilot work done :-) I will ensure you enjoy your flight anyway :) [07:48] * jml off to eat food, for real [07:48] vila, :D [07:49] jml did you ever work out how to test lplib? [07:50] what ? no tests from jml ? Surely he forgot to push the right thread ? :D [07:51] jml: before you raise some ill-founded objections, I'll be ok with a soft dependency on a locally installed launchpad :D [07:54] Woah, an lp-mirror command. Awesome! [08:00] vila: there was a thread a while ago about 'how on earth do you test lplib?' [08:00] hmm, before the Mooloolaba sprint ? [08:01] re-phrasing: before jml tought me how to installl lauchpad ? [08:01] i should go soon... [08:01] probably yes [08:02] vila, the way to test it is to use a mocked launchpadlib, basically [08:02] vila, launchpadlib has support for this, but this support is not available in karmic. [08:02] vila, nor in any released version of launchpadlib. [08:03] jml: that's one way, the one I was hinting above is more like the local_test_server plugin approach were you require a true server locally running and inject it in the bzr test suite [08:03] jml: whatever works ! [08:04] minimizing entropy, etc [08:09] poolie, I've just pushed up a change to the NEWS file. [08:11] k [08:12] jml, this is the point where we poke the 'diffs get out of date' bug? [08:12] actually are you really sure you pushed? [08:12] it doesn't even show the revisions [08:14] poolie, ahh. [08:14] poolie, bzr: ERROR: These branches have diverged. See "bzr help diverged-branches" for more information. [08:14] poolie, injudicious use of uncommit, plus errors all looking the same in text [08:14] mm [08:15] poolie, I just successfully pushed. [08:24] good for you :) [08:24] me too [08:24] https://code.edge.launchpad.net/~mbp/bzr/497274-http-405/+merge/16229 may unblock bzr-git imports from google code if we're lucky [08:25] Good morning, or whatever time of day might be appropriate to you! [08:26] Would I be correct to assume that methods decorated with needs_read_lock will ALWAYS unlock their object once they are done? [08:26] they will decrement its lock counter [08:26] if it goes to zero they will unlock it [08:27] poolie: Ah. Didn't see any lock counter in the Branch implementation... [08:27] But otoh, branch is mostly forwarding to its control files, it seems. [08:28] OK, so it might be I forgot to lock things... [08:50] I have a driver-foo.c -file, now there is a modified new hw revision and I would need a slightly modified driver for that. how do I copy that driver-foo.c file with history to driver-foo-a.c ? [08:51] Zapelius: bzr doesn't track file copies, unfortunately [08:52] https://bugs.edge.launchpad.net/bzr/+bug/269095 [08:52] Ubuntu bug 269095 in bzr "bzr missing "cp" command for forking files /w history" [Medium,Confirmed] [08:52] (currently the top bug on https://bugs.edge.launchpad.net/bzr/+bugs?orderby=-users_affected_count !) [08:53] yep, found that too. there's no work-around-hack? [08:54] Not that I can think of, but what behaviour are you after? [08:54] Just that 'bzr log FILE' and 'bzr annotate FILE' would reflect the history from before the copy? [08:55] Or do you expect something special to happen on 'bzr merge' when the file is changed? [09:03] I have a branch that I'm working on, and I just wanted to have the entire history for the new file too, as it's up to a few lines identical to the old one [09:04] * spiv nods [09:04] It's a reasonable enough request, just we haven't implemented it yet. [09:05] k [09:06] I have an option to make the driver itself dynamic, selecting the hw rev with an option [09:18] Hi guys. I'm at r30, and I've got a changeset at r24 that I want to 'revert'. Would revert be the correct command? [09:24] CaMason: probably you want "bzr merge -r 24..23 [09:24] CaMason: probably you want "bzr merge -r 24..23 ." [09:24] spiv, ah, thanks :) [09:25] (I think "bzr help revert" mentions this case :) [10:01] hm not working as intended :/ [10:02] if I use `bzr diff -r 26..27` I see the changes I made. Those are the changes I want to get back. However, `bzr marge 26..27 .` I don' get them [10:02] bzr merge* even [10:02] -r [10:03] yes, sorry was using that [10:03] aha.. gotta use the revisions the other way around [10:04] worked perfectly :D [10:09] CaMason: great :) [10:09] thanks === Adys_ is now known as Adys === idnar_ is now known as idnar [10:32] hi all [10:47] lifeless, jelmer: Thoughts on http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558460 [10:47] Debian bug 558460 in bzr "bzr: Needs python-pycurl to verify SSL certificates, but only Suggests it" [Important,Open] [11:02] hi all! [11:03] How can I synchronize a local code so that updated my partner on launchpad? [11:04] johnf: according to policy, suggests is right [11:04] its optional, so its not requires [11:04] and in fact we find urllib to be more reliable [11:04] A4Tech: use pull and push commands [11:04] lifeless: you can help me? :) [11:04] using pull i'm get error [11:05] pastebin [11:05] ok [11:06] bialix: wait a second:) [11:07] * bialix twiddles the thumbs [11:08] bialix: in general, I get an error saying that I have not selected a working branch. [11:08] bzr pull URL [11:08] ensure you're invoking this command from your local branch [11:09] It was after this command and received this error. Now make a new commit, I will show an error, but then I got involved in the latest version of code [11:13] pastebin? [11:54] lifeless: we have Recommends for ca-certificates though [11:54] so sureley recomends for pycurl makes sense. Other wise the certs are fairly useless right? [11:55] ask vila [12:01] What should I do if I wrote "branches have diverged" as bzr merge says "Nothing to do" [12:01] A4Tech, when do you get the diverged message? [12:02] it may be trying to merge from a different location? [12:03] Just now I made the changes and then commit, and my friend also made a change, and now he wrote it. [12:05] so he is getting the message? [12:06] no my fiend [12:07] ok, so he has to merge from you [12:09] jonhf: Hmm, it's a bit messy... [12:10] vila: how so? [12:10] * beuno waves at vila and lifeless [12:10] Today, only pycurl do certificate validation, urllib don't [12:10] \o [12:10] Today, only pycurl does certificate validation, urllib doesn't [12:10] beuno: and how? [12:10] If you don't have ca-certificates, I'm pretty sure pycurl will whine loudly [12:11] A4Tech, bzr merge URL [12:11] A4Tech, are you using launchpad? [12:11] yes [12:11] but [12:11] Now, if you don't have pycurl, then all is "well": certificates are just ignored [12:11] my friend use ArchLinux :) [12:12] A4Tech, so "bzr merge URL_ON_LAUNCHPAD [12:12] vila: Right. So currently ca-certificates is a Recomends, while pycurl is a Suggests. So either we should make ca-certificates a Suggests or pycurl a recommends. I'm leaning towards the latter [12:13] beuno: start from 122 line http://pastebin.com/d155c3873 [12:14] johnf: Well, we plan de deprecate pycurl once we support certificate validation in urllib, so the current rules are not that far away from what we want... [12:14] s/de/to/ [12:14] vila: ok. Well I've uploaded 2.0.3 anyway so it can wait till next time :) [12:14] johnf: all of that being said, yes, both should be in the same group until then [12:15] whether that group is Recommends or Suggests is a bit more subjective :-) If you care about certificates or not I think :) [12:16] johnf: While I have the dependencies ouder the eyes... celementree still needed for python-2.5 ? Really ? [12:16] s/ouder/under/ [12:16] * vila shouts at his new keyboard [12:17] * vila looks defiantly at beuno waiting for comments [12:17] * beuno giggles [12:17] vila: funny you should ask [12:17] here are two more bugs [12:17] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555336 [12:17] Debian bug 555336 in bzr "bzr: Embedded code copy of python-configobj" [Normal,Open] [12:17] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555343 === jelmer_ is now known as jelmer [12:18] Debian bug 555343 in bzr "bzr: Embedded code copy of python-elementtree" [Normal,Open] [12:18] I'm pretty sure we have some minor changes from configobj but I don't remember which [12:19] for the later... what ? We have that ? Where ? [12:25] johnf: right, so for the later, the copy is there for python-2.4 support, so youcould mark that bug as invalid or whatever the idiom is there, I don't think debian policy requires you to do the kind of brain surgery required to get rid of it [12:27] vila: ok thanks [12:28] vila: actually, debian is pretty aggressive about duplicated libraries [12:29] lifeless: I can understand that and why, but here... 2.5 being supported and upstream supporting another version, how do they address that kind of problem in other contexts ? [12:31]