[00:45] * SamB gripes about bzr viz not being able to run from a repo ... [00:50] lifeless: will iter_changes() yield unchanged parent directories of changed files === mario_ is now known as pygi [00:59] jelmer: look for use_record_iter in commit.py [01:03] james_w: ping [01:03] hey lifeless [01:03] james_w: can I get you to debug the stacking bug you stuffered? [01:03] sure [01:04] look at rev 4174 [01:04] it has the last change to this [01:04] and a test [01:04] pdb somewhere in its new code should help isolate whats going on [01:04] lifeless: you're welcome to come up here today. [01:05] spiv: ok, I'll head up shortly then if thats ok; we've got a lot to get across :) [01:05] ah, that sort of debugging :-) [01:06] james_w: yes :) [01:06] tomorrow then I feel [01:06] lifeless: sure. [01:06] ok [01:07] james_w: please attach bzr info -v of your source branch then [01:07] james_w: as well as checking you did push with a bzr >> 4174 [01:16] is there any docs for nested branches support? [01:20] lifeless: well, I'm almost done implementing record_iter_changes [01:21] lifeless: is iter_changes() O(delta) or O(tree) on bbc trees? [01:24] jelmer: working tree is O(tree), revision trees are a function of delta size and log(tree) [01:24] -> train to spivs, online again in ~40 [01:41] hello all [01:59] jelmer: back === ja1 is now known as jam [02:53] lifeless: IIUC iter_changes does depth-first search based on the target tree? [02:53] so if I see a directory is being processed and then see some sibling is being processed I can assume that directory is "done" ? [03:34] jelmer: I wouldn't make that assumption [03:34] jelmer: because it can jump around with renames and stuff [03:34] it might start with one file in a dir, then subdirs, siblings, then find that the dir was reparented and include the parent === UdontKnow is now known as \0 === \0 is now known as UdontKnow === thunderstruck is now known as gnomefreak [06:30] lifeless: just came here to report the stacking issue, but I see you are on it, I was just about to upload 1.14rc1, I can wait if bug 354036 fix is close [06:31] Launchpad bug 354036 in bzr "ErrorFromSmartServer - AbsentContentFactory object has no attribute 'get_bytes_as' exception while pulling from Launchpad" [Critical,Confirmed] https://launchpad.net/bugs/354036 [06:36] BasicOSX: we're getting close, I'm landing the last bits of brisbane-core at the moment too [06:38] we are all good then, was working vila osx patches and Ian's filter registration patch, so I can hold off until that lands [06:38] BasicOSX: cool [06:50] BasicOSX: Are you planning to merge the RemoteBranchConfig stuff from r4251 of bzr.dev into 1.14? [06:51] Peng: no one specifically requested that [06:51] Eh. [06:52] lifeless: ^^ Did you want that for 1.14? [06:54] BasicOSX: Oh, I thought I did [06:54] BasicOSX: in my mail about it to the list, I noted that it fixes a regression vs 1.13 [06:57] hmm, only merge requests I see are the osx test failures and the simplify the content filter registration API [06:57] well, and bug 354036 [06:57] Launchpad bug 354036 in bzr "ErrorFromSmartServer - AbsentContentFactory object has no attribute 'get_bytes_as' exception while pulling from Launchpad" [Critical,Confirmed] https://launchpad.net/bugs/354036 [06:58] http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49D53C9C.2070200%40mattnordhoff.com%3E [06:58] actually thats not the one [07:01] BasicOSX: its rev 4251 of bzr.dev [07:01] I'll send a mail now [07:01] hi all [07:01] vila: Hello [07:01] lifeless: got that, (robertc) Fix handling of fallback repositories some more, just cannot find request to cherry pick it (hello vila) [07:02] BasicOSX: I've just sent one to the list [07:03] BasicOSX: That was the purpose of lp:~vila/bzr/1.14 [07:03] I apologize if I missed the initial request... oh, wait [07:04] info overload lately trying to weed through the 1.14 RC date thread :-( [07:04] :P [07:04] BasicOSX: np, that's what teams are for :) [07:04] if I can ask a small favour [07:04] please leave pqm clear for thie next cole of hours, I'm trying to land all of brisbane core [07:04] np [07:05] and finding gaps in e.g. python2.4 support for it [07:05] which are trivialish but a round trip to fix [07:05] lifeless: All of it? Like, "bzr merge ../brisbane-core"? [07:05] lifeless: fwiw, full test suite passed for python2.[456] here [07:06] Peng_: well no, I'm not planning on do that at all [07:07] Peng_: but do the point there is nothing we want to land [07:07] vila: check the _chk_map.pyx and _groupcompress.pyx files :) [07:07] vila: _chk_map is in .dev, groupcompress in p.u.c/~robertc/baz2.0/integration [07:10] lifeless: Oh. Well, congrats. :) [07:10] groupcompress up to ascii :) [07:10] lifeless: sorry to pester, but did you find the initial request to merge fallback repositories stuff? I would like to know so I can attempt to fix the holes in my tracking of merge requests. [07:12] BasicOSX: I haven't kept looking [07:12] np [07:12] BasicOSX: the fallback repositories stuff was fallout exposed by fixing the config stuff [07:12] the branch was about configs [07:12] BasicOSX: I'm not sure there was one, but as I was bitten by #354036, I merged it and prepare the branch for you to merge [07:12] BasicOSX: I'm not sure there was one, but as I was bitten by #354036, I merged it *in bzr.dev* and prepare the branch for you to merge in 1.14 [07:13] * BasicOSX groans [07:14] bug 354036 [07:14] Getting 354036 issue [07:14] Error: Could not parse data returned by Launchpad: timed out (https://launchpad.net/bugs/354036/+text) [07:14] bug 354036 [07:14] Launchpad bug 354036 in bzr "ErrorFromSmartServer - AbsentContentFactory object has no attribute 'get_bytes_as' exception while pulling from Launchpad" [Critical,Confirmed] https://launchpad.net/bugs/354036 [07:14] vila: thats a different bug ;) [07:14] grr [07:15] vila: so have we fixed --parallel ? [07:16] Peng: thanks for the catch on the missed merge [07:17] then #354075 fixed by matt, merged by lifeless in his 'Fix handling of fallback repositories some more' patch [07:17] should the http transport for vila's 1.14 branch work (pass the smart server code)? [07:17] lifeless: --parallel works great here [07:18] lifeless: but you mentioned problems with ec2 ? [07:19] http worked :-) [07:19] BasicOSX: you mean for pqm submissions ? [07:19] vila: yes [07:19] no, to merge your code into my prepare-1.14rc1 (lifeless requested I stay out of PQM for a couple hours) [07:19] BasicOSX: http doesn't trigger the problem [07:20] BasicOSX: oh, you can merge from lp all you want, just don't run bzr pqm-submit :) [07:20] vila: give ec2test a spin, you'll see [07:20] FAIL: test_merge.TestMergerEntriesLCA.test_one_lca_supersedes_path [07:20] RemoteException: Traceback (most recent call last): [07:20] File "/home/bzrtest/test_branch/bzrlib/tests/test_merge.py", line 1598, in test_one_lca_supersedes_path [07:20] self.assertEqual, [], list(merge_obj._entries_lca())) [07:20] File "/home/bzrtest/test_branch/bzrlib/tests/__init__.py", line 1055, in expectFailure [07:20] raise KnownFailure(reason) [07:20] KnownFailure: We don't do an actual heads() check on lca values, or use the per-attribute graph [07:20] lp = smart server [07:20] ? [07:20] lifeless, BasicOSX : Someone else than *me* triggers the lp/pqm bug ? Hurrah ! Not jinxed anymore ! [07:20] still [07:21] BasicOSX: lp: urls reoslve to using bzr+ssh and thus a smart server [07:21] lifeless: I can't do that, I don't have access to ec2, not even sure I can find boto module ? [07:21] yep, and I'm getting bit but the smart server bug, so I just got vila's patch via http [07:22] BasicOSX: oh right, I'm synced() now :) [07:22] vila: sign up :) [07:22] vila: see the company cloud computing policy in the all hands list archives [07:24] lifeless: I'll look [07:25] By the way, it seems that we have more "warnings.warn("%r was gc'd while locked" % self.repr)" these days nist of them (if not all, involving a LockableFiles( gee how did I type that reverse ? [07:26] heh [07:53] -> home, groupcompress has landed, I'll be landing the remaining bits very soon. [07:53] well, ->home shortly [08:24] vila: the answer btw to InterCHKRevisionTree is s/development5/development/ [08:24] vila: found the ec2 doc stuff? [08:25] -> home now [08:42] lifeless: I need to find what login/pass I should use to access allhands archive first :-( [08:49] Well, if it's allhands, I presume you need a fingerprint rather than a password 8-} [08:51] time to upgrade ff then :) [09:06] BasicOSX: around? [09:11] lifeless: thanks for landing that stuff today [09:12] * igc dinner - bbl [09:48] lifeless: still around ? [09:50] I'd still prefer to run locally (for many reasons including ease of debugging). So my question is: do you feel that the problem you encounter is related to the tests protocols rather than any ec2 specific reason ? [09:52] lifeless: by 'locally' I mean connecting via ssh in my LAN to get a close-enough approximation of course [09:53] lifeless: and also because that's a setup I want to be able to use from my laptop to my "data center" :-) === bob2 is now known as Guest95719 === Guest95719 is now known as bob2 [10:48] igc: nearly done [10:48] vila: yes, I'm around [10:49] vila: I would like it if you were familiar enough with bzr-ec2test to debug problems when it is used [10:49] vila: thus, I plan to drag you kicking and screaming through it once :) [10:51] lifeless: ha, I thought so but was unsure :-) [10:53] vila: concretely it is failing to de-and-re serialise from ec2 [10:53] which I haven't had time to debug myself test. [10:54] lifeless: so it's not directly related to my last patch (as in, it was failing before ?) [10:54] I think so [10:54] :) [10:54] devil :) [10:56] well [10:56] I figure a little latitude is due, for doing the heavy lifting to get you your desired parallel suite :) [10:57] vila: I have a separate favour for you to do though, and this is rather more important. I'm about to land --development6-rich-root [10:57] huh ? We still separate rich-root ? [10:58] its the only one [10:58] no dev6 [10:58] and aaron has said subtrees need more stuff so leaving out for now [10:58] ha, to underlined that it *is* rich root [10:58] yes [10:58] ok [10:58] *do-not* want random upgrades and folk having deep troubles [10:59] * awilkins applauds the lack of not-rich-root [10:59] Didn't we say we'll call it --dev6-rich-root-eat-your-dog ? [11:00] --dev6-rich-root-cat-taxidermist ? [11:00] anyway, what favour ? (The more you wait to ask, the bigger is should be, the more I'm frighten :) [11:00] awilkins: don't touch cats [11:00] Toxoplasmosis? [11:03] vila: merge all the components of brisbane-core from bzr.dev to a single branch and then that into 1.14/get BasicOSX to merge it into 1.14 [11:03] vila: *note* I *have not* and do *not intend* to merge the brisbane-core branch directly. [11:03] vila: it has content we don't want to land in bzr.dev at this point. [11:04] lifeless: right, so cherry pick from bzr.dev ok. Two things, [11:04] The sucky thing about not having a non-rich-root format is that the Big Rich Root Transition will have to take place before I can use it locally on most projects. :\ [11:05] lifeless: Do you have some reference branch I can use for verification purposes (though one) [11:05] lifeless: two: that means losing the annotations or did your (and Ian's) submissions somehow preserve them ? [11:06] lifeless: if answer to two is yes, don't bother explaining, I can understand why, just want to be clear [11:06] What exactly is the reason for things not being bi-directionally compatible with rich-root? [11:06] why aren't floats bidirectionally compatible with ints? [11:07] That isn't "exactly" [11:07] rich-root has data non-rich-root can't represent [11:07] Yes, but what is it? [11:07] awilkins: root data :) [11:07] Ginger? Valerian? [11:07] awilkins: that data makes root rich [11:07] an id for the root directory of a branch [11:09] vila: they are gone, we have used --author [11:09] awilkins: and versioning of the root [11:10] awilkins: which we use in a number of merge corner cases, and for nested trees. [11:11] The band-aid needs to be ripped off! .... of course, it doesn't matter much to me, the majority of branches I use are rich-root so I can keep my manager happy with svn commits [11:13] vila: btw its 120 seconds for me to run the test suite with 2 ec2 instances [11:14] lifeless: right so, from bzr.dev log that means revnos 4262 4261 4260 4259 4254 4248 4247 4246 4245? 4244 4243 and the one where you land the --dev6 format ? [11:14] lifeless: 120... hmpf [11:14] lifeless: that doesn't include bzr-loom of course :-) === AnMaster_ipv6 is now known as AnMaster === Mez is now known as CrazyShoe === CrazyShoe is now known as Mez [11:36] igc: ping [11:53] * lifeless tapdances on igc's toes === siretart_ is now known as siretart [12:11] vila: it passed tests in bzr.dev because many tests were not running for it [12:12] vila: grab my integration branch if you want to see it blow up ;) [12:12] lifeless: errr, context ? ec2 ? bbc ? [12:13] lifeless: here to help - which branch should I grab? [12:15] igc: my integration branch [12:15] vila: bbc [12:16] igc: if you run bzrlib.tests.workingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_native_with_crlf_i [12:16] for selftest [12:16] it should fail with a clearly wrong line ending [12:16] I see [12:16] AssertionError: not equal: [12:16] a = 'hello\r\nworld\r\n' [12:16] b = 'hello\nworld\r\n' [12:16] for instance [12:17] give me a clear pointer at whats likely wrong and I'll happily fix. right now I'm fixing real issues with tests that were incorrectly not enabled in bbc that became clear as I did the integration [12:17] s/real/other real/ [12:19] lifeless: grabing the branch now. The code on lp is up to 4248 and due for mirroring again in 2 hours so I can't just use loggerhead there === thunderstruck is now known as gnomefreak [12:23] igc: sorry yes :) [12:23] igc: regardless loggerhead wouldn't help you I don't think [12:23] np - it's down now [12:23] so, found an issue with labels [12:23] without labels in the pack [12:25] two packs with different content can then collide, but the indices are no longer equivalnet [12:25] [tests fail] [12:26] lifeless: ./bzr selftest TestEolConversion --no-plugins -1 passes for me [12:26] on 4249 [12:26] of your integration branch [12:26] hmm [12:26] set LANG=C [12:26] hmm [12:27] sadly bzr is the only vcs that has merge instead of pull if the remote diverged [12:28] 'has'? you can merge in git in that situation (after fetching) [12:29] ronny: try bzr merge --pull [12:30] hg and git allow me to pull first, merge later [12:31] you can bzr pull to your local mirror of that branch (and if it is in a repository with your branches, it is space efficient) [12:31] ronny: bzr can do that too, via fetch [12:31] bzr's mass branch management is a bit lacking alas [12:32] lifeless: so fetch pulls a dangling head into the backing repo? [12:32] lifeless: setting LANG=C doesn't break things for me [12:32] hmm [12:32] I'll try a wider set of tests [12:33] i love how this shit differs - in hg/mtn pull is history sync, in bzr/git it has some merge potential (and bzr is the one that needs explicit merge) [12:36] lifeless: will the fetched remote data get any special marker other than showing up in the heads? [12:36] igc: interesting [12:36] ronny: no [12:36] lifeless: so the filtered views tests are failing for me cause you deleted development-wt6 - trying them now with development-wt6-rich-rott [12:37] roo [12:37] root [12:37] igc: yes,they are passing for me [12:37] I have some uncommitted fixes fixing most of the tests [12:37] it needs to go as well and be replaced with you new format [12:41] lifeless: so filtered view tests pass on development6-rich-root, development-wt6-rich-root needs deletion if you haven't done it already [12:42] igc: yes, done [12:43] lifeless: did you try --no-plugins? [12:43] hey lifeless, igc [12:43] hi jelmer [12:43] vila: ping [12:44] vila: You mentioned using factory.stdin.getvalue() in your review [12:44] vila: but the rest of the file also uses factory.stdin.readline() and the main point is checking the position of the stream [12:47] lifeless: if you put the output from bzr diff in a pastebin, I'll apply that and run the tests again [12:47] jelmer: I think the comment says: ensures stdin is empty no ? Oops, no, the previous test is with a non-empty stdin, sorry, forget that remark then [12:49] vila: ok, just making sure I wasn't missing anything. Thanks again for reviewing, I've fixed the other issues. [12:49] igc: sure, one sec [13:00] http://paste.ubuntu.com/146177/ [13:00] sorry, phone call [13:04] igc: ^ [13:04] igc: I'm going to recommit in a minute, as I had to back out some of the cleanup [13:04] and try it again [13:21] ok ec2testing [13:21] igc: if it fails on the NoEol stuff, I'm going to shove it a pqm [13:21] I think it might be me ;) [13:22] lifeless: might be. bzr selftest eol filter --no-plugins -1 works fine for me with your patch .. [13:23] and visually inspecting it, it looks fine [13:23] igc: yea, I can't see anything in this breaking it :( [13:23] I got out of bed to help so I'll head back there now [13:23] igc: I'm so sorry [13:23] igc: where should I look if it still breaks [13:23] lifeless: np. email me if there's still an issue and I'll look into it first thing [13:24] I'm staying up till this is landed [13:24] I don't need you to fix it, just to point me at the code areas that are potentially implicated [13:24] well bzrlib/filters/eol.py is the starting point [13:24] beyond that, it depends [13:25] sorry - that's not much of an answer [13:25] thats ok [13:25] I will follow my nose as needed [13:25] sleep well, and sorry again [13:26] lifeless: good luck and I'll possibly be up early - hard to tell as the chemo makes me very both very sleepy and very awake depending on god knows what [13:26] so please email any issues [13:26] night all [13:28] will do [13:32] bombs away [13:56] lifeless: your pending submission in pqm is the last I should backport to 1.14 right ? (It passes tests here) [13:56] yes [14:02] vila: I'm wondering what to do with smtp as the current implementation asks pre-emptively [14:04] vila: ideally we wouldn't always be doing that but only in the cases where the server requires us to [14:04] vila: but that seems impractical (impossible?) for smtp [14:05] jelmer: smtp starts by using its own smtp_username and smtp_password config options, I'd say it should use authentication.conf instead [14:06] jelmer: iow, out of scope for your fix IMHO [14:06] vila: the problem is get_user() will now return getpass.getuser() rather than None if there's no user configured in authentication.conf [14:06] vila: and previously it would skip authentication if None was returned [14:06] jelmer: can I ask a favour? [14:07] lifeless: you can always ask :-) [14:07] jelmer: ... say yes to my next request [14:07] jelmer: may I kill your pqm job, its 11PM, want to land development6 and sleep [14:07] lifeless: sure, go ahead [14:08] tanks [14:13] lifeless: please let me know when yours is done so I can requeue mine [14:14] jelmer: I'm pretty sure lifeless will be asleep when pqm lands its patch :) But nothing forbids you to queue now, I think that was the last missing patch [14:14] vila: I will be awake till it lands [14:14] lifeless: sorry no offense intended :) [14:15] vila: only way to be sure [14:15] non taken [14:15] lifeless: good ! So you may have a look at lp:~vila/bzr/bcc-1.14 and tell me if everything looks fine so far [14:15] :) [14:16] lp:~vila/bzr/bbc-1.14 of course [14:16] to your list above [14:16] 4257 [14:16] indeed, just merged it [14:17] vila: any idea about smtp? [14:17] lifeless: errr, was about to merge it (not pushed) [14:17] :) [14:18] vila: I could add a "return_non_if_default" boolean parameter but that just seems plain wrong [14:18] jelmer: consistency is good, I think smtp should align to either http or getpass.getuser() [14:19] vila: but the new behaviour makes unauthenticated smtp impossible [14:19] as get_user() will never return None [14:21] lifeless: I just got a "success" message from PQM and my branch was merged [14:21] jelmer: odd... [14:21] jelmer: unauthenticated http is possible, do the same :-) [14:22] vila: yes, but in the case of http we only ask after the remote host gives a "Permission denied" [14:22] jelmer: sure, I was trying to get some time to think :) [14:22] jelmer: That reminds me about svn+ prefixes [14:23] vila: :-) [14:23] awilkins: what about them? [14:24] jelmer: I seem to think that if your web server refuses access to the locations that bzr probes to determine whether a web server is a repo, things just stop [14:24] I should make a more coherent report [14:26] jelmer: so smtp._authenticate() says: """If necessary authenticate yourself to the server.""", so there should be a way to find if auth is necessary [14:26] In the worst case it means: try to send, catch auth error, authenticate, send [14:26] there is smtplib.SMTPAuthenticationError .... [14:27] ... whose doc string says " Most probably the server didn't accept the username/password"... I love the most probably part :-/ [14:28] vila: yeah, SMTP sucks [14:28] jelmer: probably smtp servers requiring auth suck less :-) [14:28] vila: The annoying thing here is that we probably won't know whether we need authentication until we've tried sent a full email [14:29] s/sent/to send/ [14:31] jelmer: indeed, that's the way http achieve auth, try without and if it fails try with auth === sabdfl1 is now known as sabdfl [14:35] lifeless: ha, 4259, the fun stuff :-( === abentley1 is now known as abentley [14:37] vila: what about an optional default= argument to get_user() that defaults to getpass.getuser() ? [14:37] vila: smtp could set that to None [14:37] and keep behaving the way it does atm [14:38] jelmer: if you add a FIXME in smtplib about converging and/or addressing the problem, that sounds perfect for your submission [14:38] that would keep smtp in the current state but at least support prompting for http [14:38] vila: cool, thanks [14:39] yes :) [14:39] vila: see the pyrex issues? [14:39] also: http://pqm.bazaar-vcs.org/ - the eagle is landing [14:40] jam: ^ :) [14:40] lifeless: not yet (but I suspected that when you mentioned the problem), I'm in Resolve confclits in NEWS [14:42] lifeless: /cheer /train [14:42] Though your post about duplicate content was a bit concerning [14:43] I have some thoughts about exploiting duplicate content within a group, but having this across .pack files ... [14:44] jam: yes; it is rather pathological, but worth resolving in some way for production version [14:45] lifeless: so... we could go with some sort of labels as an easy fix, or push more for getting text content into a chk structure [14:46] I'm concerned about the CHK index exploding even further... [14:55] jam: indeed [14:58] landed in bzr.dev [15:04] vila: cool [15:04] jelmer: go for it [15:06] lifeless: thanks, it's already in though :-) [15:06] vila: so are you good to get a passing testsuite version for 1.14? [15:06] I run selftest at each commit, I'm at bzr.dev@4261 so 3 more commits to go [15:07] cool, I'll hang about a bit then [15:07] err 2 even [15:07] as I know you have fast tests :) [15:07] indeed, could not have afford to do that otherwise [15:11] lifeless: yeah for the big fat NEWS entry about bbc :) [15:15] lifeless: ready to merge in 1.14 pushed at lp:~vila/bzr/bbc-1.14 care to have a look, jam too ? [15:15] still running the tests, will do a 'make check' after that [15:16] vila: I'm shattered; the mainline is done, I'm happy to hand off [15:16] lifeless: ok [15:16] lifeless: good job, sleep well, no test failure to report so far :-) [15:16] vila: cool, thanks. [15:17] vila: so is that cherry-picking brisbane-core into 1.14? [15:17] lifeless: is this the bug you were looking at with spiv: [15:17] ErrorFromSmartServer: Error received from smart server: ('error', "'AbsentContentFactory' object has [15:17] no attribute 'get_bytes_as'") === ubott2 is now known as ubottu [15:17] jam: yes [15:17] k [15:17] jam: I mailed the list the bug number [15:17] because I just failed to branch vila's code [15:18] the fix is to upload more content [15:18] bug 354036 [15:18] yes [15:18] jam: yes, it should be: bzr-1.14 + (bzr.dev@4265 - everything not related to bbc) [15:18] vila: apply the fix from bug 354036 to the bzr you use to push, remove the branch and push again [15:19] well, for now I can just branch from "http://bazaar..." [15:19] indeed [15:20] well, I'm halting() or I'll be more than tired tomorrow [15:20] lifeless: I use bzr.dev@4263 to push so the fix should already be included [15:20] Error: Could not parse data returned by Launchpad: Unknown host. (https://launchpad.net/bugs/354036/+text) [15:20] vila: we haven'tlanded the fix for that bug [15:20] Error: Could not parse data returned by Launchpad: Unknown host. (https://launchpad.net/bugs/354036/+text) [15:20] grrr [15:21] lifeless: There's an error in the docs for development-rich-root: It says it's interchangeable with pack-0.92, not rich-root-pack. [15:21] ubottu you didn't help here ! That's the second time I cross the bugs and that you can't display them >-/ [15:21] Error: I am only a bot, please don't think I'm intelligent :) [15:21] ubottu: that wasn't exactly what I was thinking :-) [15:21] Error: I am only a bot, please don't think I'm intelligent :) [15:22] Peng_: thanks. vila/jam if you could fix that oversight that would be grand [15:22] * lifeless goes [15:25] uuuurgh, can't pull ~spiv/bzr/stacking-inventory [15:27] ok, pulled with bzr-1.13 [15:28] and pushed with ~spiv/bzr/stacking-inventory at lp:~bzr/bzr/bbc-1.14 [15:29] jam: can you pull that one ? [15:29] vila: I already fetched it with http:// [15:29] but I'll try again on another machine [15:29] jam: rats, I missed that one [15:31] vila: bzr.dev@4265 still fails to branch lp:~bzr/bzr/bbc-1.14 [15:31] maybe you need some actual data transferred so it doesn't no-op the push? [15:32] vila: you could try 'commit --unchanged' and uncommit it later if it works [15:32] (commit --unchanged, bzr push, bzr uncommit lp:...) [15:32] jam: it's a new branch ! The former one was lp:~vila/bzr/bbc-1.14 [15:32] ah [15:32] well, it failed [15:33] so it seems the stacking fix isn't sufficient/complete yet [15:33] So, um, anyone want to fix the doc issue I just mentioned, or should I send a trivial patch or something? [15:33] Peng_: send a trivial patch so that it doesn't get lost [15:34] vila: Okie dokie. [15:34] Okey dokey? Whatever. Anyway. [15:34] Wait, what should it be against? bzr.dev? bbc-1.14? [15:35] bbc-1.14 will be merged in bzr.dev at some point so at least against it [15:35] Whee, AbsentContentFactory traceback! [15:36] Peng_, downgrade to 1.13.1 :) [15:36] I had to do that yesterday [15:36] \o/ [15:37] I don't have 1.13.1 anywhere. [15:37] it's stacked branches and bzr.dev not getting along AFAIK [15:38] * Peng_ kicks the "Target directory already exists" error. [15:38] Peng_: bzr branch http://bazaar-vcs.org/bzr/bzr.1.13/ [15:38] vila: Well yeah. [15:39] Tags would make it easier to figure out which revision is right, though. [15:39] So I just ran "bzr push svn+ssh://odd_bloke-guest@svn.debian.org/svn/python-modules/packages/python-whoosh/trunk" and got "bzr: ERROR: Prefix missing for branches/python-whoosh; please create it before pushing.". How can I tell bzr-svn to actually push to where I'm telling it? Would it make a difference if .../trunk already existed? [15:40] jelmer: ^ :) [15:41] Odd_Bloke: python-whoosh needs to exist [15:41] Odd_Bloke: Don't create trunk [15:41] python-whoosh does exist. [15:41] It's talking about an as-far-as-I-can-tell-unrelated '_branches_/python-whoosh'. [15:42] Ah, maybe it's branches that needs to exist (or you need to make it think something else about branching scheme) [15:45] Are format help strings hardcoded in the tests anywhere? [15:46] In other words, is bzrdir.py the only place you have to make changes to them? [15:46] awilkins: Using 'bzr svn-layout'? [15:46] Odd_Bloke: I'm not entirely sure [15:46] Odd_Bloke: I've just resorted to conforming to expectations :-) [15:48] Peng_: running the tests should tell you :) [15:48] vila: But you can tell me more quickly! ;-D [15:49] Wait, so bbc is going to go in 1.14? [15:49] Peng_: I don't know that one by hearth, so I'll have to run the tests :) [15:49] Peng_: that was always the plan :) [15:50] Odd_Bloke: hi [15:50] Odd_Bloke: you need to use svn-push if you're running an older version of bzr [15:51] BasicOSX: ping [15:52] Well, it looks like the tests weren't updated last time they changed, so I'll go with that. [15:52] So should I send the patch to the mailing list? [1.14]? [15:52] Peng_: yup [15:53] This process needs more magic. All I'd have to do is think "vila, fix this bug" and bang, it would be in bzr.dev 30 seconds later. :( [15:54] Peng_: when in doubt, use more magic [15:55] Shoot, I branched from bbc-1.14, meaning a diff against bzr.dev includes lots of other stuff. :( [15:56] jelmer: Ah, cool, didn't realise how long it had been since I'd updated my bzr.dev/bzr-svn on this machine. [15:56] jelmer: Thanks. :) [15:59] Peng_: why are you diffing against bzr.dev ? Is your branch parent correct ? And the submit one ? [16:01] vila: Well, when sending a bundle to the list, it's most convenient to have the parent be in bzr.dev. Which the tip of bbc-1.14 isn't. Or something. [16:01] I don't want to expend more effort thinking about this! :( [16:02] vila: So, you want the patch against bbc-1.14? [16:02] Peng_: it's indeed the most convenient when sending bumdles against bzr.dev :-) But here you want submit_branch = http://bazaar-vcs.org/bzr/bzr.1.14/ [16:03] Peng_: whatever is easier for you, as I said, we don't want it to be lost, that doesn't mean you have to suffer :) [16:04] So it looks like you and lifeless made the same changes (or at least the same commit messages) in different revisions, one for bbc-1.14 and one for bzr.dev. [16:04] Hence my problems. [16:04] Peng_: I indeed copy/pasted a lot to cherry-pick [16:05] If only we were using darcs. :( [16:10] On a different subject, ice cream! See you later. :) [16:26] ice cream is always on topic [16:27] What about cake? [16:30] I suppose that's a matter for debate [16:34] ice cream on top of cake ? [16:35] passed under a chocolate fountain ? [16:35] And deep-fried! [16:35] ubottu don't like chocolate :) [16:35] With M&Ms and powdered sugar on top. [16:35] Heh. [16:39] chocolate [16:39] BasicOSX: ping [16:40] BasicOSX: I have a fix for bug #355454 [16:40] come on ubottu, you should have that one in your cache, it's a hot one [16:42] Launchpad bug 355454 in bzr "$ make check-dist-tarball failure" [High,Fix committed] https://launchpad.net/bugs/355454 [16:43] 1.14 is getting a *lot* of patches. [16:45] Peng_: 1.14rc1 is not out yet, at least because of the above bug :) [17:15] hello? [17:26] jam: ping [17:26] hi [17:27] vila: pong [17:28] heh [17:28] jam: regarding fix for #355454, I think abspath is needed because we'll call stat, so my last remark is invalid [17:30] I think I've tracked down the ambiguity, so we just need to decide on a fix [17:30] specifically [17:30] walkdirs()[4] ==> a path that you can pass to stat or open() to get the object [17:30] which may be Unicode or may be an fs path [17:30] yet, we may want to have both rel and abs available to avoid re-calculating rel from abs, I'm pretty sure we use the path that can be either utf8-encoded or unicode depending of what dir reader we use [17:30] jam: exactly [17:30] We use this so that internal to dirstate, we don't have do .decode('utf8') every file [17:30] sorry [17:30] every ptah [17:30] path [17:31] on UTF-8 filesystems, etc. [17:31] yes, same page [17:31] So it sounds like you're finding that the _content_filter stuff *requires* a Unicode string? [17:31] so, do you agree that path is either unicode or utf8 encoded ? [17:31] tree.relpath does [17:31] AFAIK [17:31] vila: I think for current implementations, we do [17:32] I don't think the api requires that [17:32] so I think the problem is how stat_and_sha1 is intermingling with the walkdirs stuff [17:32] I think we already have a reasonable relpath available [17:32] we just *also* need abspath to actually open the file from disk [17:32] so pass both ? [17:33] something like that [17:33] with relpath=None as default ? [17:33] Let me look at the code a bit [17:34] jam: far more tests than actual code (and too much for me to fix it *today*, no problem if it can wait tomorrow) [17:34] if we look at _walkdirs_utf8 we have a bunch of things that are "utf8_relpath" etc. [17:34] vila: I just don't want "fixing" it on Mac to break it on Win32 [17:34] jam: I didn't fix it on mac, I fixed it on interpid [17:35] and I think BasicOSX is also on Linux [17:35] vila: how was it breaking there? (and why wouldn't it have been breaking on PQM) [17:35] jam: ha ha pqm, still the same LANG=C joke ? [17:35] it broke here with python -Werror [17:36] well, supposedly lifeless fixed PQM's LANG issue [17:36] lifeless filed a RT request, I don't know if it has been fixed yet [17:37] he mentioned the likelyhood that things may start breaking accidentally [17:37] so I thought it had happened [17:38] python -Werror ./bzr selftest -s bzrlib.tests.tree_implementations.test_test_trees.TestTreeShapes.test_tree_with_merged_utf8 [17:38] so certainly WT.relpath() is comparing the path with self.basedir [17:38] jam: can you try that ? [17:38] which should be a unicode string [17:38] vila: well, on Windows the tests pass [17:39] because they use Unicode strings for that argument :) [17:39] see ? That's the right fix ! :-) [17:39] lol [17:39] win32 walks in Unicode, because we get it directly from the FooW apis [17:40] jam: doh ! It passes on OSX too ! [17:40] vila: interesting, I get d to convert both arguments to Unicode - interpreting them as being unequal [17:40] ha wait, no extension built here [17:41] vila: right, it will pass without extensions, because the global fallback path is to walk using Unicode [17:41] did you use 'python -Werror' ? [17:41] jam: sure [17:41] vila: well with -Werror it fails, without it just warns [17:41] anyway [17:41] I would actually say the 'correct' fix is to do: [17:42] if type(x) is not unicode: [17:42] x.decode(_fs_enc) [17:42] however, at the moment [17:42] the code paths [17:42] jam: That's the bug ! That's why make check-dist-tarball fails [17:42] state that the only time x isn't unicode [17:42] because it uses python -Werror [17:42] is when fs_enc == utf-8 [17:43] so.... we have a utf-8 relpath already [17:43] it is part of the walkdirs api, and we could pass it into the stat function [17:43] but for ease... [17:46] vila: BB:tweak ... for now your fix is fine, as long as we update the documentation on SHA1Provider.stat_and_sha1() to declare that abspath [17:46] may be a filesystem encoded absolute path [17:47] since it is coming from walkdirs_utf8 [17:48] right, I'll then enhance the patch to provide relpath too and more importantly add some tests parametrization as discussed in brisbane [17:48] vila: the one thing to be aware of... relpath *might* be from a subdir of a directory, I'm not 100% sure where the 'walkdirs' is starting from. [17:49] jam: hmm [17:49] I'm thinking it can be trusted [17:49] I just need to poke around the code and make sure [17:52] vila: it should be fine [17:53] of course... [17:53] jam: ok, I'll add tests for it :) [17:53] this means that we'll have to decode every path again, but perhaps only if they miss the sha hash [17:53] which would be ok [17:54] sorry, the stat fingerprint hash cache [17:55] jam: what worries me more is that g_content_filter_stack queries for filters which may in turn result in IO... [18:04] vila: what IO, you mean having to read config files to figure out if there is a filter for the given file? [18:04] jam: things like that, I didn't dig that far to be 100% sure, just a bad feeling [18:05] since the SHA1Provider already cache the tree, I thought some more may need to be cached, but may be it's already the case and I should not worry [18:09] jam: last thing before I quit, did you had a look or have comments about bbc-1.14 ? Can you make sure BasicOSX is aware of it ? [18:09] s/did you had/did you have/ geee, why do I keep making that one... [18:10] ...is it correct ENglish or *not* ? [18:11] "did you have a look" [18:11] though "did you look at" is easier [18:21] vila: Isn't it very similar to a French construction where the past tense is used? "As-tu eu.."? [18:22] abentley: that's where my error is coming most probably: As-tu jeté un coup d'oeil sur [18:23] my fingers and my brains walking at different speeds in parallel in French and English just mess things up :) [18:23] brain, mutli-core but still mon-brain :) [18:23] mono argh, time to stop :) [18:24] cooking time === beuno_ is now known as beuno [18:41] hey guys. So am getting a stack trace every time i run "bzr st". It is bzr 1.13. The error is TypeError: run() got an unexpected keyword argument "verbose" [18:41] I'll file a bug a bit later, but is there anything i can do now? [18:44] alaa_: you need to upgrade your copy of the bzr-loom plugin [18:44] james_w: ah yes. I was just looking at the trace, and i saw the loom reference. I'll try that and report back [18:49] james_w: That worked. So this is a known problem then, right? [18:51] alaa_: Yes. Hence it being fixed in newer versions of bzr-loom. :P [18:51] alaa_: yeah, I would guess that it is the most frequently reported bug in the history of bzr :-) [18:54] Right. It's amazing how it got through since it is in the most used command in bzr :) [18:54] james_w: thank you for your help [18:54] np [18:57] hello guys [18:57] Hi [18:58] Hi Peng_ [18:58] Can, do you know how much sites that supports the bazaar ? [18:58] What? [18:59] So, I'm from brazil, thus, I do not speak english correctly. [18:59] But i want to know how many sites supports bazaar [19:00] I know launchpad only. [19:00] catojo: Oh. SourceForge added support recently. [19:00] Cool. [19:00] I will see. [19:00] Thanks. [19:01] Peng_ [19:02] A have a free software stored at sourceforge. [19:02] But I'm use SVN. [19:02] I will try to migrate to bazaar. [19:02] bzr rocks [19:02] :) [19:03] It sure does! [19:03] $ [19:03] catojo: You can use bzr-svn to convert. http://bazaar-vcs.org/BzrForeignBranches/Subversion [19:03] hmm [19:03] I will see. [19:04] Some people will go to FISL 10 ? [19:04] http://fisl.softwarelivre.org/10/www/ [19:06] beuno: So, which version of my Loggerhead YUI CDN thing do you like best? [19:08] :D [19:08] Peng_ Yahoo library ? [19:08] javascript ? [19:09] YUI [19:09] catojo: Yes. [19:10] Peng_ Javascript smells good. [19:10] Peng_, I have options? [19:11] did I not approve that branch? [19:11] beuno: I made 3 different versions of my little patch. [19:11] beuno: Sure, you did, and then I changed it again. :D [19:11] ah! hehe [19:11] ok [19:11] so [19:11] URL? [19:11] and [19:11] what's your preferencec? [19:13] beuno: http://bzr.mattnordhoff.com/loggerhead/loggerhead/yui-cdn/changes [19:14] beuno: I think revision 322 is the prettiest, but revision 324/325 uses a single, combined JS file instead of half a dozen individual ones, so it should be faster. [19:16] Peng_, agreed [19:16] one comment [19:16] how about not using "yui" as a variable name? [19:17] ie, use cdn generically [19:17] other than that, I'd love for that to be merged in [19:17] don't forget to update NEWS [19:19] beuno: Wait, so do you prefer 324/325 or 322? [19:20] Peng_, I think 322, even though the URL is hardcoded [19:21] and I know I complained about that [19:21] I'm actually ok either way I think [19:21] both are good, and both itch [19:21] beuno: 324/325 just hardcodes it in the template, and in a more obfuscated way. [19:21] yeah, that's what itches me about that [19:21] :D [19:21] so making the var names more generic, and landing 322 I think is a good compromise [19:22] Which var names? [19:23] use_yui_cdn [19:23] and def yui_url [19:23] I'd use: use_cdn, and cdn_url [19:23] we're using YUI, but we're not married yet ;) [19:24] maybe even the --yui-cdn [19:24] to --use-cdn [19:24] Hmm, I see your point. [19:24] so if we change js libraries, people don't have to update their start scripts :) [19:24] I kind of like the name "yui_url" for the function, though, since it *is* specific to YUI. [19:25] true [19:25] Well, it's just as specific as the rest of the code. Still, I'd prefer to make the other changes, but stick with "yui_url". [19:25] I'm fine with that [19:27] I guess it would have to be changed if the JS library is ever changed, but Loggerhead doesn't guarantee internal API stability anyway, does it? [19:27] not for now, no [19:27] I'm more concerned about changing things to the users [19:29] Right. Users shouldn't care about the name of that method. [19:29] (Which means *somebody* will, of course. :P ) [19:31] heh, exactly [19:34] Why are lines in NEWS only about 70 characters wide instead of 79? [19:34] no idea [19:34] crazyness [19:34] like a lot of the rest of the code :) [19:35] Heh. [19:36] beuno: On a different subject, mind if I make LoggerheadConfig a new-style class? Can I do it directly in the trunk without getting reviewed? :D [19:37] Peng_, Go for it. [19:37] Thanks. [19:37] this is why you got access to trunk! lower barrier to JFDI stuff [19:38] beuno: Yeah, but I'm still afraid to do it. How much am I allowed to JFD? Trivial things like that? Simple bug fixes? [19:39] Peng_, in general, it's small bits that don't change anything drastically [19:39] very small bug fixes, doc changes, etc [19:40] reviews are a fantastic safety net, and as we get more tests, we may even get a PQM [19:40] Oh, neat. [19:40] so we can ensure tests pass as well [19:41] Well, I just did it. Pushing to LP is slow! [19:41] (The LoggerheadConfig thing, I mean.) [19:42] is it? [19:42] it seems amazingly fast for me with 1.13 [19:42] I use a checkout to commit to trunk [19:43] merge in changes from the branch, and commit [19:43] It was like 19 seconds vs. 4. Actually, I'm not sure why. They should both be new enough. Maybe it's just because LP is farther away from me. [19:43] maybe it autopacked? [19:46] jam: ping [19:46] Peng_, I've added 'debug_flags = hpss' to my bazaar.conf [19:46] beuno: It didn't autopack. bazaar.lp seems just plain slow ATM. [19:47] so you can always look at the logs when these things happen [19:47] Peng_, could be. mwhudson was working on something with ssh auth [19:48] beuno: Seems slow over HTTP too. [19:48] Peng_: mail wrapping is usually 72 or 70 characters. [19:48] LarstiQ: Ah, good point. [19:48] beuno: Yeah, but it'll make .bzr.log *really* spammy. [19:49] Peng_, yes, also called useful :) [19:49] beuno: So, the diff for yui-cdn currently looks like this: http://paste.pocoo.org/show/111505/ bb:approve? [19:49] beuno: But it won't be useful very often. [19:49] and it tells you how many hpss calls where made [19:49] Hmm, I *do* like weird statistics. [19:49] :) [19:51] Peng_, where is yui_url called from now? [19:52] beuno: macros.pt. [19:52] aha [19:52] Peng_, bb:approve [19:52] or lp:approve (?) [19:53] beuno: " review approve" [19:53] abentley: That's longer. :P And "Bundly Buggy" sounds cool. [19:54] Makes me want to chew bubble gum. [19:54] beuno: Can I land it? [19:54] Peng_: Thanks. I like the name, though it makes less sense now that it's primarily tracking merge directives. [19:55] abentley: True, but cool > sensible. [19:57] beuno: wb? [19:57] yeah, my ISP is sucking big time === beuno_ is now known as beuno [19:57] < Peng_> beuno: Can I land it? [19:58] Peng_, yes! [19:58] 15:52 < beuno> Peng_, bb:approve [19:58] 15:52 < beuno> or lp:approve (?) [19:58] but of course, that got eaten by the internets blackhole [19:59] beuno: It came through, but I wasn't sure if we should wait on mwhudson or something. (Sorry for the highlight, mwhudson.) [19:59] Peng_, I think our policy is just 1 review [20:00] Okay. [20:01] hi [20:02] beuno: Pushed to my server in 6.57 seconds and LP in 33.05. [20:02] Isn't there some weird performance issue with certain versions of certain things? [20:03] Peng_, you've downgraded to 1.13, right? [20:03] beuno: Nope. [20:04] beuno: I used http to work around the AbsentContentFactory issue the one time I hit it. [20:04] ah [20:04] well, ~1.14 works amazingly well with 1.13 [20:04] so maybe it's the ssh problem [20:04] rockstar, abentley, any ideas ^? [20:05] I'm trying to use the new code in bzr.dev for EOL handling, and so far nothing work: I've created a 1.14 format branch, added some files, then put '[name *]' 'eol = crlf' in ~/.bazaar/rules, so if I branch the initial branch I should get windows like EOL, right? [20:06] beuno, mwhudson was saying something about a regression between 1.13 and older versions of bzr on the client. That's all I know though. [20:06] beuno: Sorry, no. Others are investigating slow username lookups, which may be related. [20:07] abentley, ah, I forgot about that. [20:08] abentley: Slow username looks? What does that impact? Regular old push to bzr+ssh://bazaar.lp.net? [20:08] s/looks/lookups/ [20:08] Peng: any sftp or ssh access to bazaar.lp.net [20:09] abentley: Ah. That could do it, then, I guess. [20:22] Thanks for the hand-holding. :) [20:46] Can I pull without updating the working tree? [20:48] not from the UI I don't think [20:57] abentley, hey [20:58] rockstar: hey [20:58] abentley, get_rev_id seems to be confused. [20:58] rockstar: how so? [20:59] So I pass in the revno, and it throws a NoSuchRevision exception, even though I navigated from the history listing of the branch by clicking that revno. [21:01] abentley, I'm sure it's because I'm confused, but the documentation looks pretty plain that I just pass in a revno. [21:01] rockstar: Is it an integer revno, or does it have dots? [21:01] did you pass a string or a integer? I recently got a problem with buildbot because of that (after upgrading bzr) [21:04] abentley, in this case, it's an integer revno. [21:04] abentley, I can take it all the way back to revno 1, and it says it doesn't exist. [21:06] rockstar: It works for me. [21:06] abentley, :( [21:07] rockstar: https://pastebin.canonical.com/16055/ [21:07] abentley, I think I figured it out. The revno was actually '322' [21:07] 'evening abentley, rockstar [21:07] jelmer: Hi. [21:07] Hi jelmer [21:07] abentley: Do you know what the expected behaviour of revno's is when there are ghosts in the lhs history? [21:07] abentley, so it doesn't handle strings that can be converted to integers. [21:07] abentley, does this mean I can't get the dotted revnos then? [21:07] exactly my problem! [21:08] rockstar: No, it doesn't. [21:08] rockstar: That's UI-level functionality. [21:08] rockstar: Branch doesn't fold, spindle or mutilate its input. [21:08] abentley: simply count the first known revid as revno 1? [21:08] abentley, that's a good contract, I just needed to figure it out. [21:09] jelmer: No, it should work backwards from the current revid/revno [21:09] abentley, so if I get a dotted revno, how would I get that revid? [21:09] jelmer: Due to ghosts, the revids for some revnos may not be known. [21:10] abentley: ah, that makes sense [21:10] rockstar: Branch.get_revision_id_to_revno_map [21:11] rockstar: That operation is much more expensive, and makes sense to cache. [21:11] abentley: so in the case that we don't have a reference revno when the revno is unknown, what is the expected behaviour? revno=-1, revno=None or is that simply not possible yet? [21:12] jelmer: I don't think that case is possible. If we had to handle that case, I'd probably assign the ghost to revno 1. [21:12] abentley: ok, that makes sense. thanks [21:48] wow ... I just noticed that loggerhead now has syntax highlighting :) [21:48] thanks to the author :) [21:53] Necoro: :) [21:53] mwhudson: was that you? [22:06] lifeless: it was originally a patch from peter bui iirc [22:06] Peng_ and i improved it a big [22:11] *bit [22:13] a big bit? [22:14] Hrm, when branching, what does this error message tell me: KnitPackRepository('file://...') is not compatible with [22:14] KnitPackRepository(...) different rich root support [22:14] I am branching bzr-builddeb from launchpad into a directory created using bzr init-repo. [22:15] What worries me is that the message basically tells me, $foo is incompatible with $foo (same values for $foo ;-)) [22:16] Upgrade your repo [22:17] Bluehorn: They're both KnitPackRepositories, but one has the "rich root" flag on and one doesn't. Yes, the message is rather unhelpful. [22:18] Bluehorn: Do you have any other branches in your repo? [22:18] Bluehorn: What format did you create it in? The default (pack-0.92)? [22:20] Peng_: yep, default [22:20] Peng_: just bzr init-repo bzr-builddeb [22:20] Peng_: Just created a new repo, bzr init-repo --rich-root bzr-builddeb [22:21] hmm [22:21] 1.15 is going to be awesome [22:21] Peng_: But I have to admit that the different formats (suggested by bzr help upgrade) are a djungle. [22:21] Bluehorn: we are working to remove them all [22:21] Peng_: I'll go and read bzr help formats [22:21] lifeless: but you will need backwards compatibility, no? [22:22] Bluehorn: yes, but that doesn't mean showing you everything under the sun [22:22] lifeless: :) [22:22] lifeless, I see brisbane-core has landed? [22:22] nice. bzr branch tells me that my repository is deprecated and I should run bzr upgrade. bzr upgrade tells me: bzr: ERROR: Cannot convert to format . Does not support rich root data. [22:23] so what is the latest and greatest format for rich root repositories? [22:23] --1.6-rich-root would be recent === samurai_ is now known as samiam [22:24] --1.9-rich-root is the shiniest [22:24] --development6-rich-root will eat your pets but will be very shiny indeed soon [22:24] Bluehorn: --default-rich-root is what you should use if you need rich roots; [22:25] how's the performance between 1.6 and development6-rich-root? [22:25] Bluehorn: note that rich roots are a *one-way* upgrade,so only use them if you know you need to, and don't branch other projects into the same repo [22:25] Bluehorn: once we make rich roots the default this advice will go away :) [22:26] james_w: just upgraded to 1.9-rr. thanks! === samiam is now known as release [22:26] Of course, one of the major reasons rich roots aren't the default yet is *because* they're a one-way upgrade. Yay chickens and eggs. [22:27] mmmm omelete [22:27] Or some other metaphor or whatever. [22:28] jelmer: ah I remember why I pung [22:29] I wanted to ask if its cool and accurate to say 'samba4 uses subunit' [22:30] lifeless: yeah [22:30] lifeless: so far it's mainly the subunit *protocol* though, not yet the subunit project [22:31] jelmer: same thing IMO :) [22:31] lifeless: I actually hope we can ship with a subunit parser that can do formatting for the buildfarm [22:32] would be good [22:32] you know I'm very happy to add a perl/ module to upstream [22:32] lifeless: and allow developers to use the subunit projects' fancy tools if they have them on their system elsewhere [22:33] lifeless: I might contribute back our perl parser at some point, but I need to make it a bit less hackish first [22:33] jelmer: why? [less hackish] - I'm not qualified to critique perl code beyond simple readability [22:36] jelmer: Is it a good idea for bzr.dev users to switch to bzr-svn 0.6 now? Will it be really unstable for a while or anything? [22:39] lifeless: in particular the API should be hashed out, don't want to break it on people [22:40] Peng_: yeah, that should be fine. the main thing atm is that you won't have dpush yet [22:40] jelmer: you could put it up with a note saying clearly 'unstable api' [22:40] better an unstable api than none [22:40] lifeless: or I could just fix it and then contribute it rather than contributing it now, then fixing it, then sending updates :-) [22:43] jelmer: up to you [22:44] jelmer: just encouraging release early release often, where it seems possible without great risk [22:47] jelmer: from my perspective you'd basically own a perl/ subdir; commit directly to it if you want [22:56] statik: ooh, thanks :-) [22:56] james_w: ? [22:57] in response to a mail [22:57] I'm naturally nosey [23:15] Odd_Bloke: how does whoosh compare to bzr-search in terms of performance? [23:18] lifeless: I've never used bzr-search, so I don't really know. [23:18] For that matter, I haven't used Whoosh in any performance-critical manner. [23:18] ok [23:25] pqm announces: bbc landed in 1.14 :-) [23:26] thanks vila [23:26] lifeless: thanks BasicOSX (who manages to *avoid* that annoucement :-) [23:26] did you incorporate peng's doc fix for it? [23:27] I don't think so, [23:27] \o/ [23:28] but I also think that the doc fix was making unclear that non rich root format can be imported [23:30] when will the 1.13.2 stuff be ready :-) [23:30] but the fix is available for all (especially those mastering English :) to comment [23:30] * vila goes to sleep now [23:31] BasicOSX: jam and vila had issues with it yesterday, spiv and I will tackle it more today [23:31] vila: Hmm, you have a point. [23:31] woah... poolie ! :-) [23:32] hello! [23:32] Anymore stuff to squeeze into 1.14rc1? [23:32] BasicOSX: no, I think the 1.13.2 fix can go into whatever 1.14 we're up to when its ready - don't block on it [23:32] i literally just logged in to a computer for the first time in 12 days [23:32] so i presume you're not asking me :) [23:33] poolie: Well, if you can think of anything... :D [23:33] poolie: not asking you ;-) [23:33] Peng: >8-( [23:33] oh typing feels weird :) [23:33] hello lifeless, peng [23:34] Hi! :) [23:34] BasicOSX: But if there weren't dozens of things being squeezed in at the last minute, wouldn't you feel underutilized? :) [23:34] welcome back poolie [23:35] Peng: ironically, that would be the truth :-) [23:36] * BasicOSX cheers [23:36] All test pass now [23:43] hey poolie [23:45] hello james_w [23:47] should I just close the bugs listed as closed in the NEWS but are still listed as open by tools/check-newsbugs.py ? [23:48] BasicOSX: probably not just close them, but check whether they ought to be closed [23:48] it's possible some were eg reopened later, or not totally fixed [23:48] are there many of them? [23:49] ok, I opened bug on it, bug 354984 [23:49] Launchpad bug 354984 in bzr "./tools/check-newsbugs.py NEWS found issues" [Undecided,New] https://launchpad.net/bugs/354984 [23:50] abentley: are you still waiting on a review for your big nested tree branch?