[00:00] there's your problem :) [00:00] its hg :/ [00:00] ill uninstall [00:00] well [00:00] just work out how it got on your sys.path [00:00] was comparing hg with bzr :P [00:01] but yeah, this channel will be unlikely to adise you to *not* uninstall hg ;) :) [00:01] :P [00:02] it looks like tortoise's installer or something is broken - tbzr should not interfere with a stand-alone python install :( [00:02] s/tortoise/hg/ [00:02] ack :) s/tbzr/hg/ too - I think I'll give up :) [00:07] I guess thg's install is broken then, since it does somehow add itself to sys.path [00:07] when I just run a python shell though it's not there [00:09] strange [00:09] maybe the python.dll from that dir is found before any others? [00:10] if that dir is before system32 on PATH I could see that happening... [00:10] will have a look, [00:10] in the trace it says bin path = C:\Program Files\TortoiseHg [00:11] you're right I guess "C:\Program Files\TortoiseHg;C:\Program Files\TortoiseSVN\bin;C:\Python25" [00:13] hrm - bin path should include \windows\system32 - all should work if you move that before hg [00:13] or uninstall hg :) [00:13] yeah :P [00:13] will do! [00:13] bad behaviour! :P [00:14] for my interest, why are you playing with sources instead of just the binaries? you hoping to hack a little? [00:14] Maybe you should take this up with the hg guys too to get that side of it solved. [00:14] yeah I'd like to get the latest version [00:14] +I don't mind to do a little trial&error/editing here and there to make it work [00:15] Can't fix a lot (yet, still want to learn more bout python) but can at least file bugs and test [00:15] yeah - its possibly just their installer. I'm not sure I'll get to finding and subscribing to their mailing lists etc [00:16] ultimately we will be replacing that code with c++ anyway, so it should be less of a problem. [00:16] and hopefully 'ultimately' means 'in the next couple of months' [00:17] you also know c++ or is someone else going to do the codeing? [00:17] i know it too [00:17] I can file a bug for hg btw [00:18] are you sure you didn't manually add that dir to your PATH? [00:18] the hg dir? [00:18] if not, I guess the bug should say "please ensure you add yourself to the end of PATH, not the start" [00:18] 100% sure I didnt do that myself [00:18] yeah [00:19] cool [00:19] and say "the problem is that python COM objects rely on pythonxx.dll being found on PATH, and if the hg one is found before the one in system32, COM objects will use the incomplete hg python modules and likely fail" [00:20] k [00:20] will do, thx! [00:22] yeay! I've go overlayed icons now! [00:22] * disturbedsaint = happy :) [00:27] Ehh.. [00:29] woohoo :) [00:34] markh I've submitted a "bug" btw with the icon for the systray [00:35] yeah, I saw that, thanks. [00:35] it's not included and seems to be hardcoded to "C:\Python25\Lib\site-packages\bzr.ico" [00:35] its "hard-coded" to the parent of bzrlib [00:35] couldn't find where it was set in the sources [00:35] if bzrlib is run from a source build it works [00:36] ah ok, thats why I couldn't find it [00:36] somewhere like fixup_icon in tbzrlib\*.py [00:36] its possible to use bzr from a source tree - just set PYTHONPATH to point at that too. Then the icon will work. [00:37] Note that all "help" links will also fail in source builds as we can't locate the built bzr docs. [00:37] I see, will do that [00:37] k [00:37] (but at least it says "sorry - can't locate the docs in a source build" :) [00:37] also noticed the 3 links from the traymenu don't do anything [00:37] help/settings/about === spm_ is now known as spm [00:38] they should. check .bzr.log [00:39] you have the qbzr plugin installed? [00:40] note that for debugging, it might be useful to exit the taskbar process, then manually execute 'python tbzrcache.py -v' - that will re-run the taskbar program, but show output on the console as well as logging it. [00:40] thats easier indeed [00:40] and I dont have qbzr atm because of the clean install :/ [00:40] lifeless, it is [00:41] I sent you the traceback a few days ago [00:41] you won't get too far without it. [00:41] probably wan't a good idea not to report it [00:41] Peng_, pong! [00:41] ok :) will fix that tomorrow, time to go to bed, quiet late already [00:42] Thanks a lot for your help! [00:42] cheers! good night! [00:42] thx [00:43] have a nice day! [00:43] bye! [00:43] you too [00:43] beuno: Hahaha, hi. [00:47] beuno: Um..a few days after the abstract_paths stuff, Googlebot started causing lots of errors like 'NoSuchId: The file id "" is not present in the tree None.'I guess it was finding links to files in revisions where they didn't exist? Do you think that could have happened? [01:01] Peng_, well, my guess would be that it was still lookinf for file IDs [01:01] although, those URLs should probably be valid... [01:02] Hmm [01:03] You're right. At least one example was with a file ID. [01:04] Peng_, I will do some tests and see if I broke fileids [01:04] I shouldn't of [01:05] Euhh. [01:06] One of the requests that bombed was for /annotate/811/some/path?file_id=totally_different_file_id [01:07] It's reaching into the future and handling the result from 'bzr cp'. [01:08] fullermd: It's not handling it very well. :P [01:08] How do you check the file ID of a path? [01:08] No, _it's_ handling it fine. It's not Google's fault your version of bzr is too old :p [01:08] beuno: I filed a bug with the fix [01:08] beuno: you broke it :) [01:09] lifeless: Who broke what? [01:09] Are we talking about me? [01:09] (I mean, my issue) [01:09] Colonel Mustard, in the library, with the wrench. [01:10] beuno: loggerhead's search facility [01:10] Oh. [01:16] lifeless, I did? aw... [01:16] I'll merge it in tomorrow [01:16] thanks [01:16] beuno: [(foo)] != [(foo,)] [01:16] now, I need some sleep to manage the halloween alcohol :) [01:17] * beuno waves [01:17] be [01:17] bye [01:21] G'night. === Black_Kittens is now known as Spaz === sdboyer|gazpacho is now known as sdboyer === eMBee_ is now known as eMBee [10:30] what 1.9 format brings? [10:40] will 1.9 remove some of the old formats? [10:42] bzr doesn't remove all formats [10:43] old [10:45] Well, as long as we can get rid of the gawdawful mess that is present in the help of `init` and `init-repo`, what is silently supported doesn't matter. But right now that is the very first impression one has of bzr, and it howls. [11:21] I think the first impression one has of bzr is whatever the tutorial you're following tells you. [11:24] still, looking at plethora of formats is not encouraging... [11:26] No, that's true. [11:30] some months ago, shortly after moving to bzr, i asked the same question and all what changed is some new formats :-) [13:43] gour, I really think we should move to using a rich root format as default.. [13:44] gour, that eliminates half of the formats for the future [13:44] jelmer: i agree. the present situation is messy...too many formats [13:45] the 'old' formats should become 'hidden' [13:48] * gour is doing sys-upgrade which brings python-2.6 [14:09] hm? [14:09] pack-0.92? [14:10] yeah why haven't the default format changed from that yet (in 1.8 which is what I have) [14:16] and we got new '1.6' formats === fullermd_ is now known as fullermd [18:00] how is python2.6 support with bzr 1.9 ? [18:03] rocky: afaik all known 2.6 issues were released in 1.8 [18:03] oh cool [18:03] ehm, fixes for those issues [18:03] rocky: so I expect 1.9 to be all dandy [18:03] jelmer: which version of bzr-svn for bzr 1.9 ? :) [18:35] hmm, how much better is bzr v1.9? [18:55] .1 obviously. [19:31] Peng_: how are you liking btrees? [20:10] ronny: any area in specific? [20:11] ronny: it has things I care about, but you might not. [20:11] LarstiQ: speed, repo size? [20:11] hmm [20:11] sometimes i wish bzr had a monotone-style branching ui with updates to specific revisions [20:12] ronny: btree indices in format 1.9, pack optimizing for size more (possibly 25%), less memory usage for checkout, annotate fast path [20:13] ronny: I'm unfamiliar with monotone I'm afraid, other than using it as part of the OpenMoko build [20:13] LarstiQ: branches can have multiple heads, and one can easyly move the dirstate to previous revisions within that branch [20:14] ronny: just the dirstate, or does that also work well for daggy fixes? [20:14] of course well for dagy fixes [20:15] ok, so what's the ui like? [20:15] mtn up -r the_rev_i_want; edit; commit;merge [20:15] btw, it works the same in hg [20:16] how far would you be along to that if you had up -r? [20:16] mtn's allowing multiple heads on a branch is what makes daggy fixing work so well there. [20:16] Without that, it's a whole lot more work. [20:16] (ie, hg, in the case of two heads, automatically merges them with an unqualified merge iirc) [20:16] (now, you don't _actually_ need to support multi-headed branches to do it per se, but you have to hack up something near indistinguishable) [20:17] LarstiQ: hu? hg doesnt auto-merge multiple heads [20:17] ronny: I mean, you don't have to specify what you want to merge, if you say you want to merge, and have two heads [20:17] ronny: is that wrong? [20:17] LarstiQ: ah, ok thats right [20:18] that latter part might be a bit troublesome [20:18] oh, but no [20:19] it could work nicely if you had a :other-head style thing [20:19] Well, it works in mtn since that's all that 'merge' does. [20:20] fullermd: right, bzr already has a meaning for just 'bzr merge' [20:21] hm, committing to an "outdated" tree and updating only the tree parent id (not the branch) seems like an interesting idea [20:21] Well, I haven't put much thought into the best way to represent it in bzr. I mean, we can't even update -r yet... [20:22] it would be basically like a local commit in a bound branch [22:19] jam: hmm, your file_log plugin breaks selftest in an interesting way [22:21] jam: not that that is relevant anymore, but it tries to load 'bzrlib.plugins.file_log.', which then gets to 'module = getattr(module, '')', and suprisingly module doesn't have a '' attribute. [23:44] hi, i'm trying to do 'bzr ls --kind=directory --non-recursive mybranch/some/folder' to list the contents of a directory in a branch, but it doesn't return any results. i know this seems like a very basic question, but i can't find much help by searching for it. thanks