[00:02] https://bugs.launchpad.net/bzr/+bug/303820 [00:02] Ubuntu bug 303820 in bzr "bzr serve fails (IPv6 socket is created)" [Undecided,New] [00:02] lifeless: ah [00:02] now, lessee if it still eats all my RAM [00:05] Peng_: ok if I put that in the branch? [00:09] yup, still does [00:09] * mathrick frees up some RAM to see if it succeeds eventually [00:09] back after doctor visit [00:29] lifeless: Sure. [00:30] okay, so it still fails to serve anything, except this time it doesn't even throw backtraces :( [00:33] lifeless: Although, I've made two completely unnecessary style changes that don't matter at all since the last version I pasted. http://paste.pocoo.org/show/C5sF67TUM5P1Mw9phfTQ/ [00:38] okay, so it reports "no repository", that's all I can gather from the packets [00:42] mathrick: maybe you started it, or limited it to a path, that didn't include the repository directory? [00:48] poolie: nope, it's a straightforward "bzr serve" with no parameters [00:49] iirc it runs in the directory where you invoke it [00:49] it happens reproducibly for that repo [00:49] so you need to make sure you're not standing in one of the branches [00:49] "branches"? [00:49] let's back up [00:49] oh [00:49] it is in a shared repo, yeah [00:50] lemme try with that [00:50] you must cd to the shared repo directory before running bzr serve [00:50] right, it didn't tell me anything when I started it in the wrong dir [00:54] it also continues to insist on eating all my RAM, which I don't appreciate [00:54] it should print something to give you a clue [00:54] is this with 1.10rc1? [00:55] no, 1.9 [00:55] at what point does it use too much memory? [00:55] 1) when I start it in the wrong dir (ie. in the branch dir instead of the shared repo dir) [00:56] 2) when I start it in the shared repo dir [00:56] 2) seems to be more severe [00:56] as soon as you start it? [00:56] yes [00:56] it climbs steadily [00:57] I've started it about 30s ago, and it's at 700M [00:57] wow [00:57] are you on unix or windows? [00:58] 1300M virt, 700M res [00:58] linux, ubuntu [00:58] please press Control-Backslash in the window where you ran bzr serve [00:58] you should get a debugger [00:59] by which i mean, it should say "(pdb) " [00:59] lemme run it with BZR_PDB [00:59] that shouldn't be necessary [01:00] ^\ alone doesn't cut it [01:00] nothing happens? [01:00] nope [01:00] it's rather slow to react to ^C as well [01:01] nope, kill -INT doesn't help either [01:02] it just sits there, allocating like crazy === jamesh__ is now known as jamesh [01:22] mathrick: does strace show anything? [01:22] dunno, I can check [01:24] anyone using bzr-upload + eclipse integration ? [01:24] I got eclipse exception if auto upload on commit is on [01:24] poolie: nope, the last thing it shows is a futex [01:24] and it's still growing in size? [01:24] yes, completely silent [01:25] oh, wait, it clones [01:25] that is bizarre, i don't understand how it could grow without using [01:25] ah [01:26] so it's stat()ing every dir under my ~/Dev, which is a lot of files, but shouldn't really result in such memory usage [01:27] and this is just when you started it, there's no client doing anything? [01:27] yep [01:27] and there are only stat calls? [01:27] I had the same thing when I started it in the wrong dir, btw [01:27] and C-\ doesn't work [01:28] if you ^C do you get a backtrace in ~/.bzr.log? [01:28] [pid 28773] open("/home/mathrick/Dev/Lisp/cl-rdbms/_darcs/patches/20071026164922-6b9e8-dc57c67fcc6c56c8cb8cf9968ae7598378e3a6c2.gz/.bzr/branch-format", O_RDONLY|O_LARGEFILE) = -1 ENOTDIR (Not a directory) [01:28] there are also those [01:28] I'll check [01:28] I can see lstat64, access, occasional open, and brk [01:29] brk being obviously the one responsible for allocations [01:29] jelmer: ping? [01:29] but I dunno where it comes from [01:29] awmcclain, pong [01:30] jelmer: Quick question about how autoppa and bzr-builddeb work together... I noticed you had an autoppa branch dealing with builddeb, but didn't see the attachment in Bug #252774. [01:30] Launchpad bug 252774 in autoppa "bzr-builddeb magic" [Undecided,New] https://launchpad.net/bugs/252774 [01:31] awmcclain, That was just to be able to build the autoppa package itself using bzr-buildde [01:31] it wasn't about integration between the two or anything [01:31] jelmer: Ahhhh. Understood. [01:40] Am I going to screw up my package branch if I run autoppa on the same branch? [02:03] awmcclain, I wouldn't recommend it, autoppa's use of tags is a bit strange [02:04] awmcclain, also, be warned that it throws away pending changes in your working tree [02:04] Hrm, I am trying to add my project to http://bazaar-vcs.org/WhoUsesBzr as it says I can, however it says I am not allowed to edit that page [02:04] Do I need to do something special other than create an account? [02:04] jelmer: All right. I'll branch and use autoppa from that. [02:05] Oh, now it works after logging in for a third time, never mind :) [02:14] mrooney: i don't know why that happened, it normally works first time [02:14] maybe some kind of caching bug [02:15] poolie: just for the record, no backtraces in ~/.bzr.log [02:15] poolie: I have a rather locked down browser with noscript and no cookies by default so I suspect it was something on my end [02:15] even from ^c? [02:15] not even [02:15] and now I need to sleep, I'll followup to the list tomorrow or something [02:16] mathrick: tomorrow, file a bug with strace running from the beginning of the invocation please [02:16] in a directory with no confidential file names [02:16] will do [02:17] I'll try to make a non-confidential repo showing that, if possible [02:17] sadly, the biggest dir in there is closed source [02:17] so I'll have to make something up of similar structure [02:39] I guess that also answers the question of whether bzr.debian.org can start running the smart server :-( [02:39] does launchpad utilise the bzr smart server somehow or is it all custom? [02:40] or does it just have infinite amounts of memory at its disposal ? ;-) [02:44] LP also runs Loggerhead, so my guess is they have infinite amounts of memory. ;P [02:44] What are we talking about? [02:48] jelmer: launchpad does use the smart server [02:49] jelmer: but not entirely directly [02:49] jelmer: jml should be able to answer questions on that [02:49] jelmer: we have infinite amounts of memory and a crack team of sysadmins. [02:51] jelmer: actually, memory is a problem for us. [02:51] I've half-mentioned it to #bzr folk before. [02:52] thumper, jml: Thanks [02:52] I was half-hoping launchpad was using some magic flag in bzr to get the memory usage down [02:52] I would love such a flag. [02:53] jelmer: another issue we have is bzr subprocesses hanging around. [02:53] jelmer: that *might* be an issue with our SSH server though. [02:54] I've seen it on samba.org as well [02:54] There it's mainly related to connections being terminated abruptly [02:54] and some interaction with the fact that the client time and server time are slightly out of sync [02:55] which prevents me from actually breaking locks without ssh-ing in [02:55] interesting. [02:55] * jml needs to write a manifesto or something on hosting Bazaar. [03:00] I think there would be an audience for that [03:03] jelmer: me too. [03:04] jelmer: it probably wouldn't add much to what I said at the London sprint this year, but who knows, it might help someone solve some of my problems for me :) [03:06] jelmer: what problem does bzr.debian,org have with the smart server? [03:06] * mwhudson feels he is missing context [03:06] jml, :-) [03:06] bzr+ssh: works fine [03:06] but that's mainly because processes are short-lived [03:06] and most branches are small [03:06] there's been talk about running bzr:// as well [03:07] You can do bzr:// with inetd so those processes will be short-lived too. [03:07] Or something. [03:07] but you lose the advantage that it doesn't have any startup overhead [03:08] Right. [03:08] I run bzr+http over CGI, meaning there's startup overhead for every request. Whee. :) [03:09] oh right [03:09] yes, we'd like to run bzr:// at some point, and i've had similar thoughts [03:09] i guess you could just fork for each connection... [03:10] Why doesn't bazaar.launchpad.net use HTTPS? The rest of the website does. [03:12] Peng_: because it runs in a different webserver and there's no compelling reason to use HTTPS [03:12] Peng_: and at least one good reason not to. [03:14] jml: What's the reason not to? [03:15] Peng_: https is slower for end users. [03:17] There's a significant difference for bzr over https? [03:18] sending an https request is several times slower than sending over http [03:18] and i would expect substantially slower than sending over ssh [03:19] Huh. [03:19] poolie: I would be mildly interested in actually experimental data on that last point. [03:19] mm [03:19] it should be reasonably easy with -Dhpss [03:19] .. [03:19] poolie: I expect that establishing an SSH connection takes longer. [03:20] poolie: but, my interest is so mild, I could be a central banker. [03:20] haha [03:20] wow nice one spivvo [03:20] bzr -Dhpss info http://bazaar.launchpad.net/~bzr/bzr/trunk does one hpss round trip [03:21] mathrick: you have the bzr-avahi plugin in stalled ? [03:21] robertc@tungsten:~$ ./test-mem bzr 50 500 5000 [03:21] 50,273516,2173.65908694 [03:21] 500,319888,498.259073973 [03:21] 5000,931452,304.59688592 [03:22] Peng_: whats vmpeak in, MB? [03:22] hm, actually not quite so nice, there's no smart server there [03:22] poolie: heh :) [03:23] the interaction between auto-bzr+http, -Dhpss and log+ is a bit confusing [03:24] lifeless: I glanced in /proc a couple times, and it said KB, but I don't know if it's ever something different. [03:24] jml, sending requests across ssh vs http is approximately the same speed, modulo network variability and measurement error [03:24] or, eyeballing the numbers error [03:24] Peng_: ok, so 270MB, 330MB, 930MB, for bzr [03:24] i'd expect https will be awful if you don't keep the connection alive [03:25] its sublinear, which is good, but a GB is awful large :P [03:26] lifeless: You were indexing a copy of bzr.dev? [03:26] yes [03:26] I got very different numbers when I did it. [03:27] When I ran it for 50 and 500, VmPeak was about half of what you got. [03:28] Peng_: 32-bit machine? [03:28] lifeless: Yeah [03:28] 64-bit [03:29] Note to self: Don't upgrade to 64-bit without doubling your RAM... [03:29] man [03:29] I'm doing another more granular run [03:29] this branch of mine is cursed [03:29] get the slope [03:29] push said this to me: [03:29] ShortReadvError: readv() read 0 bytes rather than 185 bytes at 25704 for "00/00/71/72/.bzr/repository/upload/xkxs5h4uy9mq79wr2t1h.pack" [03:30] 500 is 50% longer than 5000, and only 10% more mem than 50 [03:30] so 500 is looking apealing [03:32] mwhudson: i wonder if that's related to spiv's change for caching when writing out packs? [03:32] can you file a bug with the traceback please [03:32] poolie: ok [03:33] mwhudson: and the formats; if poolie's right at least one side will be a stacked branch. [03:34] spiv: the remote side is stacked [03:34] it's all branch7/knitpack5 [03:35] spiv, poolie: https://bugs.edge.launchpad.net/bzr/+bug/303856 [03:35] Ubuntu bug 303856 in bzr "ShortReadvError on pushing stacked branch" [Undecided,New] [03:35] probably a plugin if core works doing this [03:35] try pushing it with --no-plugins [03:36] (plugins can cause a read, its why the cache-change has to be done at transport not the pack writer to work reliably) [03:38] lifeless: same thing with --no-plugins [03:39] mwhudson: ok, one theory down [03:40] what does 'f' do in the new shelve? [03:42] mwhudson: if you edit bzrlib/repository.py, so that InterPackRepo.fetch has "set_cache_size = None" rather than what it currently is, does that fix it? [03:43] spiv: ok [03:45] If it does, it appears that the issue is that for a target repository to take a delta record and turn it into a fulltext it needs to read from a pack file that's still in progress... [03:46] spiv: yes, it will [03:46] Ideally I think that case would be reading that data out of the local repo, rather than the remote one. [03:46] spiv: I don't think thats ideal [03:47] spiv: because that requires a) fullduplex and b) the server asking the client for data it already has - when you consider streaming [03:47] Ok, well that explains why the non-stacked pack-to-pack case can get away with buffering writes and this case can't. [03:48] lifeless: by "that case", I meant the case where the client is doing the file ops on the local and remote repos. [03:48] spiv: mmm, I really hope we can get just one code path to optimise, and having very clear read-from, write-to patterns will help that immensely [03:49] lifeless: right, one code path would also be ideal [03:49] lifeless: there can be conflicting ideals :) [03:49] I'm not going to try decide which is more important, at least not on my week off ;) [03:49] fair 'nuff [03:49] And on that topic... [03:50] * spiv wanders off :) [03:50] (the cricket is going well, btw) [03:51] Oh, before I go... mwhudson, if that does fix it (as I now expect it will), make sure poolie knows so he can revert that change for the 1.10 final release. [03:51] spiv: I didn't know you were on a week off. [03:51] lucky devil. [03:51] jml: accumulating annual leave is good like that ;) [03:51] ah well, at least the wallabies lost [03:52] * spiv really goes [03:52] mwhudson: rugby is a tier 2 sport. [03:52] * poolie looks [03:53] bah [03:53] lifeless: mark was asking something about getting a dodgy nearly-full-duplex connection over http by using 100 continue responses [03:53] i got BzrCheckError: Internal check failed: Newly created pack file has delta references to items not in its repository: [03:53] on pushing again [03:53] i'm pretty skeptical [03:54] also i think this has already been discussed [03:54] lifeless, poolie: how can i fix by broken local branch? [03:54] my [03:54] oh [03:54] actually this is not urgent, and it's probably a silly idea [03:54] it's the remote branch that's messed up, isn't it [03:54] i think so [03:54] mwhudson: branch the parent with a good bzr, then pull your local dodgy branch into the new branch [03:56] lifeless: branching within a repo will be ok? [03:56] mwhudson: no [03:56] mwhudson: the repo is the thing that is confused [03:56] ah [03:56] right [03:58] When you get that "Internal check failed" error, is creating a new repo the only way to fix it? [04:00] well you can also push with an older bzr, which is definitely sneaky :) [04:02] I get it under entirely different circumstances (pulling, and before the "Internal check failed" error was introduced, I got a different one), but I thought I'd ask since it was getting discussed. [04:02] Not to distract from your issues.. [04:08] Peng_: if it's the one about a newly-created pack file then it should cause the transaction to abort and the repository will be unchanged [04:09] Peng_: if you have a repo with a bad delta, there isn't currently a command to fix the delta up [04:09] Peng_: 'bad' meaning 'points outside the repo' [04:11] lifeless: Okay. ...Will there be eventually? [04:11] Peng_: probably, FSVO probable [04:12] Peng_: with a repo, just init a new repo, branch --stacked from the original again for all your branches, and pull --overwrite them all in - scriptable [04:13] BTW, I'm not using stacking in this repo, AFAIK. :) [04:15] Peng_: if its not stacked, you definitely shouldn't have a bad delta. when do you get the error? and what precise error? [04:15] lifeless: It's a large repo (Python), and bzr-svn is involved. [04:24] Hmm, if I'm reading this right, all the bad deltas are for directories. [04:30] lifeless: Still interested? [04:30] Peng_: bug filing time! [04:30] Eep [04:30] Nice timing. [04:30] Anyway, like I said, bzr-svn is involved. It's kind of complicated. [04:32] There's http://svn.python.org/projects/python/ , Python's svn branches. There's also http://code.python.org/python/ , bzr-svn imports of them. [04:33] I created a repo, made my own imports of svn.python.org, and later branched copies of the ones from code.python.org (which, being bzr-svn, are identical to my imports). [04:33] With one code.python.org branch, pulling it dies with one of the "Internal check failed" messages. Before that message was introduced, it died with something less useful. [04:34] If I pull the equivalent svn.python.org branch with bzr-svn, it works fine and generates the revisions. [04:34] So...yeah. [04:35] .bzr.log snippet at http://paste.pocoo.org/show/FZSj4YB6aiyVinJfSWfw/ :) [04:36] Peng_: definitely file a bug [04:36] Peng_: I smell bzr-svn off the cuff [04:36] Peng_: a new repo suffers this? [04:37] lifeless: I haven't tried. [04:49] robertc@tungsten:~$ ./test-mem bzr 50 500 1000 2000 2500 3000 [04:49] 50,273520,2107.63493299 [04:49] 500,319884,498.597379923 [04:49] 1000,398488,373.639508009 [04:49] 2000,552916,305.507139206 [04:49] 2500,622240,302.449185133 [04:49] 3000,721288,304.617379904 [04:49] Peng_: ^ [04:49] flat at 2000+, for bzr.dev [04:50] That's interesting. [04:52] zooming in on 1K to 2K now [04:52] I think we probably need to look at the file group_size too [04:54] Peng_: if I can twist your arm a little more :) [04:56] lifeless: Unless you want to test combinations of both at once, you could open up index.py, change the first group_size line a little so it won't match the regexp (e.g. add another space before the = sign), and it'll start changing the other group_size. [04:57] (or add a space or comment to the end of the line, I guess) [05:15] Peng_: well, I can run combinations outside it [05:16] Peng_: ideally we'd run both and look for a correation, chi-squared regression or whatever [05:16] robertc@tungsten:~$ ./test-mem bzr 1000 1250 1500 1750 2000 [05:16] 1000,398492,372.275660992 [05:16] 1250,424632,334.12329483 [05:16] 1500,484364,306.166346073 [05:16] still running [05:17] but it looks like 1500 hits a bottleneck of some kind [05:18] where it stops getting faster [05:21] poolie: https://wiki.ubuntu.com/EtcUsingEtckeeperSpec [05:29] Peng_: so - [05:29] robertc@tungsten:~$ ./test-mem bzr 1000 1250 1500 1750 2000 [05:29] 1000,398492,372.275660992 [05:29] 1250,424632,334.12329483 [05:29] 1500,484364,306.166346073 [05:29] 1750,526364,304.78441 [05:29] 2000,552908,304.097445011 [05:29] for bzr.dev at least, 1250/1500 is good, at about 240MB for you [05:33] Hm. Is there any reason for the bzr-search package to be in Experimental but not Jaunty? [05:36] none [05:36] its perfect as is, release kthx [05:36] oh, thats me.. hmm [05:36] :P [05:38] Builds, installs, works. Those seem sufficient conditions for asking for a sync at this point. [05:38] sync it baby [05:39] Peng_: trying the current test-mem on python [05:40] Peng_: I'd love to have an option though to control which thing is altered :) [05:40] lifeless: i don't understand your comment about "not related to the Transport abstraction" [05:41] i understood John's [05:41] poolie: uhm [05:41] nm, now i do [05:41] :) [05:42] i think you're just reiterating what he said [05:42] probably [05:42] that it's not on transport because it's local scratch space [05:42] yes, and also that there isn't any motivation (for me at least) to put it on transport [05:44] 'it'? [05:44] management of scratch files [05:45] mm [05:51] poolie: are we talking past each other, or so violently agreeing we're confusing? [05:51] the latter [05:51] it's fine [06:09] lifeless: I'm starting to get out of my depth here. [06:10] Peng_: no worries, tell you what [06:10] Peng_: commit whatever you've got to bzr-search, as e.g. test-mem.py [06:10] Peng_: and throw me a bundle/merge-request on lp/whatever [06:12] lifeless: I actually have been versioning it (though so far the only commits have been comments and stuff), in my hg repo where I throw random stuff. [06:13] Peng_: lol. [06:13] Peng_: we so gotta make bzr more attractive for you, for that [06:14] lifeless: I'm mostly using hg for historical reasons. Although it's nice that "hg convert" can easily spin something out into its own, independent repo. [06:14] (by filtering the history and creating a new repo) [06:16] thread rename pls. [06:28] lifeless: What do you /call/ the two group_size variables? "inventory group_size" and "text group_size" or "revision group_size" or something? [06:28] mathrick: you have the bzr-avahi plugin in stalled ? <-- yes [06:28] should I uninstall it? [06:29] mathrick: its trying to share all your branches [06:29] mathrick: do you have 'bzr-svn' installed too ? [06:29] yes [06:29] Peng_: yes, that makes sense [06:29] mathrick: ok, so here is whats happening [06:29] lifeless: Which ones make sense? :P [06:30] mathrick: there is a bzr-svn bug where 'bzr branches' takes a lot of memory up [06:30] Peng_: 'revision group_size' and 'text group_size' [06:30] mathrick: and bzr-avahi uses 'bzr branches' to find the branches to share [06:30] oh [06:30] I see [06:30] lifeless: The former for _index_revisions and the latter for the other method? [06:30] I'll remove bzr-avahi for now, I don't use it anyway [06:30] mathrick: uninstalling *either* will fix your problem :P. Probably subscribing to the bzr-svn bug would be a good idea. [06:30] Peng_: yes [06:32] lifeless: https://bugs.launchpad.net/bzr-svn/+bug/54253 ? [06:32] Ubuntu bug 54253 in subversion "Excessive memory usage in python-subversion" [High,Fix released] [06:35] btw, is there a way to serve only some branches in a repo? [06:36] mathrick: bzr_access, i think [06:36] lifeless: nice to see you invalidating your own bug 181367 :) [06:36] Launchpad bug 181367 in bzr "bzr update should work in a treeless bound branch" [Low,Invalid] https://launchpad.net/bugs/181367 [06:37] i'm glad i didn't work on it any further [06:37] poolie: is that a command or a plugin? [06:37] poolie: ah yes, well I claim temporary insanity [06:38] poolie: perhaps having it work-when-it-can would be good, but I suspect too-much-effort for now [06:38] missing smiley here: :-) [06:38] that's what i concluded when i looked into it [06:38] mathrick: its a addon in the contrib directory [06:38] mathrick: it's a script in contrib in the bzr distribution [06:39] mathrick: no, I don't think thats the byg [06:39] *bug* [06:39] jelmer: ping; is there a bug for 'bzr branches w/bzr-svn chews ram'? [06:39] poolie: re: invalidating bug, reminds me of an anecdote from one of PL unis, one of the professors was appointed dean *and* rector simultanously. Reportedly at one point he applied for funds to himself and then rejected the application [06:39] lifeless, yes [06:39] lifeless, I think it has "multi-pull" in the description [06:40] PL=poland? [06:40] lifeless, poolie: thanks [06:40] yes [06:40] anyhow, nice to see he can be objective :) [06:40] we should all do so well :) [06:41] amen [06:41] are contrib scripts packaged? [06:41] jelmer: ah, I've seen one like that [06:42] maybe into doc/ [06:42] https://bugs.staging.launchpad.net/bzr/+bug/262513 [06:42] Ubuntu bug 262513 in bzr-svn ""bzr multi-pull" consumes excessive memory" [Low,Fix committed] [06:42] no! [06:42] but they should be [06:42] should I file a bug? [06:42] ubottu, yeah, that's the one [06:42] Error: I am only a bot, please don't think I'm intelligent :) [06:43] i will [06:43] mathrick, that's the same bug as for "bzr branches" [06:43] jelmer: I see, thanks [06:44] jelmer: do you have any idea what causes that? The bug is a bit short on that [06:45] mathrick, No, I haven't spent time debugging it yet [06:45] hmm, it's marked fixcommitted for bzr-svn [06:45] hmm, perhaps I fixed it already [06:46] it's a pity it doesn't link to a specific revision [06:46] jelmer: is trunk supposed to work with 1.9? [06:47] mathrick, no, only 1.10 [06:47] bug 303888 [06:47] Launchpad bug 303888 in bzr "contrib scripts should be packaged" [Medium,Confirmed] https://launchpad.net/bugs/303888 [06:47] mathrick, it's indeed fixed in the 0.5 branch [06:48] I see, and 0.5 is the 1.10-only? [06:48] yes [06:49] okay, that confuses me [06:49] why? [06:49] 0.4.15 should work with 1.9 [06:49] not the branches, something else, sorry for being confusing myself [06:49] jelmer: does it have the fix committed? [06:50] mathrick, 0.5 does, yes [06:50] 0.4.15 I mean [06:50] no, the fix is only in trunk/0.6 [06:50] *0.5 [06:50] ok [06:52] http://pastebin.ca/1272124 <-- could someone explain? [06:53] lifeless: I'll turn my index thingy into a regular bzr command later, so I can take advantage of the option infrastructure and make it possible to alter either group_size, but anyway, I'd rather watch TV right now. :P [06:53] (I don't have experience with bzrlib's command stuff, but anyway, I'm sure I'll manage to half figure it out. :P ) [06:53] mathrick, you can't list the contents of something that's not a branch/workingtree [06:53] oh [06:53] right [07:05] lifeless: quick ping re the reconfigure rfc [07:06] if you still exist [07:06] Peng_: thats cool; just shove it in the tree and I'm happy. [07:06] poolie: yes, walking up the street - can you ring my mobile ? [07:07] np [07:07] has anyone used TortoiseBzr? [07:08] http://bazaar-vcs.org/TortoiseBzr/Screenshots shows a dialogue for creating a new checkout, but I can't find it hooked into explorer anywhere [07:08] poolie, bzr reconfigure --stacked-on seems like a good idea, indeed [07:08] which is kind of important to have my boss have something clickety for all steps [07:16] Hi! I'm getting some strange behaviour from the 1.9 windows installer. I already had python installed, which was recognised by the installer and it installed everything in my python library path. That's all fine, but it doesn't seem to have installed the bzr-svn plugin. [07:17] I keep getting "unable to load bzr-svn" messages, coupled with some stuff about being unable to load "svn" from my python library path and a "cannot import name client" for good measure [07:21] Is there a version of bzr-email that works with 1.9? [07:21] hi all [07:30] markh^^ [07:30] awmcclain: the current one does not? [07:30] hi vila! [07:31] hey ! :) [07:31] poolie: Ungh. Sorry. It's been a long day of staring at debian packages. Let me go check the branch. [07:31] oh, wait... that's a lie, it does seem to have installed the plugin - I just found it in bzrlib\plugins, but it doesn't seem to have any compiled libraries (which client is) [07:32] CXI: FWIW, it doesn't seem to work on a (non-programmy) Win32 I installed it on either, presumably subversion isn't installed [07:32] poolie: I'm afraid I've never looked at the Python based installer [07:33] it appears the svn binaries aren't installed though [07:34] poolie: Where are these binaries made? It would appear its not our shared host due to the lack of the compiler I mailed about today... [07:35] * markh can never remember how to spell that host name without looking it up :) [07:36] hm [07:37] I wonder if there's a way I can get into the installer [07:37] could be it tried to put them somewhere I'm not looking [07:37] CXI: I think I can find the binaries [07:37] they "should" be in the bzr-svn directory I think [07:38] CXI: if you grab svn-win32-1.5.4.zip from http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91, it should have the binaries you need. You will probably want to copy the 'bin' directory to the bzr-svn plugin dir [07:39] (it will probably have more than you need, but it will get you going :) [07:43] hm, are you sure? that bin directory looks awfully similar to the python-svn bindings I already have installed, and not very similar to the [editor,client,ra,repos,util,wc] compiled python library files I don't have [07:45] CXI: I'm misunderstanding the problem then :) [07:45] yeah, I think I'm only just starting to figure it out :/ [07:45] bzr-svn doesn't depend on the python-svn bindings [07:46] so they may not be being found [07:46] ir binds directly to the svn api [07:46] it [07:46] ah, well I'll give it a shot [07:46] "cannot import name client" says to me something about missing python libraries, though [07:47] they're in, no difference :/ [07:48] the bzr-svn package is part python and part c libraries, right? [07:56] CXI: yeah - right - it appears you are missing all the extension modules :( [07:56] client.pyd is part of the c implemented stuff. [07:57] I could put one up on the web for you to see if it helps :) [07:57] sure, that'd be great :) [07:57] I just realised I can open the installer as a zipfile [07:57] there aren't any files that look like c extensions in there [07:58] CXI: right :( [07:58] as I said above, sadly I've never tried it [07:58] ah [07:58] http://starship.python.net/crew/mhammond/client.pyd might help [07:58] but you probably don't have any of the performance related core extensions either, which is likely to suck :( [07:59] I wonder if that means the installer is broken [08:00] CXI: right, putting 2+2 together, it appears the machine used to build these recent installers doesn't have the c compiler installed. I'm actually installing that as we speak! [08:01] ah [08:01] bleh [08:01] yeah :( [08:01] ordinal 284 could not be located in ssleay... time for me to run around in dll hell for a bit [08:01] yeah - check %PATH% for other binaries of the same name [08:05] rockin', okay, that's fixed [08:05] but it looks like are a bunch of other extensions it wants [08:05] asking for ra now [08:06] if you're fixing the installer, I can wait - no hurry [08:33] wow, python bzr-search index @ 50 is taking for-ever [09:02] I'm kind of new to version control. I made a big mistake in the last one or two commits. How do I browse my commit messages and compare the files? [09:02] CXI: still here? [09:03] sure am [09:03] (i'm not sure where I want to revert to) [09:03] ok - I should have looked - there are 4 .pyd files in bzr-svn - I'll zip 'em [09:04] CXI: bzr-svn-pyds.zip in the same palce [09:05] kingfishr: try, "bzr log", then "bzr diff -rrevno:xxx" where xxx can be seen from the log output [09:05] if you have a gui extension installed (eg, pygtk or pyqt), using its equivalent might be better [09:06] s/py/bzr/ :) [09:06] markh, ok thanks...figured it out [09:06] hey, rockin', that appears to have done the trick [09:06] yay having version control...I would have been so screwed without it :P This is the first time I've been really glad i had it. [09:08] markh: out of curiosity, what does dir /s /a /b "c:\path\to\bzrlib\*.pyd" give you? [09:09] I'm wondering specifically about those performance-enhancing dlls [09:09] but just in case there's anything else that will trip me up [09:12] I've got five other than the ones you sent me: _btree_serializer_c, _dirstate_helpers_c, _knit_load_data_c, _patiencediff_c, _walkdirs_win32 [09:12] I don't actually have a "python" install of bzr around. Only source trees and binaries. There are certainly some perf related ones missing, but nothing else leaps out. [09:13] (there are 50 .pyd files in my binary distro, but many of them come with python, or should come with packages you've already optionally installed, such as pycrypto, pyqt, etc) [09:14] actually > 50 [09:14] interesting [09:15] so how's your binary distro related to the windows standalone installer? [09:17] binary distro is completely stand-alone [09:17] uses py2exe to create .exe files etc [09:17] oh, jesus, wouldn't you believe it [09:17] I thought I'd gotten the standalone installer [09:17] but I fear the 1.9 binary install will have the same problem :( [09:18] it appears to have come from a machine with the compilers. I've not tested the installers I didn't make, and 1.8 was the last one I personally did. [09:18] somewhere along the line I convinced myself it was *so* clever that it recongised my existing python install and just put itself there [09:18] I think you grabbed the wrong installer - it should be completely independent of any Python's installed [09:19] yeah, I did [09:19] damn click-the-top-thing-it'll-be-fine mentality [09:19] that said, I suppose the problem ended up being independent of that [09:19] but I do think a 1.9 binary will have the same problem - or else I'm quite confused about how it was built [09:20] 1.8 binaries are known to be good. [09:20] anyhow, I'm pulling down a copy of the standalone so I can take a look and see if I'm missing anything particularly egregious [09:20] (for some definitions of "good" ;) [09:20] so I'll let you know if the binaries are in there [09:22] by which I mean I'm heading home now so look forward to that news later on :D [09:22] thanks for all your help - I appreciate it === doko__ is now known as doko [10:42] who knows something about bzr win32 installer? [10:43] it doesn't seem to register the TortoiseBzr shell extensions [10:43] which makes including it rather pointless [11:19] markh: looks like the standalone does have all the compiled extensions [11:20] CXI: interesting... good to know - thanks. [11:22] no problem... incidentally, any idea where I'd want to look for a list of the performance-related ones? [11:23] not really - but look for _btree_serializer_c.pyd, _helpers_c.pyd, _load_data_c.pyd, _c.pyd and _win32.pyd [11:23] hrm - that 2nd-to-last one looks suspect... [11:24] interesting [11:25] looks like most of those, or at least similar ones, were in the python installer [11:26] oh, right, you lopped off the first part of each [11:33] Hmm, who builds the Python-flavoured windows installer now? [11:33] I have a working build process for it here, apart from the "extras" [11:33] I never got TBZR to work properly after I built it. [11:37] awilkins: it has issues in the windows installer as well [11:38] I'm trying to make it work, so far with little luck [11:39] The bzr-svn SVN client extensions are not packaged in the python-flavoured one, I just delete the folder. [11:39] Or it moans about not having built it forever. [11:39] yeah, that is a good idea probably [11:39] I need to try with the standalone installer [11:39] I think Windows needs a bit of package'n'distribution loving [11:39] a bit? [11:40] Heh [11:40] I was under the impression that Canonical wanted to move the building of the win32 packages in house, onto a VM or something? [11:41] whatever works, I just want tbzr working off the shelf, it's really rather useless having it without registered extensions [11:52] there is a canonical "owned" machine we are using for builds now to less rely on any individual. It seems that process does indeed need some lovin' tho... [11:52] awilkins: can you recall what issues you had? [11:53] markh: It would crash ; sorry not to be specific. I got it building and wrapped into the exe installer, but it didn't work after installation [11:53] awilkins: can you recall what crashed? [11:54] I didn't have time to probe further as I don't use it ; I was interested from the POV of my users who could do with some GUI lovin' :-) [11:54] or when? [11:54] what were the symptoms? [11:54] It was right at the shell integration level I think [11:54] But I can't recall well, this was a while ago [11:54] about 1.6 time I think [11:54] On Vista Business 32 [11:55] I built it with the MSVC 7.1 compiler ; do you use mingw? [11:56] nope - I use the same MS compiler version used by Python itself. The "good" news is that the next version will have a c++ extension that will have no hope of building under mingw ;) [11:57] What, of TBZR or Python? [11:57] I presume TBZR since Python 2.6 is out already :-) [11:57] the truly good news with that though is that there are zero external deps other than windows itself - not even the crt - so it will be much less reliant on a "friendly" environment. [11:58] the "shell extension" (ie, dll loaded into almost *any* arbitrary process) part of the jigsaw... [11:58] I found it a right PITA to get Jelmers SVN client wrappers built for a while. [11:58] Mostly because of the primitive nature of the MS compiler, I fear [12:00] bzr-svn has built from sources for a while now - but roughly since 1.6-ish time, which is about when you said you checked. setup.py should now have recent and current instructions that work. [12:01] Yes, although the tip of 0.5 needs a few minor kicks to get started and I've not got it working yet [12:01] about 3 env-vars and 4 .zip packages from tirgirs.org later... ;) [12:01] Built, yes, working, not [12:01] I just tried today and had no such problems... [12:01] 1.5 or 1.46 SVN? [12:01] heh - quite possibly :( [12:02] lack of svn:externals support means I can't personally use bzr-svn day-to-day yet... [12:02] * markh tries not to mention lack or windows-line-ending support means he can't use bzr itself for "real world" projects yet either :( [12:03] Meh, to be honest, I'm not especially fussed about that, but I've never really been on any cross-platform projects === Spaz is now known as init [12:03] But I would think you can work around it by using tools that are not stupid and rude about line endings. [12:03] (whether they are available is another point) [12:04] hm [12:05] I can't see a way - case in point, I have launchpad mirroring a cvs repo that is primarily used on windows. My windows checkouts of the bzr mirror differ in each and every line from the real cvs trunk. [12:05] any project that already has \r\n line-ending is SOL from bzr's pov :( [12:05] Is that because CVS forces *nix line endings at the back though [12:06] it is because the same checkout on linux has different line endings than the same checkout on windows, yeah [12:06] surprised there's not a line-endings plugin [12:06] (I have some rusty familiarity with the internals of CVS from having to covert a commercialised subspecies of repository) [12:07] I'm not sure where the magic happens - but a cvs co on linux has \n line-ending, but the same checkout on windows has \r\n. But, if the bzr mirror is created on linux, a windows checkout of that bzr branch has \n line-endings [12:08] So your bzr working tree has *nix endings and your windows CVS tree has CRLF? [12:08] yep [12:08] Can your tools work with the *nix endings? [12:08] well - the bzr mirror created by launchpad has \n line-endings, and the bzr co/branch has \n regardless of os. === lamont` is now known as lamont [12:09] most can - except the unix tools, like diff.exe, which need special magic, if you are lucky, to ignore those differences. [12:09] Do you need both trees? [12:10] I suppose you can't commit to the bzr tree [12:10] Being a mirror [12:10] Or rather, push from it to the CVS repo [12:11] correct - cvs is the "canonical" source. The mirror is supposed to help me merge tricky stuff, but sadly it doesn't [12:11] the mirror, and my copy of the bzr branch, always differ on every single text file :( [12:11] Hmm ; you ever used Beyond COmpare? [12:12] oops - "the mirror and the real trunk" [12:12] "real trunk" as it is a windows-based project - regardless of what the server stores... [12:12] I've no interest in fancy tools to help with this problem ;) [12:12] Fair enough @:-) [12:13] cvs remains the trunk and what I care about [12:13] hmm [12:13] bzr refuses to let me add files named '..\index.html' [12:13] I mention it solely because it does a very nice job of comparing files with differing line endings [12:14] but I'm fairly confident that the eol-support, as planned and described, should solve the problem. [12:16] yeah - good tools would help if I had to work around this problem - but I don't - I just can't use a launchpad-based bzr mirror of a windows-base cvs project in any practical way atm. I've figured I'll just be patient for bzr to grow that support... [12:16] and when it *does* work, migrate that cvs repo to bzr once and for all :) [12:16] Just another thing that's CVSs fault really :-) [12:17] I suppose you could take a cvs-fast-export and munge it [12:17] If such a thing exists [12:17] actually, I'm not sure about that - all files without "-kb" get "native" line-endings. What is wrong about that? [12:18] Because it's destroying the original line endings? [12:18] somewhat ironically given its age, cvs does exactly what I expect [12:18] I prefer the SVN way of doing it ; don't mess with the file content AT ALL unless told to explicitly. [12:19] destroying how? I guess you could argue the CVS checkout on linux is broken as it "only" has \n line endings on text files, but I can't see how ;) [12:19] Well, suppose you grab a checkout on Linux and open the files in a Windows VM sharing that folder - VB6 would choke, for example/ [12:20] Because it hates having it's line endings messed with [12:20] well, that seems somewhat theoretical given "diff.exe" chokes today [12:22] The underlying problem is that CVS saves diffs as "ed" commands and that isn't ending-agnostic, so it wants to make everything comply with *nix line endings. [12:22] "-kb" with vcs sucks, as does "svn:eol-style" - but at least they both exist :) [12:22] oops - s/vcs/cvs/ [12:23] hrm - recall the windows cvs co has \r\n - so as mentioned, I'm not sure where that happens, but I'm glad it does., [12:23] I think it happens in the client [12:23] The actual RCS storage seems to have LF endings [12:24] And I think it's basically a #define in the source (but I haven't personally looked) [12:25] I shall add it to my list of reasons I'm happy I've never used CVS extensively :-) [12:26] :) [12:30] I believe that if the launchpad cvs->bzr mirror process happened on a windows box, both the repo, and working trees on all OS's would have different line-endings. The fact it doesn't means I'm, practically, SOL on Windows best I can tell. Shops that can't guarantee their tools also handle \n line endings are too in the short term. I'm not trying to complain, but also trying to counter any arguments it doesn't matter in the real world for [12:31] I think if it happened on a Win box, all the line endings of non-binary files would be CRLF [12:31] And all bzr checkouts on all OS would also have them [12:31] correct - but it happens on a linux box, so my windows branch also has \n [12:31] hence the problem [12:31] Which is nasty if your tools hate that, and nasty because your CVS is still live [12:32] and means in the general sense, diffs between the 2 working trees must use smart tools, or else they fail. [12:33] and trying to apply the same patch between the 2 trees will also fail [12:33] cvs2svn has a fast-import compatible out-filter ; you could munge the line-endings back and migrate the whole history to bzr :-) (but not necessarily pracical) [12:34] Yeah, you really need a line-ending-agnostic diff/patch [12:34] Or EOL munging in bzr :-) [12:35] yep :) === thekorn_ is now known as thkorn === thkorn is now known as thekorn === cody-somerville_ is now known as cody-somerville [14:35] is jelmer about? or any bzr-svn people... got this traceback trying to commit http://pastebin.com/m13240b95 [14:36] thrope, known bug with checkouts in bzr 1.9 [14:36] it'll be fixed in 1.10 [14:36] ok thanks [14:37] just found the bug actually - so I can unbind, commit and push [14:47] Hi, are any of the loggerhead people around? [14:47] I submitted a bug report a few weeks ago on LP with a patch and it has had 0 activity [14:59] lamalex, what bug ? [14:59] https://bugs.launchpad.net/loggerhead/+bug/297930 [14:59] Ubuntu bug 297930 in loggerhead "When browsing revisions, next should go up, previous should go down, numerically" [Undecided,New] [14:59] jelmer: ^ [15:02] lamalex, I think the problem may be that there is no agreement that this patch is desired, since next and prev are correct atm from the pov of the tip of the branch (which loggerhead displays first, by default) [15:02] lamalex, You may want to ping beuno or mwhudson_ when they're around [15:03] jelmer: I don't think that next or prev are correct, even with that pov [15:03] if you're at the top, the head, there should be no next [15:04] picture yourself at the top of a flight of stairs, you can step down the the previous stair, but there is no next stair available [15:04] lamalex, the steps down then are the "next" steps, as you are on your way down [15:04] and the previous steps are the steps up as you have already passed them [15:05] but if your steps were numbered, going "down" from 9 to 10 would be confusing [15:05] and is [15:06] I disagree, I don't think "next" implies an increasing number [15:06] next implies forward motion [15:06] at least when paried with previous [15:06] and that's exactly how it is at the moment [15:06] s/paried/paired [15:06] no, it's reverse motion [15:06] If you are on the first page from loggerhead, it's confusing to have to press "previous" to go to the next page of revisions [15:07] it's forward motion since the direction you are going into is from the tip to the beginning of the branch [15:07] no it's backward motion, you're just starting from the other end [15:08] we are also showing the revision with the highest number on the top of the page and the one with the lowest number on the bottom [15:08] well if you're looking at it in terms of pages it's forward but that's a silly perspective, you need to think in terms of revisions [15:08] that would conflict with your reasoning as well [15:08] anyway, I'm not a loggerhead developer so I can't make this decision but that's what my view on it is at least :-) [15:09] :) like I said, even if they dont accept the patch I'd at least like acknowledgment by them [15:09] it's not very encouraging to submit a patch and just be ignored [15:10] lamalex, ping beuno or mwhudson_ here later today (they're most likely not around atm) [15:10] Will do, thanks [15:23] jelmer: have you fixed any bzr-svn HTTP redirect related issues recently? [15:23] Jc2k, fairly recently, yes [15:24] i have one where it is doing an OPTIONS on /$module/branches and then stopping looking after it hit a 302. [15:24] (bzr-playground_ [15:25] it should convert any svn redirect exceptions to bzr redirect exceptions [15:25] https://bugs.edge.launchpad.net/bzr/+bug/303959 [15:25] Ubuntu bug 303959 in bzr "missing redirect handler: no repository found when pulling a branch from bzr-playground" [Undecided,New] [15:26] Jc2k, it was something similar to that that I fixed earlier [15:26] Jc2k, have you tried 0.4.15? [15:26] i have 0.4.15dev0 [15:27] could somebody just explain the branching concept to me in this situation? I have a branch that I've bound to a central location. It's at /srv/bazaar/myproject/trunk. Let's say I now want to make a (svn branch) to build some features outside of the trunk.. [15:28] how would I go about that, and how does that relate to my original 'branch' (trunk) [15:33] jelmer: trying a 0.4.15 final tarball now.. [15:34] Jc2k, when cloning that branch, I get two messages saying http://bzr-playground.gnome.org/gtk%2B/branches/ is permanently redirected to [15:34] but other than that it seems to work ok [15:34] jelmer: branch works, then a subsequent pull fails [15:35] I believe I set up my central folder with --no-trees [15:37] CaMason: where to svn come in to this exactly? [15:37] Jc2k: In my head, that's all. I'm used to SVN and I'm comparing to bazaar concepts to see how they differ [15:37] CaMason: publishing a branch to a server with a --no-trees repository is covered here: http://doc.bazaar-vcs.org/latest/en/user-guide/index.html [15:40] Jc2k, I think I found it [15:40] Jc2k, bzr's RedirectRequested requires a full new URL whereas svn is only giving a relative one sometimes [15:41] so, with reference to this section, how should I go about creating a /branches/mybranch1 'branch'? http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#choosing-a-shared-repository-layout [15:41] jelmer: ah. [15:42] so I need to bzr-init branches bzr-init branches/mybranch1 ? [15:42] do* [15:42] no need for bzr-init branches [15:42] ok just make folder? [15:42] yep [15:42] or not even that? [15:43] ok nice. So, when I merge that particular branch with the 'trunk' branch, will the history move across also? [15:43] yes [15:43] make sure you did a bzr init-repo in the root folder [15:43] great, so then I could delete the 'branched' branch [15:44] bzr init-repo myproject [15:44] bzr init-repo myproject/trunk [15:44] etc [15:44] how can I check that? [15:44] whoops [15:44] 2nd command was meant to be just init *blush* [15:45] CaMason: `bzr info` [15:45] Shared repository with trees (format: pack-0.92) [15:45] jelmer: shall i reassign my bug to bzr-svn :) [15:46] I thought I made my repository with --no-trees. Would that suggest otherwise? [15:47] CaMason: yes, that suggests otherwise. [15:47] Jc2k, already happened :-) [15:48] ok I suppose I should fix this [15:49] =p [15:49] jelmer: and you fixed it already too :p [15:49] sorry I'm slightly confused as to whether I need the no-trees options [15:51] CaMason: if you don't care, either is fine. [15:51] I'll pastie my layout [15:51] CaMason: with trees disk size will be bigger. [15:52] Jc2k, looks like it's not just bzr-svn though [15:52] jelmer: i thought i caught pycurl returning relative urls.. [15:53] Here's how I envisage my layout: http://pastie.org/327827 [15:54] would anybody be able to give me an idea of which commands I *should* be using? [15:54] CaMason: bzr init-repo /srv/bzr/myProject; [15:54] Greetings, folks! I'm trying to push a change to lp, and it says it can't because I'm using HTTP. How do I tell it to go ahead and use ssh, or whatever it is that it needed to push changes? [15:54] zooko: how are you pushing it to lp? [15:54] CaMason: trunk, branch1, branch2, and both releases would then just be branches [15:55] CaMason: so either init, branch or push them to their location. [15:55] LarstiQ: OK that makes sense. What about the 'containing' folders? [15:55] so the 'branches' and 'tags' folders [15:55] CaMason: the containing folders need no special treatment [15:56] CaMason: either mkdir them on the server, or supply --create-prefix when pushing a branch [15:56] LarstiQ: aha, thanks that's making sense now [15:56] CaMason: they are just regular directories after all. [15:56] yeah, that's what's causing me the confusion I think.. vs SVN :) I think directories are tidier. Seperates the history and 'branches' from the project structure [15:57] of course, you dont need the tags folder. [15:57] no? [15:57] read bzr help tags [15:57] will do [15:57] and bzr help tag [15:57] the tags folder would be for svn style 'tagging', which is fine in itself, but not necessary. [15:57] * LarstiQ goes afk [15:58] Ah i see [15:58] I assume that would take up less disk space also? [15:59] i dont know about that kind of stuff :) [15:59] ok thanks LarstiQ and Jc2k that's helped me a lot [16:04] luks: I think I should push over ssh. Is that how things are done? [16:04] zooko: I meant what command do you run? [16:05] zooko: e.g. if you are using `bzr push lp:something`, you need `bzr launchpad-login USERNAME` [16:05] zooko: but if you are using a full URL, just change the protocol [16:05] (to bzr+ssh or sftp) [16:06] luks: Ah, thanks. [16:06] I founf SFTP to be a very easy way to share projects :D [16:06] found* [16:07] Hm. [16:07] HACL yukyuk:~/playground/pyOpenSSL/buildbinaries$ bzr launchpad-login zooko [16:07] HACL yukyuk:~/playground/pyOpenSSL/buildbinaries$ bzr push zooko@lp:~zooko/pyopenssl/buildbinaries [16:07] bzr: ERROR: Parent directory of zooko@lp:~zooko/pyopenssl/buildbinaries does not exist. [16:07] You may supply --create-prefix to create all leading parent directories. [16:08] I don't understand that error message. [16:08] Jc2k, It's working here now; I've commented in the bug [16:08] Jc2k, thanks for tracking this down [16:10] jelmer: no no, thank you :) [16:16] So, bzr apparently knows that I got the current working directory over HTTP. How do I tell it that I am going to push it over ssh, so that I can do things like "bzr commit" without getting this error message: $ bzr commit [16:16] bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/%7Ezooko/pyopenssl/buildbinaries/.bzr/repository/lock): Transport operation not possible: http does not support mkdir() === thekorn_ is now known as thekorn [16:20] zooko: "bzr bind lp:~zooko/pyopenssl/buildbinaries" [16:20] Thanks! [16:21] the "lp:" is writeable now because you did the launchpad-login, but it saved the http:// url to disk, "bind" just tells it to save the new (bzr+ssh://) url [16:22] Thanks. [16:22] Howdy abadger1999. [16:22] zooko: Howdy [17:06] bzr-gtk asserts with brz-svn branches, is this known? [17:08] marcoil, What command exactly? [17:09] jelmer: I've tried visualize and gcommit [17:10] marcoil, both work fine here - how does it assert? [17:10] jelmer: bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' [17:10] do you want a traceback? [17:10] are you using bzr 1.9 by any chance? [17:11] jelmer: yes... [17:12] I updated to get the latest bzr-svn [17:13] jelmer: http://pastebin.be/15139 [17:13] There is a regression in bzr 1.9 wrt branch nicks, this appears to be causing what you're seeing [17:15] also, I have a branch bound to the trunk of a svn repo and another one to a branch of it, but I can't merge between them. It can't find the common ancestor, is there some way of telling it? [17:17] marcoil, in bzr-svn 0.4 it's only possible if the two branches are using the same "branching scheme" [17:18] jelmer: I can't find much info on that... [17:20] marcoil, To put it a bit simpler, if the branches are following the standard svn naming convention (trunk, branches/*) you should be fine [17:21] jelmer: if I set both branches svn-branching-scheme, should that work? [17:21] the repo is using the /project/trunk|branches/subproject scheme, btw [17:22] marcoil: it will work in 0.4, but not without a lot of trouble (you'll need to set the branching scheme the same for both branches and probably re-fetch them) [17:25] jelmer: is there any info on the format of svn-branching-scheme? I've changed it but now I get "is not a valid Subversion branch path" [17:26] marcoil: see bzr help svn-branching-scheme [17:26] that's pretty much all there is [17:27] jelmer: that doesn't say a lot, just that there's one named "none" :( [17:27] jelmer: thanks for the pointers, anyway [17:28] well, branching schemes are gone in 0.5, so I haven't put a lot more work into documenting them [17:28] jelmer: oh, that's great. Will that work with old svn servers, though? Also, should I update to 0.5? [17:29] yeah, it should work with old svn servers as well (>= svn 1.2) [17:29] 0.5 is still in development, although it should be fairly stable [17:29] I hope to make a stable release around christmas [17:32] jelmer: I'll try with 0.5, then [17:34] jelmer: is there a package of it somewhere? [17:34] marcoil: no, it's all bleeding edge (lp:bzr-svn/0.5, and required bzr >= 1.10rc1) [17:35] marcoil, also, there's an open bug dealing with older roundtripped revisions ("bzr push" into svn using bzr-svn 0.4.x) [17:35] jelmer: then not for production use, I guess :) Well, I'll look a little at the branching schemes and if not I'll just merge manually for now. Thanks again! [17:35] marcoil, n/p [17:47] anyone using bzr on a mac ? [17:47] is it good is it bad ? === ja1 is now known as jam [18:31] jelmer: I finally solved it using a branch list :) [18:33] jelmer: the only problem has been losing the connections with previous local branches I had [18:44] marcoil, yeah, that's the main problem with branching schemes [18:45] jelmer: does that mean that every time I add a branch to the list I'll lose the connections? [18:46] marcoil, yes [18:46] argh... === Mario_ is now known as pygi [19:16] Is there a way to un-bzr remove a file? [19:16] I keep getting the error that it's not a versioned path... [19:19] revert or merge to a revision where it existed? [19:31] I especially like the "Any Workflow": http://whygitisbetterthanx.com/ ;-) [19:34] hi folks, how can I increase verbosity for bzr? I'm getting a connection refused error message behind a proxy but I can't even see where/how it's attempting to connect to lp [19:34] cr3: not sure, but you might get lucky by looking into ~/.bzr.log [19:35] nevans_: it just shows the output I got from the command line [19:40] no matter whether I set the https_proxy or http_proxy environment variables, I still get: connect(4, {sa_family=AF_INET, sin_port=htons(443), sin_addr=inet_addr("91.189.90.218")}, 16) = -1 ECONNREFUSED (Connection refused) [19:40] nevans_: strace seems to be the debug flag [19:42] sorry, I've never had to use it behind a proxy... [19:42] cr3, "bzr help global-options" says something about -Dhttp [19:42] dunno if that would help [19:43] cr3: are you using "lp:something" when you get the error? [19:44] james_w: yes === ozzloy_ is now known as ozzloy [19:45] cr3: that's a bug in python that it doesn't use the http_proxy for xmlrpc [19:45] cr3: you can work around it by using the expanded URL [19:45] bzr+ssh://bazaar.launchpad.net/whatever [19:46] james_w: cheers, http://code.launchpad.net also works just for branching, which might be sufficient for the person I'm helping [19:46] james_w: I was just telling that person that I've encountered problems with some python libraries when dealing with https proxies === herb__ is now known as herb === davi_ is now known as davi [20:07] mm-mysql__: ping [20:07] mm-mysql__: pong [20:07] Wow...two underscores === mm-mysql__ is now known as mm-mysql [20:07] That's better [20:08] Good to see you around. [20:09] Just thought I'd see how things are going, and if you would be interested in getting together some time soon [20:09] Things are good, other than some thugs knocked down our post light Friday night, and broke all four legs on one of our reindeer decorations :P [20:10] But sure, getting together would be great...what are you thinking? Lunch, or? [20:11] you don't live on reindeer alley, right? [20:11] Sorry to hear about the vandalism. [20:11] Lunch would be fun. [20:12] jam: Okay, let me look at the calendar, and then talk to the social coordinator (the wife), so I don't schedule something when she thought I'd be home...Give me a day or so to pick some possibilities? [20:12] sounds good [20:12] My noon-time is generally open [20:12] though I'll probably be away the week of the 15th or so. [20:13] Okay, noted. [20:13] Working at home sometimes actually *complicates* the schedule :) [20:13] (people get used to you being around) [20:16] :) === Jc2k_ is now known as Jc2k [20:29] hi jam [20:29] hi lifeless, are you in Mountain View? [20:30] not yet [20:30] fly tomorrow [20:39] I have a question about moving from SVN to Bazaar. The svn repository is quite big, almost 400 megabytes, and there are also about 40k revisions. As far as I tried to complete the move, I saw Bazaar gets data about every single revision and then applies that data one by one. This get _very_ slow on a repository that big, at least in the way I try to do it - so far I've tried with "bzr checkout" (which gets even slower when downloading data f [20:39] vila, bug 255687, I'm not sure its a log issue? [20:39] Launchpad bug 255687 in bzr "Please allow annotating removed files" [Medium,Confirmed] https://launchpad.net/bugs/255687 [20:40] zdobersek: your text cut off at "when downloading data f" [20:40] I'll reposte it in parts. [20:41] Or at least the last part. [20:41] This get _very_ slow on a repository that big, at least in the way I try to do it - so far I've tried with "bzr checkout" (which gets even slower when downloading data from a web server) and "bzr svn-import", but both take an enormous amount of time. Is there any faster way or should I leave my computer on and processing for the night? [20:41] if you want to migrate, I suggest using 'bzr svn-import' [20:42] this will convert all your branches at once. And yes, leave it running overnight, if that what it needs [20:57] zdobersek: What version of bzr-svn? [20:58] zdobersek: FWIW, older versions of bzr-svn might leak a lot of RAM on a repo that large. [20:58] Peng_: 1.6.1 [20:58] zdobersek: That's bzr, not bzr-svn. Check "bzr plugins". [20:59] Peng_: 0.4.13 [21:00] OK. Carry on then. [21:07] robertc@tungsten:~$ ./test-mem python 50 500 1000 2000 2500 3000 [21:07] 50,746876,33720.086226 [21:07] 500,727064,6420.87136602 [21:07] 1000,819836,4832.82598305 [21:07] 2000,806848,3699.43931794 [21:07] 2500,708820,3237.27468991 [21:07] 3000,736232,3597.21533608 [21:08] Peng_: ^ [21:08] flattens out around 2500 [21:09] Peng_: I *think* its noise on the last three [21:13] Peng_: I think I'll bump it to 1500 which seems to be well past the 'too small' size, and doesn't use *more* silly-scale-more memory on python than '50' does. [21:49] lifeless: what is that test? [21:50] jam: group_size,peak_memory_kb,time for bzr index [21:52] Erk, 700-800 MB to index Python? Fun. [21:54] lifeless: that is the "bzr search" index time, right? [21:54] jam: Right. [21:55] It is, indeed, interesting that the memory consumption goes down a little bit with increased group size [21:55] probably depends on exactly how the keys fit together [21:56] jam: it uses repo.make_mpdiffs [21:56] jam: so that peak is likely actually revno 1 [21:59] lifeless: it doesn't help that make_mpdiffs combines and re-splits all the lines [21:59] it uses _get_lf_split_line_list [21:59] which does [21:59] [StringIO(t).readlines() for t in self.get_texts(version_ids)] [21:59] so it reads everything into lists of lines (because that it how knits work) [21:59] then combines them together to create a single string per text [21:59] then breaks them back up again into lines [22:00] It *might* only hold the reference to one at a time [22:01] so you get 2x the mem of a single text, but not 2x the mem of all texts [22:01] indeed [22:02] I think its size(tree) + size gzip-records-for-group-size [22:14] jam: standup? [22:14] poolie: ^ [22:14] I was wondering if poolie and/or spiv were around today, but I believe spiv is away [22:15] poolie is [22:18] jam: yeah, I'm away this week (despite my habit of hanging around on IRC...) [22:20] hi [22:21] lifeless: poolie doesn't seem to be answering, how about if I start it and just call you [22:22] sure [22:25] oh, I should actually mention the other big problem with _get_lf_split_line_list is that get_lines is capable of allowing similar texts to re-use the same actual strings [22:26] but that code will force them to be unique strings [23:00] i'm trying to write a script that uses bzrlib to extract some information from the current branch [23:00] is there some high-level document to explain the major operations [23:00] for example, how do I get the branch associated with the current working directory [23:00] flacoste: there is stuff on the wiki about the api [23:00] flacoste: and the programmers guide too [23:00] lifeless: i've looked around, but nothing at that level [23:01] the HACKING file seems more about process than anything eles [23:01] flacoste: can you describe the level you are looking for? [23:01] task-oriented [23:01] or the major API [23:02] i read the plugin documentation [23:02] but it only describes the metadata or plugin structure [23:02] there is http://bazaar-vcs.org/Classes which is a conceptual overview of the most important object [23:02] that might be interesting [23:02] i looked at the api doc [23:02] but it's hard to grasp where are the handles into the framework [23:02] and http://bazaar-vcs.org/WritingPlugins [23:03] and http://bazaar-vcs.org/Integrating_with_Bazaar [23:03] bingo [23:03] that last one is what i was looking for [23:03] exactly what I was looking for [23:03] thanks a lot! [23:03] and, it's in the bzr tree as well [23:04] * beuno hasn't updated that in a while... [23:06] flacoste: anything you need added or spend time figuring out is a bug in some form [23:06] flacoste: 'pydoc bzrlib.foo' should always be reasonably useful as well [23:07] ok [23:07] (need added - I am referring to docs about stuff) [23:09] yep [23:12] any quick way to determine if a working tree doesn't contain any change? [23:12] or do I have to check all of treedelta attributes? [23:12] has_changed() [23:12] ? [23:12] yes [23:12] actually changes_from is an old api [23:13] most things use iter_changes now [23:13] tree.iter_changes(tree.basis_tree()) [23:13] which is undocumented [23:13] its very much documented :) [23:13] well, not according the apidoc [23:13] pydoc bzrlib.tree.Tree.iter_changes [23:13] on startship mwh at least [23:14] oh ugh, that isn't showing up [23:14] let me see [23:14] its a doc bug [23:14] pydoc bzrlib.tree.InterTree.iter_changes [23:14] ok [23:15] and btw, "Integrating with Bazaar" says: There are two methods for comparing trees: changes_from and iter_changes. iter_changes is more regular and precise, but it is somewhat harder to use [23:15] the last part doesn't especially makes we want to look :-) [23:15] it lies :) [23:15] anyhow [23:16] if you want to know what commit considers a no-change, you have to do a commit; if you want to know if there are no changes that diff would show, len(list(iter_changes)) == 0 will do it [23:16] if you want what status does, you need to check len(tree.get_parent_ids()) == 1 and len(list(iter_changes)) == 0 [23:17] flacoste: (what are you trying to do?) [23:17] find the files i need to lint [23:17] either the ones modified in the working tree [23:18] or if the working tree is clean [23:18] all modified files from the submit: target [23:18] ok [23:18] filter iter_changes for objects with the file_kind[1] element == 'file' [23:19] e.g. [23:19] for change in iter_changes: [23:19] if change[2] and change[6][1] == 'file': [23:20] lint(tree, change[0]) [23:20] change[0] is? [23:20] [2] is the content_changed flag, [6] is the kind tuple, and [0] is the file_id [23:21] lint needs a file path [23:21] lint() is a python function [23:21] :) [23:21] right :-) [23:21] tree.id2path(file_id) will give you a relpath [23:21] cool [23:21] tree.abspath(tree.id2path(file_id)) will give you an abspath [23:21] change[1][1] is also the relpath [23:22] so you could do lint(tree, change[1][1]) [23:22] asssuming you did [23:22] iter_changes = tree.iter_changes(other_tree) [23:22] for the record, i agree that this api is harder to use :-) [23:22] hello [23:22] change[1][0] is the path in other_tree, change[1][1] is the path in tree [23:23] a lot of magic numbers in here [23:23] flacoste: we'd like to use named tuples, but they are soooo slooooow [23:23] i understand why you are using it [23:23] hi poolie [23:23] but in the integration story, that concerns isn't that important [23:24] flacoste: true enough; changes_from will remain supported for a long time I think, there is little motivation to remove it, and as you say its easy for simple things to use it [23:24] great, and thanks for getting going! [23:26] jam, ilfeless, today i was planning to at least make info and reconfigure deal with stacked branches [23:26] i'm more sure i can get that done today than i am for michael's bug [23:30] poolie: can't you just revert spiv's change? [23:30] I'm pretty sure you diagnosed it correctly. [23:31] Also, you should note that abentley also hit the bug and reported a dupe [23:31] ok [23:31] yes, i'm also going to revert the caching bug [23:31] i was referring to some of the stacking related ones [23:31] ah, ok [23:31] what are you up to for the rest of this week? [23:31] I'm open to suggestions, but I was going to try to work more on the CHK code [23:32] jml: ping if you're around [23:32] starting with making sure things always preserve canonical form [23:33] +1 for reverting my caching hack, FWIW. [23:33] (atm, I don't believe unmap() does, and I think map() can also fail if the node's size changes dramatically.) [23:33] (I really should teach irssi not to highlight my name in work-related channels when I'm on leave...) [23:33] spiv: I'm amazed at how responsive you are to a tiny pink number :) [23:34] I at least get an audible notification [23:34] anyway, I'm done for tonight. Catch you guys later === bpierre1 is now known as bpierre [23:38] markh, i'll ping our admin people again [23:38] poolie: thanks === Toksyuryel` is now known as Toksyuryel [23:40] markh, thanks for fixing up the compiler on kerguelen [23:41] did you build 1.10rc1, or should i? [23:41] np - the full vs2008 is still installing actually [23:42] I haven't actually built anything on that box yet - it sounds like John would prefer to wtick with mingw - although I also suspect bug 303941 is related [23:42] Launchpad bug 303941 in bzr "BZR Installer on Windows XP 64 'MSVCR71.dll was not found.'" [Undecided,New] https://launchpad.net/bugs/303941 [23:46] poolie: did you or john make the existing ones? [23:46] john [23:51] lifeless: How large were the search indexes for Python? [23:51] Peng_: dunno the script delete's them :) [23:51] Oh, right. [23:52] indexing it manually, tell you in 6420 seconds [23:53] Hmm, if it takes 6420 seconds, and uses 700 MB of RAM, it could actually be cheaper to download prebuilt indexes. [23:59] 08:06 < lifeless> 50,746876,33720.086226 [23:59] 08:06 < lifeless> 500,727064,6420.87136602 [23:59] 08:06 < lifeless> 1000,819836,4832.82598305 [23:59] 08:06 < lifeless> 2000,806848,3699.43931794 [23:59] 08:06 < lifeless> 2500,708820,3237.27468991 [23:59] 08:06 < lifeless> 3000,736232,3597.21533608 [23:59] so we have tradeoffs