=== medberry is now known as med_away [00:32] hi poolie [00:32] Did you have a good easter weekend? [00:33] hi there [00:33] i did [00:33] how are you? === Tethy is now known as Teth [00:34] I'm well too, we had amazing weather over the weekend [00:34] we had pretty much continuous rain [00:34] i'm leaving just under a week from today [00:35] for uds etc [00:36] this was our hottest easter in recorded history, around 25 degrees [00:36] hopefully we'll have similar temperatures in Budapest :) [00:46] 25C is nice [00:46] prague was quite hot [00:53] jelmer did you have any opinion about python 2.4/5/6 [00:55] poolie: not really [00:55] poolie: I personally would like to move to 2.5, but I only have Debian Unstable and Natty machines... [00:57] poolie: the input from various people running or packaging for older versions of RHEL or backporting to older versions of Ubuntu is probably most interesting [00:58] Where older versions of Ubuntu == just hardy, I think [00:58] it seems like the main issue is now py2exe [00:58] (assuming intrepid and jaunty are disregarded for being both EOL) [00:58] hardy has python2.5 [00:59] Oh, yes. Sorry, I was still thinking about 2.6 [01:00] np [01:00] Morning folks. [01:00] it's just a small additional thing in favor of 2.5 [01:00] hi spiv [01:00] py2exe was a reason that 2.6 was bad but 2.5 was OK? [01:04] right [01:10] how was your weekend spiv? [01:10] hi spiv [01:15] poolie: long :) [01:27] it was wasn't it? [01:29] ah, poolie. [01:30] oh, I should put up my alternative to jam's compat breaking branch if that's on the table for today [01:54] mgz: so you have a thing that fixes the same bug but without using try/yield/finally? [01:54] yup. [01:54] sec, nearly done, will post. [01:55] hm, i know we can fix them one by one [01:55] it defers the decision for a bit at least :) [01:56] otoh it is O(n) to keep reconsidering it every few months [01:56] jam's made some reasonable arguments, and august is still quite a few months of coding away, so I'm not sure I can really justify keeping the old version alive [01:57] but there was someone on rhel in here the other day looking for support who managed to mangle a (working) 2.4 trunk bzr by trying python 2.6 [01:57] where the easy fix was just cleaning up and using 2.4 again (a plugin was broken) [01:57] what do you mean? [01:58] hm, I'd need to look at the log, but he was trying to install bzr.dev and didn't have pyrex on 2.6 and got some .so files from the wrong version. [01:59] ok i see [01:59] so he had a kind of half-installed python2.6,because that wasn't included in the original rhel release? [01:59] this does happen from time to time [01:59] especially on mac os it seems [01:59] http://irclogs.ubuntu.com/2011/04/25/%23bzr.html#t00:45 [02:00] i'm not sure that it's all that correlated with what we require [02:01] I agree most people probably aren't trying to combine bleeding edge bzr with ancient python. [02:02] like if we require 2.4, people still sometimes trip up because they have a half-installed python2.5 [02:04] sure, but in his case using the system python got it working again. [02:04] next week, bzr.dev will not work with his system python. [02:06] maybe we should ask emacs-devel [02:07] poolie: btw I have bzr-search test suite failing with the maverick build [02:07] poolie: I commented on the bug for you [02:08] lifeless: good work on py3ing subunit the other night [02:08] I filed a bug on the remaining failures I got, as they're a problem in trunk too [02:08] cool, thanks [02:08] i saw the mail, i haven't looked into it yet [02:09] mostly shallow, but I have two problems [02:09] mgz: you live in a yellow submarine? [02:09] #1 how do you want skips done? currently you're using unittest.TestCase which... I think I need to switch to testtools.TestCase for the skip method? [02:09] ^that would hardly be a problem [02:10] sure, using testtools.testcase would be fine [02:10] well, coming up for air regularly might get old. [02:10] should I switch the whole file? or have a mix-and-match? [02:11] problem #2 ExecTestCase [02:11] mgz: whatever you like is fine with me [02:11] the very concept is... problematic [02:11] having bitten the bullet and depending on testtools, I've no intrinsic limits onuse [02:12] well, exectestcase is clearly not for windows users :) [02:12] erm [02:12] actually [02:12] isolatedtestsuite isn't [02:12] exectestcase is [02:12] currently, the tests exec some python scripts (with the system python, not the one running subunit), and then fake-print some subunit looking output [02:12] ^yeah, exec could work, apart from the design is... I don't like it [02:13] getting shell script blobs from docstrings isn't very portable [02:13] anyway, the test fails (and leaks the streams) because neither end sets the pipe to binary [02:14] heh [02:14] but just fixing that doesn't really make it any saner, and the paths are still wrong [02:14] uhm [02:14] so, I'd like to just fix it in the first instance [02:14] because you're doing path_join|(script_dir, shell_script_blob) [02:15] which happens to work for (".", "some_script.py -some_arg") -> "./some_script.py -some_arg" [02:15] but doesn't for arbitrary paths or commands. [02:16] so, you'd get failures depending on where your test suite was in your directory tree [02:17] (most specifically, if you had any shell-significant characters like spaces) [02:29] lifeless: Thanks. [02:43] mgz: external scripts should be usint libsubunit or some other language binding [02:43] I agree. [02:43] which sould set binary === med_away is now known as medberry [02:45] making the sample scripts do that is hard though. [02:45] yeah [02:46] okay, it's way too late, I need to get a train tomorrow. [02:46] night all! [02:46] ciao [02:47] night mgz, hae a good break === Ursinha is now known as Ursinha-afk [07:36] yay, Gitorious lets me set up an account logging in via my existing OpenID! [07:36] that means I can have full-featured hosted Mercurial and Git repositories [07:37] the only one left is Launchpad [07:37] Ubuntu bug 210943 in Launchpad itself "be an openid consumer (relying party)" [Low,Triaged] [07:39] does anyone have comments on using Gitorious or Bitbucket as back-end repository for Bazaar? [07:43] bignose: Neither is possible. [07:43] bignose: Maybe bitbucket is, but I'm not nearly crazy enough to try it :) [07:56] bignose: interesting; do you then give them an ssh key for actual access, or is it all over openid? [08:01] We should just provide HTTP-over-SSH ;) [08:02] o/ spiv [08:02] I've got a friend who did some work on SSH-over-HTTP... [08:03] bitbucket least supports http push with passwords [08:07] hi jam [08:08] morning poolie [08:12] thanks for all the bug cleanups [08:12] jam if your queue is getting reasonably empty i wondered if you could give some relief to bug 602614 [08:12] Launchpad bug 602614 in Bazaar "Out of memory error in _ensure_content on auto repacking" [High,Confirmed] https://launchpad.net/bugs/602614 [08:12] maybe even just a config knob to delay repacking [08:14] poolie: sure. My queue is actually filling up because of backlog stuff with TreeReference while I switch over to the fetch-sends-tags stuff. [08:14] but I can put it on my 'stuff to get to' queue [08:22] jam i didn't really understand your last comment on gz's sftp traceback patch [08:22] > As for a focused 2.4 branch, that is ok, but really, I don't want to try [08:22] and "fix all hacks" before we break compatibility. I'd rather break it, [08:22] and then land things that cleanup the code as someone wants to do so. I [08:22] don't think we should require cleaning everything up first. [08:22] poolie: his comment was "we should land a separate branch that cleans up our hacks" [08:22] I'd rather land a compatibility break [08:22] and as we want to clean up code, do so [08:23] don't block on us cleaning up all the code first [08:23] oh, right [08:23] i agree with that [08:23] "clean up all the code" doesn't have a very clear end point [08:23] hi. [08:23] oh wow it's wednesday already [08:24] that was quick [08:24] I'm trying to determine whether I need to commit something. [08:24] poolie: indeed wednsday, depending on you timezone though. [08:25] I have found already I need to commit if wt.changes_from(wt.basis_tree()).has_changes() [08:25] and also if wt.get_parents_ids() array has > 1 items. [08:25] anything else I'm missing ? [08:26] sobersabre: you're reimplementing bzr's commit function? [08:29] sobersabre: why not just try the commit with allow_pointless=False, and catch the PointlessCommit error for when there's nothing to commit. [08:38] sobersabre: or worst case: "wt.has_changes()" ... [08:38] which implements all of that logic as well [08:38] Though that was introduced in "recent" versions. (2.2 maybe?) [08:44] i'm not completely sure that would catch a do-nothing merge [08:55] hi poolie, spiv, jam [08:55] morning jelmer [08:55] poolie: it checks the get_parent_ids() stuff, not sure what you're thinking [08:56] hi guys [09:00] hi jelmer, jam, spiv [09:00] shall we have a chat? [09:06] poolie: which VOIP systems would you like to use today ? :) [09:06] jelmer: mumble today [09:06] jelmer: are you in #canonical? [09:06] i would like to use sip but i guess we'll actually use mumble [09:28] and what's better? [09:28] jam: https://code.launchpad.net/~jelmer/bzr/move-interbranch-fetch2/+merge/58567 [09:30] * jelmer groans [09:30] jelmer: would you rather just IRC chat? [09:30] or direct skype? [09:31] jam: let's try skype [09:36] bialix: they all have tradeoffs i guess [09:36] hi, btw [09:38] hi poolie [09:39] poolie, don't take my words about python 2.5 and py2exe too high [09:39] it's so strange to see jam around at this half of the day [09:40] skype has chat mode [09:40] he lives in the Netherlands now [09:40] so it's 11am or so [09:40] really? [09:40] srsly [09:40] bialix: yeah, for about 2 years before I go back to the US [09:40] my wife got a promotion that needs some training [09:41] * bialix is very surprised, but that's great [09:41] * fullermd of course has no such sensible excuse for being around at this hour :p [09:48] fullermd: we know you never sleep, so you don't need any excuses [10:00] jelmer: what is up with your audio system? [10:00] Overall, I think skype was working better than mumble, though [10:16] night all [10:23] night po [10:23] poolie: g'night [10:23] jelmer: you just cut out again === Ursinha-afk is now known as Ursinha [12:18] jam: Do you think we need to deprecate update_revisions first? I'm not aware of anybody using it and I couldn't imagine everybody using it, it's a pretty odd interface compared to e.g. push or pull. [12:19] jelmer: you would be the most aware of any implementations using it [12:19] if bzr-svn, for example, uses it [12:19] then we should probably deprecate it [12:19] we'll move away from it, but we don't want to kill people with version ske [12:19] skew [12:19] the foreign plugins all provide update_revisions but none of them uses it [12:20] so I'd be more than happy to axe it, as it means being able to remove that update_revisions() implementation too [12:20] jelmer: so just watch out for skew, you can't axe it until it isn't actually being used. [12:20] But yes, I don't think anyone was directly calling it === mrevell is now known as mrevell-lunch === mrevell-lunch is now known as mrevlel === mrevlel is now known as mrevell [14:03] In Ubuntu 11.04, I'm doing "cd dir; bzr init; bzr add" and nothing is getting added, no errors or anything. How do I figure out what's going on? [14:04] mterry: what does "bzr st" say? [14:04] unknown: [14:04] ubuntu-application/ [14:04] ubuntu-cli/ [14:04] ubuntupygame/ [14:04] jelmer, ^ [14:13] mterry: is that correct, were those the directories you wanted to add? [14:14] jelmer, yes. But bzr add seems to ignore them [14:14] does "bzr add ." give different behaviour? [14:15] jelmer, no. Nor does specifying directories or files [14:16] jelmer, oh!! [14:16] mterry: that's really odd - are there any symlinks involved perhaps? [14:16] jelmer, the directories are also bzr repos [14:16] mterry: You found it ? :) [14:16] mterry: that would explain it [14:16] jelmer, I just realized [14:16] * mterry wishes at least bzr add -v would have said something [14:16] jelmer, thanks for the help! [14:19] mterry: I think the idea is that they would be added as nested trees, but the support for that is half finished [14:19] hmm, k [15:11] jam: This might be a noobish question, but is there any reason we couldn't do in-place updates of timestamps/shas in dirstate if there are no changes in the file list? [15:11] jelmer: the original design was so that we could (which is why we take OS locks, etc). we don't because, a it wasn't implemented, b, I'm not sure if things are truly fixed width [15:11] and c) we want to get rid of OS locks [15:12] jam: ah, thanks [15:13] jelmer: if we new it was going to be reasonably atomic, we probably could update in place, though that logic still needs to be worked out [15:13] well, as long as any failure mode would fail gracefully [15:13] rewriting pages has some bad habits when things crash [15:13] like random NULLs, etc. [15:14] I think our current thought is that we'd rather have a separate journal file [15:14] also, dirstate was written such that we could only read some of the file (it is bisectable, etc) [15:15] but we always read and write the whole thing right now [15:22] jam: isn't atomic write require write to some temp file and then mv over the old? [15:24] jam: ah, interesting - thanks === nixness is now known as foocraft [15:43] jam: if I want to improve auto-refresh in bzr-explorer to reflect new changes in working tree then I think I can add filesystem wathcer for dirstate file and maybe conflicts file, right? === deryck is now known as deryck[lunch] [16:09] jam: still there? [16:09] jam: I'm double checking the behaviour of text revisions. is it correct that we record a new text when: [16:10] * a file's executability changes [16:10] * a symlink's target changes [16:10] * during a merge one of the texts of the parents is taken verbatim (no sha1/executability changes) but the text of another parent is discarded [16:11] but not when a right hand side parent introduces a new text and that text is taken verbatim === deryck[lunch] is now known as deryck === beuno is now known as beuno-lunch [17:40] can someone tell me, in GNOME, when I go to pull new revisions of a project from launchpad and the little dialog pops up asking for my password to unlock my ssh key, what program provides that dialog? and caches the password for future pulls? [17:49] lallenlowe, gnome-keyring stores it [17:49] I believe... [17:49] mterry: yeah, that's what I thought [17:50] mterry: for some reason it is asking me for the passphrase on the cli [17:50] lallenlowe, hmm. You know, for bzr, it might be ssh-agent that's doing the asking [17:50] mterry: right [17:51] I've seen the magic GNOME thing come up when using ssh in a terminal. [17:51] Peng: I used to also [17:51] I don't know how it decides whether to prompt with GUI or not. I assume if DISPLAY is valid, but not sure now who actually owns the GUI dialog [17:52] ok === beuno-lunch is now known as beuno [18:26] jelmer: more complex than that, I think [18:27] it depends more on the ancestry [18:30] for example, one side could take an old revision, modify it, then revert it, then merge it, and we would create a new revision [18:30] even though both sides have the same final content === zyga is now known as zyga-afk-bbl [20:26] Dear bzr community: is it so much to ask that "bzr: ERROR: No push location known or specified." could in fact become "bzr: No push location known so pushing to branch" instead? [20:27] 99.999% of the time I am pushing I am pushing to my (bound) branch. In fact I don't think in a single checkout I've ever made, do the branch/parent/push/missing locations ever differ [20:30] how do i push only the last commit to a new branch, not the whole history? [20:30] push -r I believe [20:31] LeoNerd: thx [20:31] Ohwait... the -last-.. er.. you can't, as such [20:31] A commit applies a change to its parent. A commit implies the entire history that came before it [20:32] LeoNerd: how do i push it as if i am doing the initial import? [20:32] Hrm? [20:33] there is lp:foo as the main branch of a software and i want to create an own branch for fixing a bug. in my branch (lp:~levu/foo) i don't want to have lp:foo be cloned [20:34] i did bzr pull lp:foo and bzr push lp:~levu/foo for that, but that's cloning the whole lp:foo into my branch [20:35] levu: what is foo [20:35] I can look for you [20:35] *bzr branch lp:foo not bzr pull lp:foo [20:36] lifeless: https://bugs.launchpad.net/ubuntu/+source/conglomerate/+bug/771735 this is the case where i done it wrong, i assume [20:36] Ubuntu bug 771735 in conglomerate (Ubuntu) "xpath in properties dialog not selectable with mouse" [Undecided,New] [20:36] levu: so lp:conglomerate ? [20:36] the linked branch is mine and when you look at the history of the linked branch, you see the whole history of lp:ubuntu/conglomerate [20:36] ok, lp:ubuntu/conglomerate [20:37] and you are pushing to lp:~levu/ubuntu/natty/conglomerate/branchname ? [20:37] lifeless: no, to lp:~levu/conglomerate/771735 [20:37] https://code.launchpad.net/~levu/conglomerate/771735 [20:38] i did commit 12 im my branch and commits 1 to 11 are cloned from the official branch [20:38] levu: so, you're pushing *upstream* bbut you branched from *ubuntu* [20:38] levu: thats why this is happening. [20:39] lifeless: well, my point is, i want to create a new branch, where there's only one commit, not the whole history of commits [20:39] levu: right, try this: [20:39] bzr ush lp:~levu/ubuntu/natty/conglomerate/771735 [20:39] *push* [20:39] shold be a lot faster [20:40] lifeless: are the names important?! wow, that's interesting, i thought, i can choose the name as i want :D [20:40] ok, i'll try this, thanks :) [20:40] levu: the upstream name and the distro package name can differ [20:40] levu: so yes, they are important. [20:40] lifeless: ok, thanks :) [20:41] levu: you can choose the branchname - the last component - anyway you want [20:41] lifeless: aaah, ok [20:41] levu: the first component - your name - has to be your name or a team you are a member of [20:42] the components in between tell launchpad what project - 'foo' is upstream 'distro/series/sourcepackage' is a distro branch [20:42] where in the documentation i can find such interresting things? :D [20:43] bzr help lp [20:43] might have some stuff [20:44] here it says, ERROR: No help could be found for 'lp'. [20:45] bzr help launchpad [20:45] sorry ;) [20:46] lifeless: thanks a lot :) [20:46] it may not be helpful - please do file a bug if thats the case [20:46] there is a link to http://help.launchpad.net/ which should help === Ursinha is now known as Ursinha-afk