[00:09] I get a fun error when trying to run “bzr update”: UnicodeEncodeError: 'ascii' codec can't encode character u'\xe5' in position 358465: ordinal not in range(128) [00:10] backtrace and some info: http://pastebin.com/m2d85582c [00:15] anyone have a favorite rhel/centos rpm that's newer than the one provided by EPEL? [00:16] hah, I love bzr: Conflict adding file .bzrignore.THIS.moved. Moved existing file to .bzrignore.THIS.moved.moved. [00:19] (how on earth I get conflicts when I only have one local branch is beyond me :-P) [00:19] sandsmark: you can conflict with someone else without needing two local branches [00:20] lifeless: there is noone else, there is only one branch, my local one [00:20] sandsmark: can you do 'bzr inventory | grep .bzrgnore.THIS' [00:21] Is there a way to change commit comments? [00:21] lifeless: yeah, bzr inventory returns such a file [00:21] RenatoSilva: uncommit the commit, and recommit it with new comments. [00:21] sandsmark: ok, you need to 'bzr remove' that file. bzr uses '$filename.THIS' for storing its conflicts [00:22] ah [00:22] ok [00:22] so by versioning it you've got it in a loop [00:22] lifeless: I'm better off not doing this, it's an old revision [00:22] RenatoSilva: then no. [00:22] ok thanks anyway [00:22] * sandsmark blames etckeeper [00:22] sandsmark: could you file a bug? we should be more graceful/informative about that particular case. [00:23] lifeless: well, 1.5 is pretty old [00:23] even so [00:23] ok [00:23] if its fixed already it will be easy to close ;) [00:23] heh, ok :-) [00:23] but while I suspect we have a bug thats similar to this already, I'm fairly sure we haven't actioned it. [00:23] so at worst this will be a dup and add data to the frequency people hit it. [00:24] lifeless: uhm, is this really a bug, though? I would rather say the problem is with etckeeper, adding all files indiscriminately [00:25] (the real question is where the conflict comes from, though) [00:25] bzr could help - it could say 'this is a dangerous file to add', it could, on conflicts, not conflict on that file but instead know it can overwrite it;it could adjust the conflict path it uses [00:25] yeah, true [00:27] well, it might give some false positives, but a simple warning might be nice [00:30] https://bugs.launchpad.net/bzr/+bug/414589 [00:30] Ubuntu bug 414589 in bzr "Bazaar doesn't notice/care if you try to version-control *.THIS, *.BASE, *.OTHER or *.moved" [Undecided,New] [00:30] lifeless: something like that ok? [00:30] sandsmark: great [00:30] k [00:30] I'll add a little editorial when it gets to my inbox [00:30] ok, thanks :-) [00:31] hmm, I'll try to backport a more recent bazaar to see if it helps with the utf8-failings [00:32] ah, it is in lenny-backports [00:38] ah, awesome, that worked like a charm [00:46] hmm, another odd error [00:47] http://pastebin.com/m32268cf3 [01:07] igc: some people find documentation more exciting than writing code ;-) [01:09] james_w: really?? Name one. :-) [01:09] crazy people I know :-) [01:09] but exactly the ones you want to be writing your documentation [01:10] james_w: true. Too much knowledge of the code can be a disadvantage when it comes to writing clear docs :-) [01:11] james_w: well docs for beginners at least [01:11] see the git documentation! [01:11] * mzz ducks [01:11] not wanting to spend your time writing code means that you can instead focus on writing great documentation [01:11] mzz: it makes my head spin [01:12] (it's not entirely fair towards the git folks, but the thing I remember most clearly about git is that it documentation suddenly went on and on about some kind of squid when I was trying to do some basic version control thing) [01:12] mzz: 'git log' is 30 pages! (and I wish I understood half of it) [01:12] I'd prefer code written by people passionate about it than code written by those who were just writing it because they felt they had to [01:12] "I don't *want* to hunt deep sea creatures right now! stop talking to me about an octopus!" [01:13] same goes for documentation [01:56] Is there a good guide to using the bzr smart server? [01:57] Would I have to setup a chroot jail for users? === thumper is now known as thumper-afk [02:31] am getting these errors: bzrlib.errors.LockContention: Could not acquire lock "/.bzr/checkout/dirstate": [Errno 11] Resource temporarily unavailable <== which I infer is a roundabout way of saying directory doesn't exist? or? [02:32] This is seen via a cron task; but only 1 in 4 runs. [02:50] spm: is it on nfs? [02:52] lifeless: no, local. based on the full traceback tho - i suspect it may be a bzrlib issue of sorts. it's pulling in a local 1.16 copy to run with - which was a hack to get around 2a format updates back in July. Take that out and I get a full on boom. progress of sorts... [02:55] lifeless: old vs new https://pastebin.canonical.com/21210/ - i suspect the cm bzrlib needs updating; and/or rejig the path to use the system one. [03:42] spm: this shouldn't have suddenly gone odd [03:43] however, the latter error means that you've broken it by whatever gives the boom:) [03:43] truly :-) [03:44] I've just put in a fix which works in manual testing; but in the leadup to, was seeing some really weird errors. My first suspicion was pebkac and inclined to hold that; but I wonder if something else is going on [03:48] something changed ;) [03:57] which is where it gets very weird; because a similar script isn't erroring at all. Anyway. see if the fix in place works. [04:10] lifeless: nope. same error. something else is happening here.... [04:20] spm: yes, I rather thought so :P [04:21] aye. ah well. At least that cleans up one possible area of problem. <== searching for any silver lining [04:23] let's say i have an existing bzr branch, and i want to bring in some code from another completely unrelated tree (think: main project, and plugin) -- is there any slick way to somehow preserve history, or even to keep that part of the tree "pointing" at the other branch to bring in updates later? Is this exactly what is going to be supported in the future with "subtrees"? [04:23] bzr add --ids-from /path/to/main files_copied_from_main [04:23] or something like that [04:24] then if you do a cherry pick merge bzr will know the files are the same [04:24] intriguing-- i'll check that out [04:24] keeping the history the same is rather harder, unless you're happy to have all of the other tree copied around forever more. [04:27] hi igc [04:27] lifeless: this is a really cool feature, i'm amazed that i never encountered it in my hours of googling on the topic [04:28] its not a panacea [04:28] but it should help [04:29] lifeless: so i put file-ids-from to the top of the branch, even if i'm only integrating a part of it? [04:29] Hello, I accidentally moved a file under version control manually and then commited. Is there a way to tell bzr I have moved the file to update its version history? [04:29] I moved the file and then used "bzr add" and then commited instead of bzr move [04:30] johnjosephbachir: yes, and you'll want the files being added at the same paths; then you can bzr mv then into their final place in the new tree [04:30] jseabold: bzr uncommit [04:30] jseabold: bzr remove --keep [04:30] jseabold: uncommit, revert add, then use bzr mv --after [04:30] jseabold: bzr mv --auto [04:30] jseabold: bzr commit [04:31] Ok, I actually commited more than once before I realized it, can I uncommit to a certain revision? [04:31] you can commit several times [04:31] you may want to shelve each step [04:31] unless you're happy to combine them [04:33] lifeless: Hmm, ok thanks. I will try to follow your instructions. So I'd just uncommit a few times until I'm at the right revision before the move? [04:34] lifeless: I think I need to read up some more on shelving. [04:34] uncommit; shelve --all; uncommit; shelve --all; uncommit; do stuff [04:35] commit; unshelve; commit; unshelve; commit [04:35] hi bialix [04:35] igc: I've read http://doc.bazaar-vcs.org/plugins/en/qbzr-plugin.html [04:36] I see there is holes in or doc [04:36] and based on your mail today I think I need to release 0.13.2 with some patches cherrypicked from trunk [04:37] lifeless: ha, awesome. I think I see what shelving is about. I am mighty relieved to learn this. Thanks. [04:37] bialix: why not a qbzr 0.14 at the end of thw week instead? [04:37] the docs say more [04:37] you don't want to uncommit past a merge, or stuff other folk will have merged, unless you really need to do. [04:38] but uncommit + shelve - very powerful [04:38] igc: can you explain this deadline? [04:38] 1 week [04:39] igc: btw, if you will be able to regenerate the doc with fresh qbzr trunk so I can see my latest doc improvements, it will be great. [04:39] bialix: iiuic, around aug 24? is the close off day for packages to make it into karmic. Beyond that, things can go in but the paperwork and approval process becomes larger [04:40] aha [04:40] understand [04:40] lifeless: ok, I don't need to uncommit past a merge so I should be good. Thanks again. [04:40] igc: so yes, it's better to release 0.14 then [04:40] bialix: I'm not a deb/Ubuntu packaging guy though so take my comments with a grain of salt until someone closer to the process confirms that [04:41] igc: I'm not either [04:42] igc: but 0.14 cycle is kinda too short (2 weeks) I guess [04:42] New upstream versions do need paperwork in a week, but it's not impossible paperwork. [04:43] It gets progressively harder as time goes on, so you should endeavour to get it in ASAP. [04:43] (August 27 is the date, I believe) [04:43] bialix, wgrant: sounds right: https://wiki.ubuntu.com/KarmicReleaseSchedule [04:45] bialix: so if it's aug 27, I think next Monday is ok for 0.14 [04:45] bialix: there's a lot there in a sense: qexport, qbind, qunbind and hopefully more if I pull my finger out this weekend and write quncommit say [04:46] bialix: and, no pressure, but qrun would be nice :-) :-) [04:46] igc: it might be prettier for people to have qbzr uncommit [04:47] igc: we have also new commit_data patch I'm about to merge [04:47] igc: so I think I'd better release 0.14 in the middle of this week and have 1 week for user testing. [04:47] so we can do 0.14.1 [04:48] if necessary [04:48] wgrant: what is the process to ensure our release from PPA will go into karmic? [04:48] bialix: to regen the plugin docs yourself, just download the branch I mentioned in the email and run the built-topics.py script. I think you can give qbzr as an argument iirc [04:49] bialix: I need some lunch - bbl [04:49] * igc food [04:49] ok [04:49] lifeless: do I need to move the file back by hand? I uncommitted to a revision that should have the file unmoved but when I "bzr status" it shows the file as removed. Am I missing something? [04:49] jseabold: uncommit doesn't change the tree [04:50] jseabold: which is why you need to shelve between uncommits:) [04:50] bialix: You have to ask for it to happen, or it will not happen at all. https://wiki.ubuntu.com/SponsorshipProcess is what you want. [04:50] jseabold: hwen you're back tot he point you want to be recommitting on, just do [04:50] bzr remove --keep FILE [04:50] bzr mv --auto [04:50] and bzr will detect it [04:51] sorry to be slow, but is FILE the path to the file that I have moved or the original location? Trying the original location gave an unversioned error. [04:51] the new location [04:52] ah ok [04:54] lifeless: "bzr mv --after" rather than "bzr mv --auto"? [04:54] the latter is easier [04:54] :) [04:55] It gave me a no auto option error. Do I need to upgrade bzr? [04:55] oh [04:55] if you have an old bzr then mv --after OLD NEW [04:55] --auto is reasonably old itself though. strange. [04:56] ugh, said OLD is not versioned [04:57] hmm [04:57] do 'bzr st' [04:57] does OLD show as 'missing'? [04:58] nope they show as 'removed' [04:58] ok [04:58] run 'bzr revert OLD' [04:59] then, 'rm OLD' (!not bzr rm OLD) [04:59] and then the mv --after should work [04:59] you are a lifesaver! I think that did the trick. Thanks [05:00] my pleasure === thumper-afk is now known as thumper [06:11] are there any windows savvey bzr people that use Launchpad that could comment on https://answers.edge.launchpad.net/launchpad/+question/79261 ? [07:05] hi all [07:11] vila: hi vila [07:11] vila: 15:11 < thumper> are there any windows savvey bzr people that use Launchpad that could comment on https://answers.edge.launchpad.net/launchpad/+question/79261 ? [07:12] lifeless: I saw that, but *I* am not windows savvey 8-) [07:13] The best I can guess is that ssh or its agent is not configured as it should... but indeed someone can explain the steps needed to check that better than me... [07:15] lifeless: and hi :) [07:16] :) [07:16] have a good weekend? [07:16] could have been better, but life can't always be pink :) [07:20] lifeless: that locking error we were chasing earlier. hypothetically :-) if we had two almost identical tasks (bzr update/config-manager) running simultaneously, would you expect that to generate that style of error? [07:20] no [07:20] but - a) bugs [07:20] and b) bugs [07:20] heh [07:20] so [07:21] we guard the dirstate _write_ lock with a lockdir lock on the tree [07:21] and we take write locks out to write stuff (duh) [07:21] we don't guard dirstate read locks like that, we expect the os to tell us it can/can't read lock it. [07:21] makes sense [07:23] as a "can't hurt" trial, I've offset the problematic of the two jobs to run 5 mins after the 1st. If we get a repeat, then life gets interesting again; if we don't... [07:23] spm: kk [07:24] if it 'fixes it', file a bug [07:24] it may be a misconfigured sys/proc thing, or a code bug [07:24] there may be a legitimate error we don't catch. [07:24] \o/ 12 errors [07:24] _closing in_ [07:24] right [07:24] heh [07:29] 11. [07:35] just as well the number counts down. I'd be worried else... [07:49] 5 [07:50] lifeless: hurrah! [07:52] I love this: [07:52] :!bzr commmit -m "Merge fix for test_knit in 2a." [07:52] Command 'commmit' not found, perhaps you meant 'commit'? [y/n]: y [07:52] thumper: your question still open? [08:04] thumper: answered [08:12] vila: bonjour [08:37] bialix: hi, argh, already gone [08:55] Done! [08:55] spiv: ^ [08:56] lifeless: tests passing with 2a as default ? [08:56] yes [08:56] YES ! [08:57] :) [08:57] ;) [08:57] just in time too [08:57] spamming the review queue++ [08:59] lifeless: since you seem to be in the right mood, care to fix the loom failures too ? :-} [08:59] heh [08:59] 6pm [08:59] I started at 6:30 this morning. [08:59] But you could put up a patch for loom ! [08:59] hehe, I tried :) [09:00] [please do] [09:00] * lifeless halts [09:04] lifeless: sweet! [09:04] lifeless: I churned through a bunch of your review proposals, btw :) [09:04] vila: seriously - if you wanted to identify any remaining tests (i've been running a reduced set from what failed the first time I tried) that would be great [09:04] vila: and secondly, loom is something we support, feel free to put time into keeping it working :) [09:05] spiv: i saw - thanks [09:05] spiv: I'm not going to shepard them today. [09:05] I'll probably make pqm-submit a bit friendlier tomorrow and batch-submit them from lp directly. [09:07] lifeless: (regarding loom), my last submission stalled, mostly because I had misconceptions about looms (when pushed mainly), I should look at it again... [09:10] vila: bzr branch lp:bzr-loom; fix the failing tests; push and submit ;) [09:10] the big question for me is 'should -b make a new branch or thread, in a loom' and I think the answer is 'thread'. [09:12] lifeless: hehe, I know, that was bug #309730 I was referring to, marked for expiration tomorrow :-/ [09:12] Launchpad bug 309730 in bzr-loom "loom semantics around about push/stacking/clone unclear or buggy ?" [Undecided,Incomplete] https://launchpad.net/bugs/309730 [09:12] oh [09:12] well, push in a loom to a new location is meant to make a loom [09:12] otherwise it pushes to whatevers there - loom or branch [09:13] yup, I thought it should always push to a branch (misconception) [09:14] * igc dinner [10:28] bialix: thanks [10:33] thumper: I think there is bug report in bzr about using paramiko as default SSH client [10:33] plink (PuTTY SSH tool) has too much caveats [10:33] and that guy using plink [10:34] ah [10:34] what is the default setup with bzr on windows? [10:34] I have some people locally that want me to give them a tutorial on bzr [10:34] but they all use windows [10:34] they are interested in using LP though [10:34] so they need SSH keys [10:35] are there docs on the wiki about the easiest way to set this up? [10:35] I don't have a windows machine myself any more [10:38] thumper: I guess you need to ask for this in Bzr-Windows mailing list [10:39] I don't think there is good wiki about setup ssh for windows [10:41] I'm working with lp and sftp and ssh since 2006 and during this years I've minted the gold rule: always use paramiko [10:41] thumper: btw, launchpad wiki resource about setting up ssh keys is very good [10:42] the problem not in lp itself or ssh keys [10:42] ok... [10:42] problem in initial connection when user should say: yes, I'm trust this ssh server [10:43] paramiko do it implicitly [10:43] plink just fails [10:43] hah [10:43] how does one add a trusted server for plink then? [10:43] manually [10:43] bzr can;t help here [10:43] ick [10:44] one need run plink to connect the server [10:44] first time [10:46] thumper: http://pastebin.com/m2d48ac6e [10:47] maybe launchpad plugin for bzr can help here? with some sort of special command. I dunno [10:47] hmm, not right now for sure :) [10:48] yep, I mean somebody need to write this special command [10:48] but I'm just suggest people to avoid using plink [10:48] paramiko using the same ssh keys from pageant [10:49] and I don't find any significant difference in speed between both [10:49] and paramiko bundled into bzr.exe by default [10:49] so paramiko -- it's almost the right way [10:51] and perhaps one can file a bug against lp:paramiko and asking for y/n when unknown ssh server signature encountered [11:06] hi there, I'm moving my first steps with bzr.. seems pretty cool so far.. I've been able to create a centralized development infrastructure .. [11:07] now I'm not sure how the workflow for creating different versions of my software will be.. [11:07] should I have to tag the trunk? or creating subdirectories? .. I'm confused [11:17] thumper: btw, for casual launchpad code users password auth would probably be more convenient... I wonder if we should enable that in code hosting's ssh server? [11:17] spiv: I'm not sure I could sell that [11:17] Yeah. And I kinda like that we're currently only asking users to type their password directly into the website, so maybe it's not worth it. [11:18] spiv: keep thinking though :) [11:18] But it would probably ease the pain for SSH newbies. [11:18] I'm sure there's something for our windows users [11:18] perhaps we should do something with the launchpad plugin like bialix suggests [11:19] Make the bzr installer automatically add launchpad's fingerprint to plink's registry of known hosts? [11:21] The difficulty is partly that windows doesn't have a de facto standard SSH install like /usr/bin/ssh that we can rely on, and partly that the one of the common options (plink) is pretty crummy. [11:22] So insulating ourselves from that via bundling paramiko is perhaps the best we can do? Dunno. [11:27] spiv: just for note: in the past (~2006-2007) plink was disabled for long time, at all [11:27] because the same problem with initial y/n [11:31] thumper, spiv: Bug #296110 [11:31] Launchpad bug 296110 in bzr "bzr should install launchpad ssh host keys" [Low,Confirmed] https://launchpad.net/bugs/296110 === Noldorin_ is now known as Noldorin [12:13] luks: hi [12:22] hi bialix [12:32] hello is there a list of project hosting sites with bazaar support? [12:34] luks: today I've stumbled with problem in qconflicts [12:35] luks: mark_item_as_resolved try to convert file_id to filename. do you remember why in needed? [12:36] bialix: not really, sorry [12:36] heh [12:37] currently I'm just using filename we shows in the widget [12:37] I'll dogfood it more, maybe can found use case for this [12:53] bialix: Are you sure you didn't mean bug #237297 instead of #296110 ? [12:53] Launchpad bug 237297 in bzr "Putty refuses to connect to unknown host with "The server's host key is not cached in the registry"" [Medium,Won't fix] https://launchpad.net/bugs/237297 [12:54] * vila trying to better understand for the next time the question is raised [13:15] vila: no === mrevell is now known as mrevell-lunch [13:15] they are different ways to solve th eproblem [13:16] 296100 is about lp [13:16] spiv and thumper talking about ssh server fingerprint, and this bug about certificates [13:20] bialix: ??? [13:20] [14:53] bialix: Are you sure you didn't mean bug #237297 instead of #296110 ? [13:20] Launchpad bug 237297 in bzr "Putty refuses to connect to unknown host with "The server's host key is not cached in the registry"" [Medium,Won't fix] https://launchpad.net/bugs/237297 [13:20] both #237297 and #296110 are about host keys [13:20] yep [13:21] vila, I teach you right answer for this problem on WIndows: set BZR_SSH=paramiko [13:21] bialix: ok, good :) [13:22] https://bugs.launchpad.net/bzr/+bug/414743 [13:22] Ubuntu bug 414743 in bzr "paramiko should be default client for Windows" [Undecided,New] [13:22] hmmm [13:22] and which ssh agent ? [13:22] why ubottu said it's a "Ubuntu bug"? [13:22] if paramiko then pageant [13:23] ok [13:23] bzrlib.tests.blackbox.test_serve.TestBzrServeSSH.test_bzr_connect_to_bzr_ssh is leaking threads among 1 leaking tests. [13:23] should I worry? [13:23] vila: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair [13:23] denys: no [13:23] vila: this guide is OK, but it miss the problem with plink/paramiko [13:24] bialix: may be mention that in bug #414743 ? [13:24] Launchpad bug 414743 in bzr "paramiko should be default client for Windows" [Undecided,New] https://launchpad.net/bugs/414743 [13:25] it's really hard [13:25] bbiab [13:30] vila: it seems either nobody care too much about plink or don't want to prohibit it. [13:30] vila: and there is only jam who can do something about windows [13:30] cila: and jam too busy with other things [13:31] it's a stalemate I'd say [13:31] These are good reasons to collect the information in the bug reports [13:32] which sort of information [13:33] vila: this guide is OK, but it miss the problem with plink/paramiko [13:33] the sooner people get good directions... the less problems they will encounter down the road... [13:35] vila: IIUC there is possible that people could use not plink but openssh port for win32 that may not affected by plink problem [13:35] I'm afraid there is no "right" answer === mrevell-lunch is now known as mrevell [13:36] perhaps just prohibit plink from auto-detection will be enough [13:36] somebody should say: "yes, this is the right way" [13:36] as of today nobody dare enough [13:36] Does anyone have experience with bzr server? [13:37] bialix: JFDI :) [13:37] JFDI? [13:37] * bialix never was good in acronyms [13:37] Jeff Fondles Dweebs, Init? [13:38] I don't know, google it [13:38] jump for dumb iphone? [13:39] oh, just focus and do it [13:39] Just Do it :) [13:39] Colonel-Rosa: very polite way 'focus', thanks ;) [13:40] oooh, quoting fullermd: where I can download extra 8 hours to do everythong I want? [13:45] Colonel-Rosa: you can ask about bzr server [13:46] the answer will depends on question [13:46] I was going to ask, if I set one up, do I need to specfiy users if I allow writing? [13:47] plain bzr serve has no support for ACL [13:47] so you need to use bzr+ssh [13:48] Why does it allow writes then? [13:48] and specify users via ssh stuff [13:48] good question [13:48] night all [13:48] igc: night [13:49] Colonel-Rosa: maybe because when you run bzr+ssh it invokes bzr serve via ssh in write-enabled mode? [13:50] Colonel-Rosa: in some situations (e.g. a small, isolated network with only trusted users) a simple unauthenticated write-enabled server is all you need. [13:50] I'm using it in such conditions at work [13:50] small network [13:51] bialix: before I forget, that bug where qbzr and bzr-pipeline are incompatible needs fixing in qbzr 0.14.*. Can you chat to garyvdm about it? If we have to, I'd like to drop support for us override the merge command - I don't think the feature we're offering is important enough to break compatibility with other plugins overriding merge. You guys may feel otherwise though [13:51] Ok, I might go with that route. I'll restrict the port to my port [13:51] to my ip* rather [13:52] Or you could run "bzr serve" on a localhost only port, and then and use another tool to provide simple authentication based on SSL client certs on a public port. [13:52] I had a look at setting up a chroot jail for users, but didn't really get it [13:52] Hi, is there any way to make bzr remember the password I use for my googlecode SVN? (HTTPS checkout). Currently it asks me every time. [13:52] igc: Id like to remove merge --qpreview [13:53] igc: but garyvdm has another opinion. but I can remove it just for 0.14 and later fix it in trunk [13:54] igc: good point though. if you can write some comment tomorrow in that bug report [14:00] spiv: regarding ssl client certs, did you review denys merge proposal about bzrs:, you nay have to chase the right one a bit as he made several resubmit [14:15] bialix: good mail on bzr-windows :) [14:15] why? [14:16] I hope it will start discussion [14:24] bialix: exactly ! [14:25] vila: I did, yes. [14:25] spiv: great [14:25] spiv: I should check that to stay in touch then :) === ja1 is now known as jam === kiko-afk is now known as kiko [15:34] james_w: good morning, do you have some time to look at bug 405251 again? Our new repo's are killing themselves in the same way... [15:34] Launchpad bug 405251 in bzr "Huge data transfers/bad performance OVERALL" [Undecided,Incomplete] https://launchpad.net/bugs/405251 [15:34] I don't know why Kopete always replaces jam with James_W: I mean jam... === deryck_ is now known as deryck [16:03] fjalvingh: I can probably look at it some today, I need to check for any other pressing matters, though [16:03] morning vila [16:04] jam: hello [16:04] hi bialix [16:04] jam: did you saw my message about installing Pyreadline on kerguelen? [16:05] hi everyone! [16:05] i'm in big trouble! :( [16:05] i think maybe i lost 2 weeks of work [16:05] bzr heads --dead [16:06] bialix > yes! [16:06] bialix > i see my last (true) revision in the list [16:06] bzr pull -r revid:your-revisioin-id --overwrite . [16:07] trying... [16:07] or branch with this revid [16:07] james_w: thanks, I will wait. [16:07] james_w: thankx [16:07] Thanks, jam... Very irritating. [16:08] I will check why Kopete always replaces jam. [16:08] omfg bialix! :) [16:08] fjalvingh: you might be typing jam which wouldn't autocomplete the exact name, I guess [16:08] I'm just typing jam: [16:08] Enisseo: what? I'm in telepatic mode? [16:08] I'll check the settings. [16:08] bialix, Enisseo: or 'bzr merge . -r revid:' [16:09] * bialix : telepatic mode off [16:09] bialix: kind of ;) [16:09] i did not know this command but i was pretty sure bzr could not lose my files [16:09] but "bzr log" made me nervous :P [16:10] maybe i'll explain how i did to lose my files [16:10] 1. commit changes locally [16:10] 2. commit to the repo [16:10] 3. uncommit the repo [16:10] 4. do a lot of changes to the --locla [16:11] 5. update from the repo [16:12] 6. panicking while reading the list of actions done by the update command [16:12] 7. revert to the last:1 rev [16:12] 8. panicking even more [16:13] Enisseo: so update changes your local work into the upstream work and 'merges' the local stuff in [16:13] when you reverted you through away your local work [16:13] 'bzr heads --dead' shows you the local work again [16:13] and you can merge that back into your upstream [16:13] jam > okay [16:15] bialix > thanks, really :) and to the bzr team for anticipating my mistakes (and for building a *real* VCS, unlike that sh** of VSS i have to use at my office :P) [16:15] Enisseo: np [16:16] bye! [16:17] jam: I've got very strange error: ObjectNotLocked: _KnitGraphIndex(CombinedGraphIndex(GraphIndex('bzr://host/repo/.bzr/repository/indices/1be11e45e6965720333219afc18eac5b.rix'))) is not locked [16:17] bialix: happens when you use "-r XXX" + log + bzr+ssh [16:17] I assume we aren't locking the branch before evaluating -r [16:17] jam: no, I'm using merge [16:17] and plain bzr:// [16:18] bialix: you are using a remote access, and -r, right? [16:18] jam: I did not found such bug, and pehaps just filed duplicate [16:18] bzr+ssh == bzr for pretty much all purposes [16:18] yes [16:18] Bug #414869 [16:18] Launchpad bug 414869 in bzr "backout merge from default location (bzr server) fails with ObjectNotLockedError" [Undecided,New] https://launchpad.net/bugs/414869 [16:18] there is one for log [16:18] presumably log and merge both aren't locking the branch [16:18] which works ok locally for some reason [16:19] error message misleading then [16:19] it tells about locking index file. not the repo itself [16:21] it is a bug, people shouldn't get that sort of error [16:21] morning jam ! [16:21] The error could probably be clearer, not sure if it is worth tracking it all down [16:21] hi vila [16:22] Hi, who should I contact to get a review of the patch done to fix 'Bug #347729: git-bzr doesn't work' [16:22] Launchpad bug 347729 in bzr-fastimport "git-bzr doesn't work" [Undecided,New] https://launchpad.net/bugs/347729 [16:22] goneri: jelmer is the maintainer of bzr-git, last I checked [16:23] git-bzr, not bzr-git :-) [16:23] if this bug about fastimport you need Ian Clatworthy, igc [16:23] he's sleeping right now [16:23] james_w: I know but It's broken by bzr-fastimport [16:23] AU timezone [16:24] bialix: ok good to know. thanks [16:30] jam: you haven't submitted 1.19-kg-merge-sort yet right ? [16:32] vila: afaik it is 1.19-known-graph-sorted and no, it hasn't been submitted yet [16:32] jam: yeah, typed it from memory, I knew you recognize it :-) [16:33] It seems to come along nicely... [16:36] vila: I'm at ~3x faster for merge_sort [16:36] it doesn't change the algorithm at all, though [16:37] I at least feel that I have a better understanding of the algorithm now [16:38] Well, I wanted to work on it too, but you fired first :-D I'm ready to review though [16:38] vila: well, review this one first, then :) [16:38] https://code.edge.launchpad.net/~jameinel/bzr/2.0b1-merge-sort/+merge/10253 [16:40] vila: so the current open questions for me are [16:40] 1) Am I exposing it in a reasonable manner (VF.get_known_graph_ancestry()) [16:40] 2) Should merge_sort handle ghosts internally or not [16:41] (i think it should, since it removes a lot of the _strip_NULL_parents calls) [16:41] 2) yes [16:41] 3) Should bzrlib.tsort.merge_sort be a thunk over to KnownGraph(parent_map).merge_sort() [16:41] 1) sounds ok to me (that was your last commit right ?) [16:41] 4) Should KnownGraph.__init__() check for graph cycles [16:41] vila: 1) last-ish [16:41] (rather than merge_sort and topo_sort doing it now) [16:42] 3) for backward compatibility, but my feeling is that we should deprecate bzrlib.tsort [16:42] for (3) it would basically mean moving the current tsort implementations into KnownGraph.py and then changing the tsort.py functions to import graph, etc. [16:43] 5) KnownGraph.topo_sort() == 10ms, KnownGraph.merge_sort() == 50-60ms, can I get that down any further? [16:43] exarkun: hi [16:43] glyph: Hi [16:43] I am having trouble getting revisions that glyph is committing. [16:43] (like not allocating extra info per record, but instead hanging it off of the original KnownGraphNode object.) [16:44] 4) hmm, if they can appear, there should be a cheap way to check, so yes [16:44] exarkun: so, the revisions are there. the file in question does exist in my homedir on charm. [16:44] vila: right now, if gdfo = None after processing, we know we have a cycle [16:44] it just means another pass across the data [16:44] or something along those lines [16:44] (why did this have to happen only with the *one* highly proprietary and sensitive bzr repository I've worked with this year rather than one of the dozens of totally harmless open source ones) [16:44] glyph: How did the revisions get there? Did you 'bzr push ...' to charm? [16:45] exarkun: yes. [16:45] from illidan, as it happens [16:45] are you pulling from alastor? [16:45] jam: hmm, I'm surprised there is not a simpler way... but that can come later if really needed (i.e. start with the check in one pass, and we found a better place, we'll get rid of the pass) [16:45] wait no [16:45] crap, this is my fault [16:45] Oh too many hosts [16:45] for some reason 'charm' is an ssh alias for alastor on this machine [16:45] vila: well, we can check as we pass over the data already [16:45] glyph: Wow awesome [16:45] the current code pops things out of a dictionary [16:46] and notices when what it wants to pop isn't there [16:46] but [16:46] 1) doesn't handle ghosts [16:46] 2) takes time to build that dict, and pop everything out of it [16:46] okay got it [16:46] I'm down to around 4microseconds per node [16:46] which sounds great [16:46] sorry everybody, bzr's great, no bugs [16:46] but still means it is 1.0s to merge_sort the OOo graph [16:47] though at 10s to load it, I'm probably in the right ballpark [16:47] jam: my feeling is that a two passes algo should be possible, [16:47] if loading still dominate, don't bother optimize the algo :-D [16:48] jam: two passes, not counting building the graph ! [16:48] vila: 2 passes for merge_sort? [16:48] it is 1 two depth-first traverse [16:49] 1 to pop that back out and number [16:49] 1 to reverse it for display [16:49] (as it stands now) [16:49] (1 *to* depth-first trav) [16:49] oh, and convert _MergeSortNodes into merge_sort tuples [16:51] jam: ok, I haven't look at how it works in detail right now, if it's already 2 passes, then good. I'm not sure the reversing counts as a pass though, if it is, it may be worth avoiding it [16:53] vila: it costs 10-15 ms out of 55 ms of processing [16:53] though there is some more actual processing going on there [16:53] which I'm trying to factor out [16:53] well, move to a different place at least [16:55] jam: by the way, about revno 4627, don't worry too much about the layering yet, my feeling is that at one point we'll have a node_index and from there we'll be able to have dedicated arrays for specific processing === beuno is now known as beuno-lunch [17:44] Hey I am having a problem adding a directory. It doesn't look to be ignored so I don't see why it won't add... http://stikked.com/view/88043329 - my bash session [17:48] ah so interesting the files/ dir was ignored in .bzrignore in a previous revision http://stikked.com/view/60255181 [17:48] since then I have removed that rule but it is as if that has cached somewhere [17:49] abyone seen something like this before? [17:51] well, if you want to know more information use bzr add -v [17:51] but if you just want to add the directory, add it manually [17:54] luks - http://stikked.com/view/20119491 so I added it and it doesn't give me any errors but still shows as unknown with a status [17:56] what does "bzr add -v" say? [17:56] but I don't know what could be the issue [17:57] ignored config/site.php matching "config/site.php" [17:57] which is fine as that corresponds with my .bzrignore rule [17:58] this is truly weird. Not seen anything like this before [18:03] my guess would be that there is something wrong with the checkout, so I'd make a new checkout to see if it works there [18:12] doh the files/ dir was a different checkout! === beuno-lunch is now known as beuno === mrevell is now known as mrevell-dinner [20:26] moinmoin [20:29] Good morning lifeless:) [20:53] 4 new failures since I last ran full test run [20:55] wooo [20:55] go 2.0, go! [20:56] lifeless: merge trunk and use --parallel=fork again :-) [21:05] re [21:08] What's the command I should run to update my repository (which I created around 1.08 or somesuch)? [21:09] awmcclain: bzr upgrade -- [21:09] awmcclain: e.g., bzr upgrade --1.9 [21:09] awmcclain: is bzr telling you to ? [21:10] lifeless: No, it's not, but it's been quite slow branching and doing everything. [21:11] awmcclain: we have a bug open at the moment about an apparent performance regression [21:11] I suggest you file one yourself [21:11] lifeless: Oh... this isn't a regression. This is more like I haven't seen any speed increases since I've started using bzr. [21:12] ah [21:12] What's the newest repository format? [21:12] --19? [21:12] what does bzr info -v report for the repository you have? [21:12] 1.9 [21:12] Format: [21:12] control: Meta directory format 1 [21:12] repository: Packs containing knits with rich root support [21:16] so....should I upgrade? [21:17] awmcclain, upgrade --2a should give you give significant performance improvments [21:17] what bzr version do you have? [21:17] awmcclain: ^ [21:17] 1.18a [21:17] 1.18rc1, sorry [21:17] awmcclain: yes, switching to --2a would be sensible. There are docs on doing this on the web [21:17] awmcclain: please do follow the upgrade guide ;) [21:17] lifeless: Great! Will do. [21:43] Hrm... my bzr status is borked. (Haven't run the upgrade yet). here's the traceback: http://dpaste.com/81857/ [21:44] try --no-plugins [21:44] a ha... [21:45] weird traceback though [21:46] awmcclain: if that works, try upgrading your plugins, or something [21:47] lifeless: It was the xmloutput plugin, which was nearly 18 months old [21:47] I don't even need it anymore [21:47] Thank you! [22:01] hi lifeless [22:01] hi Noldorin [22:01] thought i might try to prgoress a bit more with my FTP issue now [22:01] while i have some time [22:01] cool [22:02] i got your last message...but wasn't quite clear on a few things [22:02] spiv: :( you broke my testsuite [22:02] there is a function in that file that the lock object uses to check that its in the right place on disk and has the right nonce [22:03] i'll be glad to test that now, if you could just clarify things slightly [22:03] One thing I'm not sure of after reading http://people.canonical.com/~ianc/doc/en/upgrade-guide/#data-migration, I have a local shared repository containing a bound "trunk" branch to a remote server (which also has a shared repo) as well as my local branches. Do I need to update the repo on the remote server before I update my local repo? [22:04] Noldorin: self.confirm() [22:04] put that after the self.transport.rename() [22:04] right [22:04] in normal operation that will raise [22:04] with your symptoms it may not raised [22:04] i see [22:05] awmcclain: no, you can upgrade them independently [22:05] the server will need bzr 1.16 (1.18 preferred) though [22:05] Noldorin: so you probably need a try:except:else: around the confirm [22:05] with the else clause being the 'ftp breakage is occuring code path' [22:06] hrmm...we're not still talking about __init__.py here? [22:06] never were [22:06] lockdir.py [22:06] oh sorry [22:06] i missed that bit [22:07] we were messing with __init__.py at first [22:07] a while ago [22:08] lifeless: in the _attempt_lock function i presume? [22:09] Noldorin: unlock() [22:09] Noldorin: locking works fine, its unlocking that is failing [22:09] lock appears to fail because the unlock isn't working [22:09] ok, got it [22:14] lifeless: http://pastebin.ca/1533028 [22:14] does that look right to you? [22:15] hi glyph, are you about? [22:15] lesshaste: what's up? [22:15] glyph, something boring I am afraid..it's about python [22:15] I understand you are the founder.. can I pm you? [22:15] I mean #python [22:17] Noldorin: you have some tabs [22:17] just use spaces (python limitation) [22:17] the except needs to be [22:17] except LockBroken: [22:17] pass [22:17] else: [22:17] print "ftp breakage" [22:17] ok [22:17] got it [22:18] thanks. i can read python, but no more really :) === JaredWigmore is now known as JaredW [22:22] lifeless: http://pastebin.ca/1533033 [22:22] ftp breakage indeed [22:23] right, we're detecting it [22:23] I'd add that patch to the bug [22:23] :) [22:23] its also now at the point you might be able to show your FTP server admins [22:23] we can continue hunting for a work around [22:23] perhaps a while loop [22:23] ok sure [22:24] hmm, so what exactly is the FTP server doing wrong? [22:24] its not renaming the directory. [22:24] but its not erroring either [22:25] (this is IIS6 btw, so i'm not sure how much they could do, short of changing the server software) [22:25] hmm [22:25] due to the fact the OS is locking it, you think? [22:25] something :P [22:26] heh [22:26] shall we test this manually perhaps? [22:26] (is there any way to do so?) [22:26] with an ftp client perhaps [22:26] yep, i have filezilla or windows explorer at hand [22:26] doing the same operations by hand [22:29] lifeless: so just renaming the /branch/lock/held dir to something arbitrary? [22:30] yes, with a file in that dir called info, and with the sort of text we put in our info files [22:31] ok [22:32] Status: Renaming '/httpdocs/repos/texdotnet/.bzr/repository/lock/held' to '/httpdocs/repos/texdotnet/.bzr/repository/lock/held-temp' [22:32] Command: RNFR held [22:32] Response: 350 File exists, ready for destination name [22:32] Command: RNTO held-temp [22:32] Response: 250 RNTO command successful [22:32] lifeless: no problems there :S [22:33] Noldorin: you don't know that [22:33] does held still exit [22:33] *exist* [22:33] I suspect you need the whole set of operations to trigger it [22:33] hrmm i see [22:34] if simply renaming was broken all the time, it would never be able to work [22:34] but if i'll really need to tell my ftp server admin the entier set of steps... [22:34] if they're to reproduce it [22:34] 'bzr init' :) [22:34] with your build [22:34] lifeless: i tested this on the repo i just pushed btw [22:34] lol [22:34] if you run with -Dtransport [22:34] then you can see the FTP commands [22:34] i'm not sure i'm paying them enough for that :) [22:34] ok [22:34] and make a script to match [22:34] we could also automate that using bzrlib [22:35] ok, sounds like a plan [22:37] lifeless: http://pastebin.ca/1533056 [22:39] lifeless: anything interesting in there? [22:40] Noldorin: if thats the commands bzr is doing, not for me [22:40] we know whats going on - bzr is doing a rename, server is saying it has but not doing it [22:40] yeah [22:40] there are two main things to do: [22:40] - get the server environment fixed, now that we have bzr able to report on it being broken [22:41] - get an optional flag to make bzr retry the rename some number of times, which you can use to workaround the problem [22:42] right, so if i wrap the rename command in a loop with a 1 second delay, then test that...? [22:42] for instance, yes [22:45] lifeless: say i loop 10 times, and exit the loop when self.confirm succeeds, will that be the right thing to try? [22:45] sure [22:46] for pos in range(10): [22:46] rename [22:46] try: [22:46] self.confirm [22:46] except LockBroken: [22:46] break [22:46] else: [22:46] print "ftp breakage" [22:46] heh, cheers :) [22:46] hmm, indent the print more [22:46] yep, noticed [22:48] ho hum [22:48] * Noldorin crosses fingers.. [22:51] hrmm [22:51] ftp breakage [22:51] bzr: ERROR: Parent directory of ftp://alexreg-repos@213.175.198.12/texdotnet doe [22:51] s not exist. [22:51] lifeless: strangeness.. [22:51] heh [22:52] lifeless: do you know if poolie is back around? [22:52] now i'm baffled... [22:54] jam: I don't, sorry. [22:54] jam: hugh got in last night, so if poolie left on the same day he should be around today [22:55] lifeless: http://pastebin.ca/1533085 - sorry for more code review, but can you spot any issue there? [22:56] or perhaps explain the error otherwise? [22:56] that looks accurate [22:57] I have to assueme that other error is either a) unrelated or b) part of the same server environment issue ;) [22:57] yeah, that was my conclusion [22:57] (well, there really isn't any other) [22:57] lifeless: k. poolie and I usually have a weekly call ~ now, and I was just wondering if he was going to show up this week [22:58] lifeless: brb 20 mins. let me know if the reason strikes you :) [22:59] jam: You can ring me if you need to talk to someone ;) [22:59] lifeless: thanks. [22:59] No specific need [22:59] just trying to keep in a weekly habit [23:00] I have 2a default w/no test failures [23:00] \o/ [23:00] lifeless: otherwise, i'm just going to have to send my build over to my web host admin and hope they bother checking into it :P [23:00] Noldorin: try pushing again [23:00] does this new error repeat? [23:00] yes [23:01] if so, pastebin a -Dtranspot trace of it [23:03] lifeless: http://pastebin.ca/1533089 [23:04] interesting. it seems like the unlock is succeeding now (?) [23:05] brb [23:07] looks like [23:07] rename [23:07] check [23:07] rename again [23:08] then a traceback [23:09] can you run with BZR_PDB=1 [23:11] lifeless: I'm probably going offline now. If you see poolie he can call my house or cell [23:15] jam: ok. gnight [23:19] ImportError: cannot import name weave [23:19] ?!? [23:20] nm [23:21] it was probably my update updating bzr while I was pulling :) [23:22] thumper: yes [23:22] is there a bzrtools that works with bzr.dev? [23:31] back [23:32] lifeless: no luck still [23:34] :S [23:36] try http://pastebin.ca/1533125 [23:38] will do [23:43] morning [23:49] bzr: ERROR: At ftp://alexreg-repos@213.175.198.12/texdotnet you have a valid .bz [23:49] r control directory, but not a branch or repository. This is an unsupported conf [23:49] iguration. Please move the target directory out of the way and try again. [23:49] lifeless: isn't that lovely? [23:49] Noldorin: did you delete the texdotnet dir first? [23:49] and check it was actually gone ? [23:49] yeah [23:50] ! [23:50] hrmm [23:50] works now [23:50] well i say works but... [23:50] back to thsi again: [23:50] ftp breakage [23:51] bzr: ERROR: Parent directory of ftp://alexreg-repos@213.175.198.12/texdotnet doe [23:51] s not exist. [23:51] no "past unlock step" [23:52] ok, some exception is being raised [23:53] mm [23:54] http://pastebin.ca/1533138 [23:55] heh, i like this way of resolving bugs :) [23:57] it's tedious, though methodical at least [23:57] james_w: hi [23:57] ftp breakage [23:57] fail: No such file: '/texdotnet/.bzr/branch-lock/held': : unable to rename to ' [23:57] /texdotnet/.bzr/branch-lock/releasing.1db1o9w8i4g6wxax077u.tmp': 550 /texdotnet/ [23:57] .bzr/branch-lock/held: The system cannot find the file specified. [23:57] bzr: ERROR: Parent directory of ftp://alexreg-repos@213.175.198.12/texdotnet doe [23:57] s not exist. [23:57] Noldorin: fun! [23:57] so we rename [23:57] yep [23:57] but the rename hasn't taken effect (because we read back) [23:57] then, when we try to rename again, its been moved [23:57] hey lifeless [23:57] yep [23:57] james_w: the .so [23:57] makes sense [23:58] james_w: the .so's in the wrong place, what corrects that for the debs - or did you manually work around? [23:58] sorry, I think I'm lacking context [23:58] the bzr pyrex speedups? [23:59] lifeless: anything further to test? [23:59] james_w: yeah, on karmic setup.py puts them in bzrlib/bzrlib/*.so [23:59] there was a bug filed on the nightly debs === sdboyer_ is now known as sdboyer [23:59] I missed the bug [23:59] And I thought you closed that; we still have a bug in the core about it too (the deb bug being that the dailies should fail to build if the .so's are not there)