[00:01] spiv, call in a sec === vk5foss is now known as kgoetz [00:19] hi there [00:19] anyone an idea: http://rafb.net/p/v6LWKW51.html [00:19] ? [00:20] Necoro, Permission denied (publickey). [00:20] it shouldn't be tracebacking [00:20] spiv, ^ [00:21] Necoro, but, it's likely due to Launchpad being down [00:21] beuno: hmm - the web service is up and running ;) [00:21] but the traceback is strange though [00:21] AttributeError: 'ProtocolThreeDecoder' object has no attribute '_in_buffer' [00:21] Necoro: the codehosting service is not yet fully up. [00:21] Necoro, the web service, but not the code hosting [00:23] ok [00:23] then I'll try again tomorrow morning ;) [00:24] or in a few hours - depending on how long I stay awake [00:25] Necoro: that's a bug in -Dhpss [00:25] Necoro: it's fixed in bzr.dev (and 1.7rc I think) [00:25] spiv: *g* - bugs in debug code pathes are always great :D [00:30] spiv: did you see my comment on that merge request? [00:31] down to 15 failures btw [00:35] lifeless: yeah, I did [00:35] lifeless: it's still flagged in my inbox as something to address [00:36] cool [00:36] 2.45 seconds now btw [00:37] I've seen hg as low as 2.37 [00:38] so, without plugins, my bzr branch is faster :P [00:38] When I land faster-startup (tomorrow hopefully) that'll get you another 30ms :) [00:42] btw, did you try my status branch out ? [00:42] nice === kiko-afk is now known as kiko [01:20] ok, all tests pass [01:20] (all the intertree unit tests I mean) [01:22] still 2.45 seconds with everything passing, which is good [01:22] lots of fat in there still I think [01:23] breakfast now, test-parameterisation for this new extension after that, then people can pplay [01:25] when's next bzr rc cut due? [01:26] jam: ^^ [01:27] i f [01:28] i know this isn't a bzr question but, i know there's a way of getting a line count from bzr diff by piping it through something else. but i can't remember how [01:28] jdobrien: bzr di | wc -l will get you a line count [01:28] that's it! thanks! [01:28] jdobrien: but piping through 'diffstat' is also sometimes useful [01:28] jml: thank you [01:29] jml: diffstat, very nice === mw is now known as mw|out === ajaksu_away is now known as ajaksu [02:40] 2.42 seconds :P [03:21] btw [03:21] there is a faster status branch pushed to ...readdir [03:22] I'm tuning now, but its currently 1.4/3.84 seconds faster [03:22] lifeless: does it mean a faster diff against wt too? [03:23] mwh: yes [03:24] mwh: diff is built on iter_changes [03:24] right [03:24] * mwh tries to think what else is [03:24] merge, i guess? [03:24] but that's between revision trees i suppose [03:32] merge does a local diff [03:33] so yes, merge on large trees should feel faster [03:34] mwh: how long does 'bzr st' take you today on lp? [03:35] ~540ms for me. [03:35] Is bzr 1.7-rc1 something you want me testing? (alternative answers to "duh, yes" are "ooops, no, it's horridly broken don't touch" and "wait until 1.7rc2" and "no stick with 1.6.1 for day to day use" and "please test the $X which we want feedback on") [03:35] yah, you would see only a small improvement [03:36] AfC: rc testing feedback is always welcome; I don't know if there are specific improvements there that are relevant to you [03:36] {shrug} [03:36] Then I'll pull it in. [03:36] if 1.7c1 was horribly broken the IRC topic would likely say so [03:36] Uh huh [03:37] (I'm more getting at the tension between "it was just a snapshot on a given day" and "our dev tip is where it's at, but don't use that") [03:46] oh [03:47] well, I live ahead of tip myself; I think anyone that is interested can safely run tip - just need to track the rss feed for it to know what changes are occuring [03:53] AfC: use the tip of the bzr 1.7 branch if you want to test. It's got a couple of fixes that aren't in the rc. [03:54] I track tip, 'cuz it makes me feel special. [03:56] fullermd: you *are* special. Don't let anyone tell you different. [03:56] That's what the counselors always told me, while they were smiling and backing away. [03:57] Anyway, whaddaya get if you run released versions, anyway? All you do is trip over bugs that other people have already found. Where's the joy in that? [03:58] * spiv sometimes thinks that "Following the tip" sounds like "walking the plank" [03:58] I mean, that's all like "You: I found this bug lifeless: Yeah, it's bug 12345". [03:58] Launchpad bug 12345 in isdnutils "isdn does not work, fritz avm (pnp?)" [Medium,Fix released] https://launchpad.net/bugs/12345 [03:58] Especially when lifeless says he lives ahead of the tip :) [03:58] With tip, you can be all "You: I found this bug lifeless: o_O" [03:59] fullermd: the joy is that if the bugs are already known, then maybe the workarounds are too ;) [03:59] spiv: 'patches accepted' is not a workaround. [03:59] Piffle. What kinda wimp wants to live like THAT? [04:00] That's like getting pre-digested food. [04:00] Gotta have something you can sink your teeth into. [04:00] Even if it responds by sinking teeth into you... [04:49] mwh: so, did you try the branch? or just curious about whether it will help you ? [04:59] poolie: there's a mostly complete http://bazaar-vcs.org/SmartPushAnalysis1.8 now. I'm off to lunch. [05:01] hey, great [05:01] i was literally talking about it to thumper right now [05:04] * spiv does a couple last touches [05:04] Ok, really lunch now :) [05:06] poolie: buried in the "analysis" section is a description of the 10s win I mentioned this morning. [05:06] spiv, can you tell me more (or add more) to that page about the streaming-push work [05:07] like sending a put_revisions_stream rather than working on packs === Spaz is now known as Kittens === mario__ is now known as pygi === TheMuso_ is now known as TheMuso [06:10] lifeless: no, i didn't get around to it [06:16] spiv, are you back? [06:21] poolie: I am [06:21] quick call? skype or pots? [06:22] Either's fine with me. [06:26] will 'bzr upgrade' in a shared repo upgrade the branches in that repo? [06:36] jml: it didn't do so in the past, but I don't know if it does now [06:39] lifeless: thanks. [06:39] jml: easy enuff to find out [06:39] lifeless: yeah, I know. [06:40] the answer is "no" [06:52] hi all [07:11] jml: ping [07:12] lifeless: pong. [07:12] jml: AIUI bzr never stacks unless --stacked is passed [07:13] I refer to your lp documentation [07:13] if it is stacking without --stacked being passed, or a local default being set, I consider it a pretty big bug we should fix [07:13] lifeless: ok. [07:14] (because stacking generates a truncated database, it can lead to unrecoverable data loss if people think they actually have a full branch) [07:14] lifeless: not 100% sure what to say to that. [07:14] (and then delete something) [07:15] lifeless: the work I've been doing on Launchpad has been predicated on the default stacking policy stuff in Bazaar 1.7. [07:15] jml: I understood that policy to control *where* not *if* [07:17] lifeless: ok, then that's definitely something to raise on the Bazaar mailing list. [07:17] jml: AIUI bzr never stacks unless --stacked is passed [07:17] not true, a*i*ui [07:17] poolie: please read the above, then comment [07:18] from 16:11 < lifeless> jml: ping [07:24] lifeless: in any case, whether or not Bazaar needs to grow a local configuration option is incidental to Launchpad. [07:24] lifeless: if the 1.7 release gets one I'll update my instructions. [07:26] lifeless: this rollout only defines a stacking policy for projects on a pre-configured shortlist, so the impact is manageable. [07:32] hi [07:33] hm [07:33] my understanding was that it should not normally stack unless --stacked was given [07:33] but when pushing to eg launchpad the server could tell it to do so [07:35] this matches how bzr behaves at the moment. [07:40] yay [07:40] i'm so haappy to hear thaht [07:40] that* [07:41] :) [07:42] ok. well I'm going to take a few deep breaths to recover from that little shock. [07:45] lifeless: is this ok with you? [07:45] poolie: I don't really feel comfortable with that, but if you are, well, I have bigger fish to fry. [07:47] jml, can we change this later so the server just sends a suggested url but doesn't turn it on? [07:48] poolie: I'm not sure I follow. At the moment, all the server does is specify a URL in a control.conf file. [07:49] (and a billion things to deal with the fallout of that & Launchpad's own infrastructure) [07:50] poolie: presumably Bazaar can change at a later stage to respond differently to this URL. [07:50] ok [07:51] lifeless: thanks for the status update that was super useful [07:51] aside from being a nice set of numbers [07:52] I'd like to set usertest run across it [07:52] thanks for noting that it may be bottoming out too [07:52] ok [07:52] you can, or i can on escudero [07:53] is there a HOWTO? [07:53] yes, just google it [07:53] http://rabbit.eng.miami.edu/dics/amerlen/length08.txt ? [07:53] thats the only hit [07:53] for "'usertest' 'escudero'" [07:53] hee hee [07:54] http://people.ubuntu.com/~ianc/plugins/usertest/doc/usertest-tutorial.html [07:54] uhm [07:54] I meant on escudero [07:54] https://wiki.canonical.com/Orcadas [07:54] i mistyped [07:55] i'll be here for a few more hours so i'm going to take a break now [07:55] ok [07:55] well, I might poke tomorrow [07:55] reading those two docs suggests to me the answer is 'no there is no howto for running a specific branch' [07:55] so I'll look at it tomorrow [07:55] i can set it up [07:55] gnight, enjoy your call :P [07:56] it's in the doc on that machine [07:56] branch is http://people.ubuntu.com/~robertc/baz2.0/readdir [07:57] thanks! === Kittens is now known as Spaz|hedonism === Spaz|hedonism is now known as Kittens [08:36] hi, im trying to push a branch to lp , and i get "The server's host key is not cached in the registry" [09:02] poolie: Did you see my email regarding payment for the summer? [09:03] Odd_Bloke: hi there [09:03] yes let's see about that [09:07] poolie: I'm at work ATM, so email is better than IRC. :) [09:14] ok [09:25] sent [09:27] poolie: Thanks. [09:27] I'll deal with it when I get home. [09:27] Or possibly tomorrow, I'm probably busy this evening. [09:27] maybe we can talk tomorrow my time/uk evening [09:34] lifeless: should be running now in http://benchmark.bazaar-vcs.org/usertest/log/usertest.log.inprogress [09:35] ls [09:35] Oops [12:57] hi [12:57] is there anything new in the BzrGit department? === bac_afk is now known as bac [13:03] robsta: jelmer wrote (most of) it, so he'll probably know. [13:05] is it usable already? === kiko is now known as kiko-afk [13:49] robsta: it can clone locally I believe [13:59] ok, guess i'll stick to svn server-side for the time being, then === mw|out is now known as mw === cody-somerville_ is now known as cody-somerville [14:47] Hi guys! [14:47] is it possible to list all the revisions in a branch but ordered by date instead of "revision/branch"? [14:48] I mean.... instead of having the revision tree, I want toget all the revisions ordered by date [14:48] is that even possible at all? [14:50] jam: ping [14:56] in a bound checkout, does `bzr cat` hit the server? [14:57] I'd assume yes for lightweight,no for regular [14:58] good === raz is now known as razZz === razZz is now known as raz === Ng_ is now known as Ng === jam changed the topic of #bzr to: Bazaar version control system | http://bazaar-vcs.org | bzr-1.6.1 now available! please test bzr-1.7rc2 | http://irclogs.ubuntu.com/ | http://planet.bazaar-vcs.org/ [16:33] how comes that bzr mv -q still shows what it moves? [16:34] Leonidas: it's a bug I expect [16:34] Yeah, I think so too. I just encountered again when I wrote it in a script [16:35] Leonidas: I would guess it's an easy fix [16:36] james_w: probably. It's not a problem currently, I just wanted to tell that to the developers, so they can fix it when someone has a bit of spare time. [16:37] Leonidas: a bug report would be a better way of doing that of course [16:38] james_w: sure, I'll write one in a moment. Just wanted to make sure I'm not the only one with this problem. [16:38] thanks, I'll check now [16:38] yup, I see it too [16:39] CLOSED: worksforme with the comment: "Do you think we'd miss something like this?" would leave me standing like an idiot ;) [16:39] true :-) === ajaksu is now known as ajaksu_away [16:47] james_w: there it is: https://bugs.launchpad.net/bzr/+bug/271790 [16:47] Ubuntu bug 271790 in bzr "bzr move ignores quiet option" [Undecided,New] [16:51] Leonidas: thanks, I triaged it [16:55] cool, let's see how it'll continue :) [16:55] meow [16:56] oh my [16:56] 1.7 already? O_o [16:56] (well, an rc, but still) [16:56] did you hire a team of slaves or such? [16:58] Kittens: 1.7 was hot on the heels of 1.6 [16:58] 1.6 had a over-long release cycyle [16:58] ah :p [16:58] * rocky is comforted by the fact that there are so few changes between 1.7rc1 and 1.7rc2 [17:01] * awilkins just wants them to merge his switch-to-sibling patch so he can stop maintaining his own builds [17:01] markh: Is it hard to build the "exe" version? [17:35] awilkins: ping [17:35] Verterok: pong [17:35] awilkins: hey there! [17:36] awilkins: patch merged, and also a few other fixes/enhancements in bzr-java-lib (also in bzr-eclipse) [17:38] Verterok: Excellent :-) [17:39] Verterok: I love it when my patches get merged, I don't have to maintain the branch anymore :-) [17:39] awilkins: hehe, indeed. [17:40] Going to have to keep that callisto branch going though, methinks [17:41] At least until my PM badgers Borland into coughing up upgrade licenses [17:41] awilkins: (don't remember if already told this) about the dependency on core.expressions it's only used in the refresh hook [17:41] So we can use the Ganymede version insdtead of Callisto [17:41] Verterok: Yes... the refresh seems to work OK, so I'm not sure if it breaks anything to be on Callisto [17:41] Is there any specific behaviour that it enables? [17:42] awilkins: that's is only for a specific layout [17:42] awilkins: when the project root is below the branch root [17:42] Verterok: Flat or hierarchical or something else? [17:42] Ah [17:43] So it would come into play on bzr-eclipse, for example [17:43] awilkins: i.e: bzr-eclipse project layout: mutliple projects in one branch [17:43] yes [17:43] It doesn't affect most of my stuff [17:43] awilkins: that was my point :) I assume you can remove the refresh hook and so the core.expressions deps [17:49] Verterok: What exactly is the bit that needs that version? Because if you just take the version number out of the manifest, it compiles and appears to run ok. [17:49] And a version of "3.2.100" suggests a callisto component to my mind [17:52] awilkins: I think the 3.2.100 was added in Europa (but just guessing) [17:52] awilkins: I never specified a version :p [17:53] Verterok: It's true that I can't find a 3.2.100 version in the Callisto updates, but a europa-specific component should be 3.3, no? I suspect it's a patched version of a europa-compatible library [17:53] Sorry, callisto-compatible [17:53] That would fit the version number scheme [17:54] awilkins: here (3.4) seems to compile without the version number [17:54] Also does so for 3.2 [17:54] awilkins: the version scheme is not exactly like that :) [17:55] Well, it should be :-) [17:55] awilkins: mayor.minor.bug-fix, mayor change *only* if there are api breaks, minor when there are new api or visible changes [17:57] Verterok: It just makes a sort of internal sense to me that a component of version 3.2 has had the same API since Eclipse 3.2 [17:57] Since there are also 3.4s in Ganymede but not in Callisto [17:57] esp. for actual eclipse bits [17:58] awilkins: in ganymede, core.expressions is in version 3.3 :p [17:59] awilkins: http://wiki.eclipse.org/index.php/Version_Numbering <- from there I taked my lame explanation of versions numbers :) [18:01] Yes, but you have to admit that the large amount of "3.2" components in Callisto, and 3.3 in Europa, and 3.4 in ganymede... well, I reckon there's a convention operating within the rules there :-) [18:01] What would fail if it wasn't working properly on this version [18:01] awilkins: sure, it makes sense that most of the componentes get bumped to 3.3, 3.4, etc :) [18:02] BUt if the API does not break... then not [18:02] Hence 3.3. on Ganymede, etc [18:02] awilkins: right :) [18:02] * Verterok just realized that bzr-eclipse should be 1.0.99 :p [18:03] * awilkins has had to revise client code several times, you naughty dog [18:03] :-P [18:03] :) [18:04] Since you didn't choose a version number, I suggest it is removed [18:04] Since it compiles just fine here [18:04] awilkins: ah, all tests passing on *nix :-D [18:04] And you don't support 3.2 anyway because you use 3.3 components [18:04] awilkins: sure, I'll remove it in my next commit [18:05] I have a little patch for your /tmp dir stuff [18:06] Hmm. [18:06] awilkins: patches are more than welcome :) [18:21] Verterok: They fail to start a client here [18:21] Verterok: My laptop is passing. [18:22] awilkins: the client don't start? [18:23] awilkins: also I added a few goodies related to preferences, let me know if the chicken-egg issue is solved for your case :) [18:35] Verterok: It doesn't seem to be registering the client factories before it asks to create one [18:36] It calls into createClient and factories is an empty mapo [18:36] awilkins: hmm, let me check [18:36] argh, why does `bzr diff` return a nonzero value on a non-error condition? [18:36] I'll trap my working one and see where regstierAdapterFactory is getting called during the tests [18:37] Tak: it indicates the result of the diff [18:37] Tak: take a look at the end of: 'bzr help diff' [18:38] awilkins: it should be in TestsConfig/TestConfig (If I remember ok) [18:38] I see what they mean [18:39] but the shell treats !0 as an error condition and acts accordingly [18:39] diff(1) returns non-zero on differences too. [18:40] Verterok: Badgers, my fault [18:40] I'm running with xmloutput 0.5 [18:40] meh, it does? I guess that answers my question then [18:41] My thoughts on that are ; since bzr-java-client can manipulate the PLUGIN PATH, it could have it's own internal xmloutput plugin [18:41] But it probably needs a test to check the plugin version [18:41] awilkins: oh, ok. I was thinking that maybe the new "lightweight" checks for the executable broken something on win32 [18:42] Verterok: All the bits of code I suspected haven't changed between our branches, I think [18:42] * awilkins pulls xmloutput [18:43] awilkins: that would be nice, I've been playing with eclipse regarding this "bundled-xmloutput", and it seems quite simple to achieve [18:43] awilkins: do you know if the PLUGIN PATH override the default plugins location? [18:49] Verterok: I don't know [18:49] Verterok: It all passes here apart from index because I don't have the plugin [18:50] awilkins: great, I must add a conditional in the execution of the test related to bzr-search [18:51] Now I'll try a startup in a clean workspace [18:52] * Verterok cross fingers and wait [18:53] awilkins: the preferences page should be opened on startup [18:56] Verterok: Ok, zero prefs [18:56] So far. [18:56] Imported a project (because I'd usually do that and forget about VCS for a while) [18:57] Ok, menus are available.... go to prefs now [18:58] Set the .bat file... it's happy [18:58] Took a moment to show overlays because this is a large tree [18:59] So the "can't set prefs" issue is clear [19:00] awilkins: gooooood :D [19:00] This is a slightly patched branch because I've removed callisto things to make it compile [19:01] *europa [19:01] But only those changes required (no SaveableEditor) [19:03] My wife is waving cake [19:03] * awilkins departs, drooling === kiko-afk is now known as kiko [19:38] * beuno points everyone at: http://www.smashingmagazine.com/2008/09/18/the-top-7-open-source-version-control-systems/ [19:39] hi beuno [19:39] hey Verterok [19:40] lifeless, igc, jam, abentley ^ [19:41] anam I missing some navigation, or isn't there much to the review? [19:42] well, it's not very profound [19:42] but it showcases bzr quite weel [19:42] well even [19:44] ok :) [19:45] TBH, it's a site that normally features design stuff [19:45] so it was surprising to me to see that entry [19:45] so I had to share it :) [19:50] "Monotone places higher value on integrity than performance." [19:50] I thought that was bzr's claim :-P [19:58] Tak: you obviously haven't tried monotone lately ;) [20:02] haha, no [20:02] one experience was enough for me [20:03] * awilkins has a monotone server that's run untouched on his DVR for ages [20:03] I think I'll transfer the source to bzr branches and leave it at that [20:04] yo [20:04] ew monotone [20:04] hello ronny [20:05] monotone is certainly nice and powerfull, just dog-slow cause poor data-store [20:05] SQLite is not poor ... but RDBMS are a poor idea of version control [20:06] Another reason to shy away from TFS [20:06] it's a bit sad, they did some nice stuff [20:06] awilkins: well, given the context sqlite is poor [20:06] VSS! With SQL Server as a backend! Yay [20:06] well [20:07] is there anything compareable to svn authz access via http/apache for bzr? where you can control access to various repos and/or folders-within-repos via a config file? [20:07] eh, tfs is a bit more like svn with sql server as a backend ;-) [20:07] rocky: You can only do authorization on a whole-tree level [20:08] there is a script in contrib/ [20:08] awilkins: well, is there anything making that (on whole-tree level) simple for a http based bzr serving? [20:08] for SSH keys [20:08] hmm, well, will bzr branches stay to limited to one head and having the workdir point to that [20:08] beuno: what i'm asking for would need to be read/write via http [20:09] rocky, ah, webdav. vila is the man to ask about that [20:09] vila: ^^ :) [20:09] it's late-ish for him, so he may not be around [20:09] if you don't get an answer, sending an email to the list is the next best thing [20:10] Hmm, I like the domo-kun eating trees on their picture of git, why isn't the real git like that.... [20:10] since the main bzr http serving thing is just a python wsgi app (well at least it looks that way) it seems fairly straightforward to write my own access middleware for that [20:10] but i'd love to see if someone's already one that [20:10] *done === kiko is now known as kiko-phone [20:11] rocky, well, contributions to loggerhead are *very* welcome :) [20:11] I've only gone as far as configuring access via IIS auth [20:11] I've managed to do read & write through apache (bzr+http://) [20:11] anyway, I'm off to the dentist [20:11] You just use IIS user impersonation and normal NTFS ACLs [20:11] IIS, eeeeew! [20:11] ew [20:11] ok, that's it for unproductive comments from me [20:11] I know, but the production site is ASP classic [20:11] ew is right ;) [20:11] * Spaz threw up a little [20:12] I could change it to PHP in short order though [20:12] THe ASP is only being used for a very few things [20:12] Mostly inserting "1" and "0" into links in strategic places [20:13] Might be nicer... but without it, Bazaar would not have working IIS support yet, so ner. [20:13] rocky: using AuthType Basic and AuthUserFile like with svn [20:13] awilkins: I for one think you're a hero :) [20:13] i think IIS discussion is off-topic in here [20:13] and quite frankly i think it's flamebait :P [20:14] well as long as everyone here acknowledges that MS tech beats all i don't need to argue.... [20:14] * rocky couldn't resist throwing out some bait [20:14] hurhurhur [20:14] :P [20:15] Yes, MS tech is a violent assault, we agree [20:15] i think m$'s technology is their attempt at conquering the world...and it seems to be working [20:15] :p [20:15] * Spaz forks himself into the background [20:16] Spaz: nah, not as it concers [20:16] meh [20:17] * LarstiQ kicks freezing laptop [20:17] don't kick it too hard [20:17] markh: Ping? [20:28] hi all, is there any way to pull individual file changes from a revision? [20:31] ahh, dumb question, just found out merge supports that [20:31] bzr help diff [20:31] or that [20:40] hi [20:45] bpierre: hey, did you try `bzr add subtree`? [20:45] s/hey/hi/ [20:45] looks like i spoke to soon... online some refers to using individual files with merge... but i can't find anything in the help about it [20:46] oh actually it does work... it just doesn't accept wild cards. === kiko-phone is now known as kiko [20:51] does it work if the directory containing the subtree is added but not yet commited? [20:58] LarstiQ: here is what I did: http://www.pastie.org/275241 [21:02] bpierre_: I think that should work. The root fileid won't be set yet of ruby, so _possbily_ that could go wrong [21:02] I tried to commit, then add, no luck [21:02] no luck in what way? [21:02]