[00:11] is it possible to copy a file from one place in a branch to another and retain its history? not move, copy [00:32] Ng: not currently [00:32] james_w: ok, ta [00:32] Ng: history of a file means tracking a file id across versions [00:33] duplicate file id in a singled revision => ARRGHH! [00:33] * Ng nods [00:33] there are some suggestions for how to extend the model to allow splitting and joining file ids though [00:33] so maybe one day [01:50] Hm, bzr branch --no-tree would be useful. [01:51] Am I missing something obvious? [01:54] it would be useful [01:58] fbond, mwhudson: that's probably why it exists in bzr.dev... [02:00] spiv: hooray time machines [02:01] * spiv -> food [02:05] spiv: Ah, neat. [02:10] igc: ping [02:10] poolie: you're dreaming, but I want to write one [02:15] hi lifeless [02:17] igc: I have 356 seconds of internet left [02:20] lifeless: fyi, I went digging into what log -v was doing yesterday afternoon [02:20] the chk_map.iter_changes() code was loading some nodes twice - about 20% in my test [02:21] igc: 180sec left :P we may need a phone call or something. I'maround until 1345 sydney time [02:21] I put a simpe cache in to stop that but it made next to no difference in overall time [02:21] igc: ok [02:21] igc: I think a useful thing to do would be to calculate/report in a brute force way the actual common/left-only/right-only node for two trees [02:21] igc: we could use that to say 'we should be doing X work' [02:22] igc: and it would also be useful to jam in evaluating the flavours [02:22] I don't think he's got such a tool yet [I may be wrong]. repositorydetails would be a good place to put it [02:22] ok, I'll download repodetails and see what's it doing now [02:23] I'm still digesting chk_map's code fwiw [02:49] lifeless: do you still want your .../rob directory on orcadas? [02:49] i'm going to tar it up [02:49] that machine's almost out of disk === UdontKnow is now known as \0 [03:09] poolie: lifeless is offline for 2 hours - flying [03:09] * igc lunch === \0 is now known as UdontKnow [03:18] spiv: is http://bazaar-vcs.org/SmartPushAnalysis1.13 up to date? [03:23] thumper: no, the current numbers are a bit better [03:24] lifeless and I have been improving things too rapidly to make keeping the page up to date worthwhile :) [03:28] igc, thanks, np [03:43] jelmer: upgraded ‘bzr-loom’ on Debian squeeze [03:44] now I get: Unable to load plugin 'loom' from '/usr/lib/python2.5/site-packages/bzrlib/plugins' [03:44] the plugin is still there (a ‘/usr/lib/python2.5/site-packages/bzrlib/plugins/loom/’ directory with Python modules) [03:45] bignose: if you run bzr -Derror rocks you should get a better error message [03:47] $ bzr -Derror rocks [03:47] Unable to load plugin 'loom' from '/usr/lib/python2.5/site-packages/bzrlib/plugins' [03:47] It sure does! [03:48] bignose: what version of bzr? [03:49] $ bzr --version [03:49] Bazaar (bzr) 1.5 [03:50] all as per Debian ‘squeeze’ [03:55] oh, that's fairly old [03:55] ~/.bzr.log might have something about loom's failure to load [03:56] nevertheless, both it and ‘bzr-loom’ are as in Debian ‘squeeze’, with no dependency issues. [03:56] hm [03:57] yes, the log does have something [03:57] warning: paste bomb [03:57] [19317] 2009-03-04 14:53:47.719 WARNING: Unable to load plugin 'loom' from '/usr/lib/python2.5/site-packages/bzrlib/plugins' [03:57] 0.239 Traceback (most recent call last): [03:57] File "/usr/lib/python2.5/site-packages/bzrlib/plugin.py", line 208, in load_from_dir [03:57] exec "import bzrlib.plugins.%s" % name in {} [03:57] File "", line 1, in [03:57] File "/usr/lib/python2.5/site-packages/bzrlib/plugins/loom/__init__.py", line 61, in [03:57] import branch [03:57] File "/usr/lib/python2.5/site-packages/bzrlib/plugins/loom/branch.py", line 767, in [03:57] class LoomBranch7(LoomSupport, bzrlib.branch.BzrBranch7): [03:57] AttributeError: 'module' object has no attribute 'BzrBranch7' [03:58] yeah, the bzr is too old for the bzr-loom [03:58] am I right in thinking that means this version of ‘bzr-loom’ should depend on a newer version of ‘bzr’? [03:58] sounds like a packaging bug [03:58] okay. I'll file a Debian bug for this. [03:58] good idea :) [03:58] bzr 1.6 will make that error at least go away [03:59] mwhudson: thanks for the troubleshooting [03:59] np [05:14] isn't pycurl still optional? [05:15] (for accessing http:// urls) [05:15] accessing them fails entirely for me, unless I install it. [05:16] bob2: I presume we're talking about Debian bug#518098 ? [05:16] bignose: yeah [06:31] vila: are you up? see ^^ about pycurl [06:33] poolie: not yet but soon :) [06:36] bob2: pycurl is optional but is/was the default for http and is still the default for https, what bzr version/os are you using ? [06:38] vila: bigtone was having problems on debian with http with bzr 1.5 [06:39] hmm, debian bug#518098 seems to refer to bzr-1.5 [06:39] yeah [06:39] :-) I'm pretty sure many (or at least several :) bugs have been fixed in that area [06:40] bob2: do you have an url to access that bug, google only gives mailing lists hits [06:40] bignose == ben finney ? [06:40] bugs.debian.org/518098, yes [06:42] He's right about the recommends (at least today, don't clearly remember for 1.5) also, one should not take DependencyNotPresent regarding pycurl too seriously since we may as well not show it, the other http implementation being selected in that case anyway [06:43] bob2: thanks for the url [06:43] so it has nothing to do with pycurl, and something else is going on? [06:45] bob2: ok, so after reading the bug report, I think ben is wrong about pycurl being mandatory, I may need to check what has changed since 1.5 but I don't have cases where pycurl works and urllib doesn't (except for https certificate verification, but that doesn't apply here) [06:46] bob2: I may also need the relevant pycurl version too... [06:46] vila: the version of pycurl he doesn't have installed? ;p [06:47] bob2: oh well, in the end, if it works with pycurl and until bzr is upgraded to a more recent version, the simplest is certainly to just install pycurl [06:47] bob2: :-) [06:48] bob2: Sorry, I'm not yet fully awake, so, one last try at explaining it clearly: [06:49] bob2: there are two http client implementations for bzr: one is pycurl based the other is urllib2 based [06:50] bob2: they are roughly equivalent these days except for the https certificate verification that only pycurl implements [06:50] bob2: no https involved here, so it should be a bug in urllib that has been fixed *after* bzr-1.5 [06:51] bob2: installing pycurl (which makes it the default http client used) fixes the problem [06:51] bob2: ergo, for bzr-.15, install and use pycurl is the way to go [06:51] bob2: ergo, for bzr-1.5, install and use pycurl is the way to go [07:07] good night all [08:04] * igc dinner === montywi|zzz is now known as montywi [10:18] bob2, bignose: sorry for the delay, but I'm pretty sure debian bug #518098 has been fixed as bug #230223 on lp (fix released in 1.6) [10:18] Debian bug 518098 in bzr-loom "bzr-loom: can't use Bazaar =?utf-8?Q?with_?=" [Normal,Open] http://bugs.debian.org/518098 [10:18] Launchpad bug 230223 in bzr "smart server probing in 1.4 breaks check outs of short bus http repositories [regression]" [High,Fix released] https://launchpad.net/bugs/230223 [10:18] sorry, ubottu, that was a debian bug I was talking about, not a bzr-loom one at all :) [10:30] hehe. [10:43] hi [10:45] vila: it has, but that package is just in experimental currently [10:47] has anyone used trac with bazaar? [11:01] james_w: ? You mean bzr is packaged in experimental with a more recent version ? Which one ? [11:02] bzr | 1.5-1.1 | unstable | source, alpha, amd64, arm, armel, hppa, hurd-i386, i386, ia64, mips, mipsel, powerpc, s390, sparc [11:02] bzr | 1.12-1 | experimental | source, alpha, amd64, armel, hppa, i386, ia64, mips, mipsel, powerpc, s390, sparc [11:02] james_w: ok, great [11:03] it can get moved to unstable now, I just don't have the poert [11:03] power === montywi is now known as montywi|meeting [11:53] rockstar: awesome news, thanks === Kamping_Kaiser is now known as VK5FOSS === VK5FOSS is now known as Kamping_Kaiser [14:34] good morning jam [14:55] morning vila, sorry about the delayed response :) [14:56] :-) === verterok is now known as verterok|lunch === cprov is now known as cprov-lunch === verterok|lunch is now known as verterok [17:09] hi. i'm trying to help someone who needs to break a lock on a repo on LP. do i remember correctly that using sftp instead of bzr+ssh is helpful in breaking stubborn locks? [17:09] bac, stubborn in what way? [17:10] beuno: in the way that it won't break... [17:10] bac, error message? [17:10] nope [17:10] https://answers.edge.launchpad.net/launchpad/+question/62700 [17:11] * beuno looks [17:12] beuno: shouldn't you be sprinting or something? [17:12] bac, shhhhhhhh [17:13] bac, I'd suggest deleting the branch and pushing again [17:13] considering it's empty [17:15] ah, ok. i just seem to recall when i was in asia trying to push to devpad i used to get a bunch of held locks and spiv suggested breaking the lock using sftp. i could be on crack, though. [17:15] yeah, although I think it's different in LP [17:16] beuno: in rockstar's suggestion he mentions ":push" -- what exactly is that? [17:17] bac, that's the push location [17:18] beuno: so can you use :pull and :parent, etc anywhere a location is needed? [17:18] bac, yeap [17:18] is that documented anywhere? [17:19] I expect that 'bzr help revisionspec' would [17:19] * bac notes "bzr revno :parent" doesn't work as expected [17:19] nope, they aren't really revisionspecs [17:20] well, you know parents... [17:21] they're not revisionspecs [17:22] Hi [17:22] bac: hmm, I can't find it in the bzr topics atm [17:22] bac: but yes, :submit etc is very useful [17:22] LarstiQ: no, me neither. i'm looking in directory_service.py. [17:23] they really are handy and should be documented somewhere [17:23] bzr isn't working here on Jaunty.. It says that I need dulwich, but there is no "python-dulwich" package nor anything like that [17:23] ah wait, seems like it's a plugin that gives the error, nevermind [17:24] RainCT: dulwich would be bzr-git [17:24] (requiring it) [17:25] bac: oh, I didn't know about :this [17:25] LarstiQ: right, just figured that out.. I'm too fast to complain :) === cprov-lunch is now known as cprov [18:34] is there any way to get bzr to spit out the location of its parent branch? [18:34] looking for shorthand way of doing bzr up $PARENT_BRANCH; bzr merge $PARENT_BRANCH . [18:35] where "its" is "the current branch's" [18:36] ":parent" [18:36] james_w: perfect, thanks [18:37] where would i have found that in bzr help? [18:37] (just curious) [18:37] nowhere :-) [18:38] someone *just* opened a bug saying that it should be documented [18:38] ah ha, well that makes me feel better :) [18:40] and the conversion is complete. Work now uses bzr. I wonder how that happened [18:42] Mez: that still needs work here, hmm [18:42] LarstiQ: poor you :d [18:54] jfroy, ping [18:55] pong === mark1 is now known as markh [19:24] jelmer: ping? [19:26] jfroy, pong [19:27] eh, I was just wondering why you pinged me and then went silent :p [19:27] jfroy, I was wondering if you could still reproduce bug 332364 [19:27] Launchpad bug 332364 in bzr-svn "NoSuchRevision error while branching remote repository" [Medium,Triaged] https://launchpad.net/bugs/332364 [19:27] I'll give it a go [19:27] I didn't since the bug status didn't change [19:27] (test it again, that is) [19:32] jfroy, thanks [19:34] it failed again [19:41] jelmer: ping [19:41] sabdfl, pong [19:41] jfroy, thanks, can you pastebin the exact traceback? [19:42] jfroy: Since the error has hopefully changed :-) [19:42] jelmer: i submitted a branch for merging on bzr-gtk, do you review those? [19:42] it has not [19:42] at least not much [19:42] the branch removes the actions from the notifications bzr-notify emits [19:43] actions turn notifications into alerts (i.e, dialogs with cancel buttons that stick around forever) on jaunty [19:43] sabdfl, I reviewed and merged it a few days ago [19:43] ah, thanks beuno [19:43] would it be possible to put an updated package together? [19:43] for 9.04? [19:44] jelmer, you do the packaging for Ubuntu, right? [19:44] also, beuno, do you know the status of bzr and loggerhead packages in jaunty? [19:44] sabdfl: I think a tweaked version of it has been merged based on your patch, which only disables it if the notify daemon (is that the right name) doesn't support actions [19:44] beuno, Yeah, for Debian/Ubuntu [19:44] jelmer: that's better than my patch, i just used a hacksaw :-) [19:44] sabdfl, I uploaded a fixed package to experimental, james_w was going to request a sync for that for jaunty [19:45] sabdfl, loggerhead is in 1.10, which is the latest release. bzr is in 1.12, which the latest release as well. [19:46] we could do a release of LH, trunk has advanced quite a bit since then [19:46] I'll talk to mwhudson about it [19:46] beuno: that would be a good idea, yes [19:47] when is bzr 1.13 due? [19:47] sabdfl: IIRC According to the original schedule a RC1 would be due in a couple of days [19:47] sabdfl, I think after the brisbane sprint next week [19:47] * jfroy pasted http://pastie.textmate.org/private/fpkj1uc5yvyqrehvopq8ow [19:47] jelmer: [19:48] jelmer, hasn't that been pushed back due to the sprint? [19:48] i believe 1.13 adds good work on the network performance front, so would encourage a plan to release it *and* get packages into 9.04 [19:48] beuno: Ah, I wasn't aware of that [19:48] jelmer, if I do a release of LH, can you do an upload to debian so we can sync? [19:48] beuno, My information dates back a month [19:48] beuno, yeah, np [19:48] beuno, just ping me when it's out :-) [19:48] jfroy, thanks [19:48] np [19:49] jelmer, awesome, thanks. I'll work on it today/tomorrow evening [19:50] sabdfl, I'll email the list about it. When's the jaunty deadline? [19:51] beuno: we're already into UI freeze exception territory: https://wiki.canonical.com/DesktopExperienceTeam/JauntyUIFExceptions === nevans1 is now known as nevans [19:53] sabdfl, ah, so it's pretty urgent to get these out then :) I'll poke people about this [19:54] thanks beuno === beuno_ is now known as beuno [20:54] How can I resolve a conflicting tag? [20:54] kfogel, so, it looks like your discussion about PQM is a little different than what PQM really is. [20:56] rockstar: oh? [20:56] where did we go off track? [20:56] Basically, it's similar to Tarmac, only that it gets it's merge requests from email. [20:56] It's still "client side" in the same way Tarmac is. [20:56] hmmmm [20:56] rockstar: so should they be merged? [20:56] kfogel, absolutely not. [20:57] PQM is pretty terrible in general, and is heavy, and a pain to install. [20:57] rockstar: might be good to write a section on how they differ, since they're similar... [20:57] oh [20:57] rockstar: well, don't write that :-) [20:57] rockstar: is Tarmac meant to eventually replace PQM? [20:57] So I wanted something lightweight, and something that was closely connected to Launchpad. [21:00] vila: ping [21:00] + [21:03] rockstar: *nod* [21:03] rockstar: is the lightweight-ness or heavyweight-ness noticeable to the user anyway, though? [21:05] kfogel, yes. I tried setting up PQM for another project three times. Each time, I got nominally closer than the previous time, but eventually gave up because of difficulties. [21:05] kfogel, ask thumper what he thinks of PQM's codebase. :) [21:05] *cough* [21:06] rockstar: heh. Okay, so it's not that it's heavy in terms of code size or internal complexity, it's that it's heavy in terms of user setup. [21:07] kfogel, all of the above. [21:08] whew [21:08] rockstar: PQM is not Canonical code? [21:08] rockstar: (I haven't interacted with it much, mostly what I know is hearsay) [21:09] kfogel, I believe it is now, but it's pretty old and crufty, and I wouldn't say there is active development going on. [21:10] kfogel: it's a pre-bzr codebase [21:10] LarstiQ: ah [21:11] question: anyone know how I can get the bzr sources to build bzr on my system? I need something that can talk branch format 7 to check out bzr. [21:12] (and yes, all I have done is go to the bzr homepage and try to follow the instructions there.) [21:12] rockstar, are there any plans to have tarmac work for non-lp? [21:13] jseutter: I'd try the latest release. [21:13] jelmer, not currently. I mean, it figures out which branches to merge through the Launchpad API. [21:13] I guess it could grow that though. Patches welcome. [21:14] rockstar, Cool, I might look into that then [21:14] jelmer, it would be much appreciated. [21:15] jelmer, I thought it might be good to grow some email features. [21:15] rockstar, yeah, that's the bit I'm interested in [21:17] jelmer, also, we've talked about a pluggable branch landing system, so it may be that tarmac could become that, with a LP plugin, and an email plugin. [21:36] LarstiQ, sorry, I could have been more clear. To check out bzr it is telling me that I need bzr 1.6 or newer. The binaries listed on the bzr homepage are all older than that. [21:36] I can't get the source to build a new version of bzr to get the source. [21:36] ugh. My brain is fried. At any rate, I have a chicken and egg problem. [21:37] I checked the Ubuntu packages and the Epel repo, and they're both older than 1.6. [21:38] oh wait, there's a slackware link on the homepage that is 1.6.1. I'll try building that === montywi|meeting is now known as montywi [21:45] oh fark. 1.12 > 1.5 [21:46] sorry about that. [22:02] poolie: hi [22:02] I've gatecrashed Tim's [22:02] hi lifeless [22:02] congrats [22:15] vila: thanks! === Spaz is now known as Kittens [22:27] lifeless: d'oh, my less test skips patch failed because of your bzrdir network name changes... [22:31] vila: when you get around, I need to discuss a few items concerning credential providers [22:32] spiv: sorry :) [22:42] jfroy: he's probably not back for 8h now [22:42] poolie: nothing urgent [22:42] *it's nothing urgent [22:47] jfroy, see privmsg [22:51] lifeless: progress messages are less important than making sure there are no showstoppers in the version in jaunty [22:51] poolie: right. So let me cap the high features for you [22:51] spiv: please add any I miss ;) [22:52] poolie: we do network streaming push to stacked and non-stacked branches [22:52] poolie: we do network streaming pull from non-stacked branches, and for stacked ones now use the generic versioned-files based fetch rather than pack-optimised [a slight regression for that specific case] [22:53] poolie: the streaming requires both client and server to have the format for both source and target in common; that is pushing from a svn checkout to a bzr branch requires the server to have bzr-svn installed [22:53] we have a bunch of new verbs for creating objects over the wire and getting more data about them when we open them [22:54] we may find glitches during the beta cycle, but we'll fix them without more wire changes I expect [22:54] we're happy with the general structure of the data on the wire, so I don't expect we'll need to drop the new verbs at all, or at least not for a long time [22:55] so we can support the jaunty versions happily [22:55] have you tested all these cases manually, as well as in selftest? [22:55] not explicitly, and I don't think thats a particularly good use of time until rc1 is out. [22:55] I'm dogfooding though, and so is spiv [22:56] so are the folk using bzr nightlies, though they will be nearly universally dogfooding the backwards compatibility behaviour not the new code [22:56] So far I've had no nasty surprises from dogfooding. [22:56] fwiw I'm dogfooding too [22:56] morning lifeless, spiv, jelmer [22:56] hi Ian [22:57] ok [22:57] so, regardless, i'd like you to please test those cases manually today [22:58] historically this is the kind of change that has caused knock on effects and i'd ilke to reduce the chance in this release [22:58] poolie: thats going to be basically the whole day [22:58] poolie: there are a _lot_ of permutations [23:00] is it better to spend that day next week during the sprint? i think that's even worse. [23:00] and if the other alternative is to do this release in to jaunty without integration testing, i like that even less. [23:00] poolie: whats the due date for jaunty? Can we not do a days full-permutation testing after the sprint? [23:01] poolie: and do a point release if we find any issues? [23:03] so that would give us more networking improvements in 1.13, but more chance that there are bugs in the ones we do have? [23:04] wiki.u.c is down and i don't have the dates written down here [23:04] ui freeze is today, beta freeze is march 19 [23:05] thursday after the sprint [23:05] If we're going to do this sort of manual testing, I'd much rather do it monday the 16th [23:06] because why? [23:07] well, we have two days left. We might be able to get to streaming-from-stacked, or vfs-free branch-from-non-stacked if we keep the momentum up [23:08] as soon as we stop, the protocol is frozen for those verbs until the release in the absence of serious issues. [23:13] lifeless: I'm a bit unsure what the right fix for the less-skips + network_name failure is. The server-side is failing on control_format.get_branch_format().network_name() in sprout_bzrdir_branch_ref tests. [23:14] spiv: is there a network name for BranchReferenceFormat? [23:15] No, there isn't. The error is AttributeError: 'RemoteBranchFormat' object has no attribute '_network_name', btw. [23:16] spiv, what do you think? [23:17] poolie: as lifeless says, we are tantalisingly close to some milestones. [23:18] ok [23:18] i will hold you two responsible if there are showstoppers in this release [23:18] So it's even harder than normal to be enthusiastic about manually testing ;) [23:19] but i wish you luck [23:19] sure, i can sympathize with that [23:22] spiv: *serverside* is using a RemoteBranchFormat? [23:22] lifeless: right! [23:22] lifeless: it's a RemoteBzrDirFormat test. [23:22] spiv: those two nouns should never be in a single sentence unless it is '*serverside does not use RemoteBranchFormat objects*' [23:22] Or rather, a bzrdir_implementations test. [23:23] Heh. [23:25] lifeless: ok, I can tweak bzrdir_implementations/test_bzrdir to explicitly use get_vfs_only_url or something. [23:28] spiv: there may betwo issues; the test asking the server to do something bong; the server not preventing third-party-requests. [23:28] spiv: we know the second exists [23:29] Well, the test was creating a branch reference (on a server), and then sprouting it (to a new url on the same server) [23:30] All three failing tests were following that pattern. [23:31] * igc breakfast - bbl [23:31] If I change it to create the branch reference locally, then sprout to a server, it works. [23:32] If I change it to create a remote branch reference, and sprout it to local, it still fails. [23:32] spiv: so its reasonable to say to the server 'create a branch reference to url XXX' [23:32] spiv: its not reasonable for the server to assume it can read it [23:33] Right. [23:40] upo el thanks [23:40] what's the best way to transition from svn to bzr? I tried using bzr-svn but it didn't work for me. === montywi is now known as montywi|zzz [23:42] Jerub: in what way didn't it work [23:42] Jerub: bzr-svn 0.5 has been working very well on the couple of projects I've tried it on. [23:44] it was a few weeks ago i did it, I don't actually remember what the failure was. [23:44] poolie: so qa wise I'm much more concerned that we're going to DOS the lp smart server [23:44] than tat we'll have the client fail to work as desired [23:45] poolie: theres plenty of adhoc testing that occurs as we just use the client, as we test stuff for the python guys and so on [23:46] * Jerub runs it again