=== ja1 is now known as jam [00:04] jam, where does subvertpy live on Windows? [00:06] igc: btw, it would still be nice to see your RevisionImporter class land [00:07] jelmer: basically i'd have to store blobs, then generate the tress - and finish with the commit [00:08] ronny, yeah, that's very well possible [00:08] james_w: i don't understand why it still keeps looking for "/usr/lib/libpython2.4.so", even if i set 'PYTHON_LIBS = -L/usr/lib64 -lpython2.4' and 'PYTHON_LIB_LOC = /usr/lib' [00:09] jelmer: bascially i want to write up a client/server that can start a content-addressed repo for backups, and then send added/removed files [00:09] dirkD: no idea [00:09] i think git is an almost ideal store for incremental backup [00:12] igc: cool [00:13] ronny, yeah, I agree it seems quite well suited for something like that [00:13] ronny: seen duplicity? [00:15] lifeless: yes, dont like it [00:15] k === montywi is now known as montywi|zzz [00:17] jelmer, james_w: i had to change PYTHON_LIB_LOC and PYTHON_LIBS not only in ./Makefile, but also in ./src/Makefile . But it doesn't work yet: http://pastebin.com/m9691f84 [00:17] jelmer: I haven't forgotten about that, though its now a bit more than just revision loading because I needed a thin veneer over a repository and that become it [00:19] igc: I might also have a look at preparing it for bzr.dev after finishing InterBranch, if that's ok with you? [00:20] dirkD: maybe because you are using nautilus-python that is meant for the new API [00:20] ok, but isn't it related to libnautilus-extension? [00:21] http://library.gnome.org/devel/libnautilus-extension/stable/libnautilus-extension-nautilus-file-info.html#NautilusFileInfo [00:22] igc, thanks [00:25] james_w: i think i have the right version [00:25] james_w: http://pastebin.com/m16eae94d [00:27] jml: btw, the probable fix for https://bugs.edge.launchpad.net/bzr/+bug/331823 has landed, please let us know how it works out for you [00:27] Ubuntu bug 331823 in bzr "Pushing an update of a stacked branch to Launchpad sometimes takes nearly an hour" [Critical,New] [00:27] dirkD: I'm not really sure what's going on, and it's far too late for me [00:27] for me too :P (1:27) [00:27] for jelmer too [00:28] spiv: thanks. I'm running the nightly build, so it'll be easiest to tell when that updates. [00:28] jelmer: sure. Make sure you grab the latest fastimport - revision_store.py is the latest code [00:29] Or I guess I can just pull dev and push up an LP branch [00:31] jml: bug 331823 fix hath landed [00:31] Launchpad bug 331823 in bzr "Pushing an update of a stacked branch to Launchpad sometimes takes nearly an hour" [Critical,In progress] https://launchpad.net/bugs/331823 [00:32] lifeless: you're four minutes behind the times! [00:32] spiv: heh [00:34] what revno? [00:34] 4043 [00:34] jml: 4043 pqm@pqm.ubuntu.com-20090225000405-09p33ue22l4h19yk [00:35] thanks. [00:36] igc: great work vis-a-vis emacs [00:36] http://paste.ubuntu.com/122611/ that's r4041 on initial push -- that hasn't happened before [00:36] spiv: my sink fix is merging now [00:36] as in, this bit hasn't happened: "Source format does not support stacking, using format: '1.6' [00:36] Packs 5 (adds stacking support, requires bzr 1.6)" [00:37] thanks lifeless [00:37] jelmer: subvertpy the python files lives inside 'library.zip' with all the other python files. The '.dlls' are in lib/*, IIRC [00:37] jml: what is your source branch format? [00:37] lifeless: source branch == the branch I'm pushing? [00:37] jml: I hope [00:38] branch: Branch format 7 [00:40] jml: please file a bug [00:43] lifeless, spiv: the critical bug is fixed. pushing up a single revision change took only "HPSS calls: 274" and "136.763 return code 0" [00:43] jml: 'ugh' [00:44] jml: you might like to try a copy of bzr.dev on the server too [00:44] lifeless: haha [00:44] lifeless: the server in this case is Launchpad. [00:44] jml: I know [00:44] jam: Thanks [00:45] igc: thanks, will do [00:45] lifeless: anyway, two minutes for a single revision sucks, but it was what 1.12 was doing, so the regression is gone. [00:45] jml: Im serious though, I posted details on using a bzr.dev on e.g. people yourself [00:47] jml: be great to know if you get the sort of improvements we're seeing in our testing [00:48] lifeless: yeah, well I'm not going to install bzr.dev onto Launchpad this week [00:49] lifeless: I can try setting up a toy server to experiment with later. [00:49] jml: some checkout bzr into your homedir on people :P, if you havetime [00:51] can someone point me to docs for conviently using the apis to do things like pull/push/branch [00:53] ronny: I don't think we've got great docs for that. To reproduce exactly the UI I'd go to builtins.py cmd_pull|push|branch [00:53] ronny: but generally you can just do branch.push(other_branch), branch.pull(other_branch), and branch.sprout(new_url) [00:56] lifeless: the ui thing seems to do a toon of things more (like handling stacking) [00:57] ronny: yeah; so big picture I want to put a layer of ui-but-not-cli into bzr, but its not there yet; things like push.py are heading in that direction [00:57] james_w, jelmer: thanks a lot, it works! [00:58] and goodnight [00:59] hmk [01:00] ronny: the push UI specifically handles 'need a new branch' 'target dir is missing' 'explicitly stack' and a couple more [01:01] i think i want to avoid replicating that in anyvc [01:01] you could use show_push_branch [01:02] yeah, less to replicate [01:16] yay, sink refactoring landed [01:18] lifeless: dude, put your stuff on the wiki so that maria can book our hotel plesae [01:19] poolie: sure think [01:22] poolie: didn't realise it was blocked, I've put the core details on [01:22] poolie: I'll dig up the itinery thing and get exact flights soon [01:22] ok [01:23] flights wbn, but dates are of course necessary to make the booking [01:23] I had no idea it was blocked, I've known dates for ages (since I told you I'd booked) [01:24] thanks [01:27] When I add tests for InterBranch.update_revisions(), should I remove the old tests (except for a trivial one) for Branch.update_revisions(source, ...) [01:27] ? [01:28] jelmer: probably yes [01:28] maybe just a test that it's finding the interoject that you expect [01:29] ok [01:29] * igc lunch [01:30] (probably a long one - back later) [01:44] Hi folks. Question for you. I've got a bzr repo and I would like to keep a svn repo in sync with the bzr repo. How would you go about doing that? Is there a standard approach? [01:45] install bzr-svn [01:45] lifeless: done [01:45] if you want to go svn->bzr use bzr svn-import or even just bzr branch svn://path/to/branch (and then bzr pull to incrementally update) [01:45] for the other way, its bzr push [01:46] lifeless: When I push, it complains that: bzr: ERROR: These branches have diverged. Try using "merge" and then "push". [01:47] I do just want to branch as I am primarily sharing out to svn in this case, bzr is the master. [01:47] grettke: try push --overwrite [01:47] jelmer: ^ [01:48] lifeless: Entered. It is working. [01:48] lifeless: I mean "running". [01:50] Um, I'd do "bzr missing" to help figure out why it thinks they're diverged. [01:50] grettke, are you pushing a new branch? [01:51] jelmer, It is "new" in that I just created it and there is nothing in it. I created it via svn mkdir before pushing. [01:51] With a new enough bzr-svn, you don't need to do that. [01:51] I've got 1.12.1 [01:52] Peng_: Understood. I shouldn't have had to. [01:53] grettke: the svn mkdir is what made the branch history different [01:54] does anyone here have access to IE? [01:54] lifeless: I see. From here forward, I can just push right to it? [01:54] grettke: yes [01:54] mwhudson: Internet Explorer? [01:55] yes [01:55] mwhudson: yes [01:55] grettke: have you used loggerhead before? [01:55] jelmer: I can't find a subvertpy directory in the Windows installation [01:55] mwhudson: no [01:55] grettke, I've just replied to the bugreport after asking jam [01:55] in any case, if you could look at http://bazaar.staging.launchpad.net/%7Eabentley/bzrtools/bzrtools.dev/changes and see if it looks ok and the js behaves that would be awesome :) [01:56] grettke, it's in a zip file in the lib directory [01:56] jelmer, oh I see you posted, agreed! [01:57] mwhudson: is a change in the UI supposed to occur after clicking on the downward facing arrow icons? [01:58] grettke: yes [02:00] grettke: i take it from your question that it doesn't? [02:00] grettke: The arrows facedownards, but nothing else. [02:00] grettke: it works ok in safari and ff if you can try those to compare [02:00] mwhudson: I Can screenshoot if you like. [02:00] * mwhudson swears [02:00] mwhudson: How about opera? [02:01] grettke: haven't tried that either [02:11] mwhudson: It does the same thing in Opera. [02:11] :( [03:42] igc, we're now getting a decent graph in http://benchmark.bazaar-vcs.org/rrd/runtime-common-suite-all.png [03:42] i haven't reenabled all the branches yet [03:42] however we're getting an error in generating the summary.html so i'm going to look at that [03:43] how to use bazaar with eclipse? [03:49] Stanlin: http://bazaar-vcs.org/BzrEclipse [03:50] it doesnt work in windows [03:50] verterok: ^ you have a fan [03:51] it simple cant pull [03:51] commits, but doesnt pull [03:52] what happens [03:52] no traffic, just fails [03:52] in debian works fine [03:54] Stanlin: well for starters please report a bug [03:54] on bzr-eclipse [03:54] is bazar cvs or vsc? [03:55] Bazaar is Bazaar. [03:57] i mean [03:57] is this a control system? [03:57] or versioning system? [04:00] Stanlin: I don't know what you mean by those terms [04:11] Stanlin: some people refer to it as one of the "distributed version control systems" (DVCS) [04:11] spiv/lifeless: in http://bazaar-vcs.org/SmartPushAnalysis1.13 in case 2/3 (push one revision), there are lots of get_parent_map calls after we've inserted the stream [04:11] apparently caused by bug 331823 [04:11] Launchpad bug 331823 in bzr "Pushing an update of a stacked branch to Launchpad sometimes takes nearly an hour" [Critical,Fix released] https://launchpad.net/bugs/331823 [04:11] poolie: not since this morning [04:11] poolie: :) [04:11] way to go robot you found kitten [04:11] spm: on bzr.dev? [04:11] poolie: new numbers are 28.7s, 19 HPSS calls [04:12] thanks [04:12] poolie: I'm just digging into why case 4 is still apparently suffering from that bug, though. [04:12] poolie: also, the only VFS calls in that 19 are read-only ones [04:13] (gets and stats) [04:14] (Actually, it looks like case 4 is suffering from a different bug that happens to be superficially similar, but it's still worth figuring out exactly what it is) [04:15] It looks like the fix to 331823 also fixed a previously unnoticed bug with update_revisions of a stacked remote branch, which has in turn revealed this issue. [04:16] http://bazaar-vcs.org/SmartPushAnalysis1.4?action=AttachFile&do=get&target=HPSS-push-bzr-logs.tar.gz [04:16] thumper: ^^ [04:17] spiv, we should add some tests about stacked branches... [04:17] spiv: a smart push analysis I think poolie means [04:17] spiv: case 8 (or 9), push a new stacked branch [04:17] poolie: already planned [04:17] Yes, definitely. [04:17] thanks guys [04:17] cool [04:18] those tables are good [04:18] i changed one of them to have three row headings: version, wall time, rpcs [04:18] thumper: push a new stacked branch, also push onto an existing stacked. [04:18] spiv: right [04:18] poolie: thanks, I was intending to do that :) [04:18] thanks [04:19] How can I create an empty Bazaar branch in a temporary directory, for use in a unit test? It seems to be missing from http://bazaar-vcs.org/Integrating_with_Bazaar. [04:19] thumper: possibly also with different combinations of modifying new files vs. modifying files whose bases are already present in the stacked branch. [04:19] spiv: I defer to your knowledge on the tests needed [04:20] jkakar: self.make_branch('foo') [04:20] jkakar: in TestCaseWithMemoryTransport or any subclass thereof [04:20] jkakar: use TestCaseWithMemoryTransport (or a subclass) -- what lifeless said [04:20] lifeless: Cool, thanks. [04:20] jkakar: you _want_ to use that to get full isolation of bzr [04:21] jkakar: http://doc.bazaar-vcs.org/latest/developers/testing.html#test-support [04:21] how to make Zend work with bazaar? [04:21] zend studio [04:21] spiv: Awesome, thanks. [04:24] Stanlin: no idea sorry [04:24] i meant [04:25] is bazaar a CVS or a SVN? [04:25] polie: that graph looks good; let me know if I can help with the summary.html issue [04:25] Stanlin: what? [04:25] poolie: ^^^ [04:25] Stanlin: its a VCS [04:25] :? [04:25] Stanlin: a DVCS even [04:25] igc i'll get back to it when thumper lets go of my ear :) [04:26] Stanlin: it's like both but much better [04:26] thumper: ? i gather you were after andrew not me? [04:26] well im asking that, because Zend has the option for CVS and SVN, dunno what to use [04:27] spm: yes [04:27] spm: tab completion sometimes gets you fist [04:27] s/fist/first [04:27] and here was me thinking 'fist' was you being excessively NZerish for 'first'... ;-) [04:27] Stanlin: what is Zend? [04:27] Stanlin: Bazaar is not a drop-in replacement for CVS or SVN [04:28] Stanlin: it works in a different (and better) way, but tools that expect to invoke CVS or SVN won't automatically work with Bazaar. [04:29] thumper: zend is a proprietary php ide [04:29] oh i see, thats why bazaar doesnt work in windows [04:29] Stanlin: Bazaar works in windows. [04:30] Stanlin: bazaar works fine in windows; did you file the bug on bzr-eclipse I asked you to? (The primary developer of bzr-eclipse is in argentina and won't be awake at the moment, so if you want the problem fixed he needs a bug report) [04:31] ok ill prepare it [04:40] thumper: End getting all value/timestamp matches to Function End took 0.0423979759216 seconds [04:42] what connection type uses bazaar? [04:42] http, ssh, sftp, https, etc [04:42] pserver? ext? extssh? pserverss? [04:43] it has equivalents to those but it's not the same protocol as cvs or svn [04:44] thumper: http://bazaar-vcs.org/Roadmap, http://bazaar-vcs.org/Roadmap/BrisbaneCore, http://bazaar-vcs.org/Roadmap/SmartServer [04:45] ... https://wiki.canonical.com/Bazaar/Migration, Bazaar/Projects [04:47] Draft Specs/Easy Workspace Setup [05:05] how to specify the protocol for bazaar? aint working with https [05:05] do i need to point to the trunk? [05:06] Stanlin: what are you trying to do? [05:10] Stanlin: you may find http://doc.bazaar-vcs.org/latest/ helpful, in case you haven't already seen it. [05:12] im trying to connect from zend [05:12] usin svn [05:13] Stanlin: bzr is not svn, if you're using svn you should seek help in a svn channel - e.g. #svn [05:13] but i want to use bzr [05:13] Stanlin: if the code you want to get access to is in a bzr branch you need to use bzr. [05:14] yeah i want to force bzr to become svn [05:14] bzr isn't svn. [05:15] It's a bit like asking for WordPerfect to be MS Word ;) [05:17] Perhaps try asking the Zend community if anyone has integrated bzr? [05:19] whats the channel for zend? [05:20] i mean, i like eclipse but we use zend framework which zend studio is perfect [05:20] ok brb [05:21] i need to sleep [05:26] hi, if i want to submit a merge directive is the email address: bazaar@lists.canonical.com ? === chx is now known as chx_sleeping [06:05] vila: ping [06:07] hmmm. I don't think he's sleeping. fullermd said real hackers never sleep [06:16] vila: please look at my comment for https://bugs.launchpad.net/qbzr/+bug/333892 [06:17] Ubuntu bug 333892 in qbzr "selftest crashed if qbzr installed without pyqt4" [High,Confirmed] [06:17] ubottu say vila about my fix [06:17] Error: I am only a bot, please don't think I'm intelligent :) [06:17] pff [06:18] ubottu: next time try harder and say this to vila [06:18] Error: I am only a bot, please don't think I'm intelligent :) [06:18] ubottu -- you're empty can [06:18] Error: I am only a bot, please don't think I'm intelligent :) [06:19] yeah, yeah. train yourself [06:23] poolie: I'm done for the day, but perhaps you'd like a small chat ? [06:24] lifeless: sure, call me? [06:25] sure [07:01] hi all [07:26] hi, how do i output a diff on a patch file? it only displays it on command prompt -- im on windows. [07:39] hi [07:42] * igc dinner [08:03] creek23: I'm not sure [08:03] creek23: is this in the gui or the console? [08:06] console [08:07] lifeless: Are you still there long enough to talk about some _commit_write_group problem I encounter in bbc ? [08:09] creek23: I thought windows supported '> filename ' syntax [08:09] ...? how do i do that? [08:09] why logger head has revisions "inverted", i mean - when looking at a revision through the web - let's say 2534 "next" button points to 2533, while previous to 2535... shouldn't it be the other way [08:09] bzr diff > foo.patch [08:18] thanks lifeless... its working now. [08:26] vila: always, but there will be latency [08:26] I'm in the middle of other things [08:27] lifeless: high latency is better than infinite latency :-) [08:28] So, the problem I encounter is that during a commit on a MemoryTree the _write_group is None when self.work_tree.update_basis_by_delta(self.rev_id, self.builder.get_basis_delta()) is called in Commit.commit() [08:28] vila: seems appropriate to me [08:28] vila: it should be None [08:28] ok [08:30] The problem is we can't build an CHKInventory then. This is where I want some input: should we even try to build one and if not why do we end up trying ? [08:30] vila: you shouldn't be building on in the working tree object :) [08:31] vila: you can _construct_ a CHKInventory, for an existing CHKInventory in the repository, outside of a write group [08:31] but update_basis applies a delta to a inventory [08:31] ... [08:31] so this is MemoryTree [08:31] which has no persistent basis [08:32] probably it just needs an overridden update_basis_by_delta - see the one in MutableTree and think about what MemoryTree needs :P [08:33] but how comes commit can work for chk without that ? [08:34] First test ever trying to run with a MemoryTree ? [08:34] when is on-disk stability for brisbane-core planned? [08:37] ronny: soon, a few weeks [08:38] vila: WorkingTree4/5 have a real apply_delta thing in there [08:38] vila: MutableTree is for WorkingTree3 and MemoryTree [08:42] lifeless: right, so that's because it's the first test using a memory tree for chk repo, right ? [08:45] I imagine so [08:45] at least the first doing a commit [08:46] lifeless: ok, thanks, that gives me the right context :) [08:48] np === serg_ is now known as serg === mvo__ is now known as mvo [09:00] ignas: i guess the idea is that you start at the tip [09:00] ignas: i agree it's a bit ass-backwards [09:01] mwhudson: i think being backwards is a binary choice - it either is or is not ;) [09:01] Hi guys. I'm confused about the distinction of repository and branch. I have my repository under DIR A, I check it out under DIR B. The strange thing is, DIR A is completely empty aside from .bzr. Is that correct? [09:02] ignas: not really, it's backwards or not depending on your state of mind :) [09:02] mwhudson: there is no spoon? [09:02] Coke: did you commit anything to DIR A? [09:03] Coke: a repository is a database, a branch is what you push and pull and checkout [09:03] you *cannot* 'check out' a repository :) [09:03] ignas: yes [09:04] ahh, you tried checking out a shared repository? [09:04] Right, still though, just did init on a new repos, did a co, added files and then ci. The repos still only has .bzr files [09:04] i did not even know you could do that [09:05] Coke: so you did something like "bzr init-repo A" "bzr init A" "bzr checkout A B" ? [09:05] lifeless: not init-repo, just init [09:05] Coke: ok [09:05] Coke: so A is a *branch* [09:05] pure and simple [09:06] uh. [09:06] ok. [09:06] I have to make them into repositories then? [09:06] 'bzr init' makes branches [09:06] no you don't need to do anything else [09:06] what does 'bzr log' report in A [09:06] Coke: you should bzr update the A branch [09:06] Coke: then the files you have commited in B will appear [09:07] ignas: yes [09:07] so, how can I make it a real repos from this branch? [09:07] Coke: it's a "real" repo [09:07] Coke: its already real. [09:07] Coke: but the working tree is only updated explicitly i think [09:07] Coke: I'm gonig to guess, that A is on a remote server [09:07] Coke: would that be right ? [09:08] lifeless: yeh, but it's mounted locally [09:08] Coke: as far as bzr is concerned, is it seeing the local mount for A, or are you using a network protocol [09:08] local mount [09:09] told you [09:09] lifeless: i just tried it locally, bzr ci in a checkout of a branch, does not update the working tree of the original branch [09:09] I'm not doubting you, I'm just making sure we're communicating clearly [09:10] ignas: right, its not == push [09:10] Coke: ok so here is whats going on; the checkout command is designed for folk wanting to emulate svn/cvs where there is a centralised spot that all commits go to [09:10] I don't need to emulate it . [09:10] lifeless: oh, so bzr ci is not just "commit locally + push", it's just something simmilar to it [09:10] I've done init-repo on my source repos now [09:11] So, what do I do to make my working copy in my home dir? not co? [09:11] ignas: bzr ci with a bound branch is a two-phase commit direct to the branch object thats checked out [09:11] I think they should have ditched the SVN terminology, if you're switching from svn it's confusing [09:12] Coke: well, given that svn repositories are also just a .svn directory on the server, I don't agree. But lets get you up and running ? [09:12] Coke: you can use checkout if you want. [09:12] what is the bzr way [09:12] Coke: alternatively you can use branch and then use push to push commits back to the other branch [09:13] Coke: bzr supports a few different ways, for different use cases [09:13] it says I cannot check out, my repos is not a branch [09:13] what the hell? [09:13] the repository has to be a branch? [09:13] right, repos are not branches. As I said above you *do not need to do anything* [09:14] lifeless: I want to see the files in the actual repos [09:14] Coke: repositories are not branches, you don't need to care about repositories at all. [09:14] Coke: Ok. We can do that. Can I ask, why you have both A and B? [09:14] What I did before 1) bzr init /sourcedir 2) bzr co /sourcedir /projectdir [09:15] lifeless: because I want versioning [09:15] all the files on the server are backed up [09:15] ok [09:15] if you're going to question/make me change our entire network setup to accomodate bzr I'll just switch source tools [09:15] I'll be slightly delayed for a bit here, real life things happening [09:15] Coke: I am not trying to do that, I'm trying to make sure I actually give you what you want. [09:16] I don't know what I want. [09:16] How is it done with BZR? [09:16] Right now I'm not even sure my commits are working properly [09:16] no files in the "repository"???? [09:16] Coke: why do you want to see the source code in /sourcedir? [09:16] Coke: you don't expect that from svn do you? [09:16] ignas: comfort? [09:16] ignas: yes [09:17] Coke: nope, svn repository is an opaque object, that you can't see inside of [09:17] Coke: so if you want to use bzr co and bzr ci - just trust it ;) [09:17] What should I use? [09:17] and when you don't trust it - go over to /sourcedir and bzr up [09:17] Like I said, I don't WANT to use anything [09:17] ignas: bzr up does not work on one of the ... I don't even know what to call it [09:18] It's NOT a repository, because I used init, not init-repo [09:18] What the hell is it? [09:18] branches, you don't need repositories [09:18] Coke: if you used 'bzr init' it is a branch [09:18] don't think about repositories [09:18] Coke: what does 'bzr info' report in that directory [09:20] We are iterating the same thing over and over. [09:20] I still don't know, do I want a repository or a branch as the one true source for my files? [09:20] you want a branch [09:20] Ok. So branch has left it's original english and programming meaning to become what used to be "repository"? [09:21] we're reiterating because you're not answering the questions I'm asking which are designed to let ignas and I know what you have configured so we can tell you what it will do [09:21] lifeless: like I've said, nevermind what I want or what I have, I want to know how to do it bzr style [09:21] Coke: no, a branch is a branch - its a line of development, the tip of a DAG [09:21] lifeless: but the main source repository isn't a branch [09:21] it may contain branches [09:21] Coke: no [09:21] (in the SVN sense) [09:22] ignas: ok [09:22] Coke: no, the main source is not a branch container [09:22]