[00:01] <spiv> Good morning
[00:01] <LeoNerd> abentley: OK... could you suggest a better one?
[00:01] <poolie> hello
[00:01] <poolie> spiv, igc call now
[00:02] <abentley> already did: Graph.is_ancestor or Graph.heads.
[00:03] <LeoNerd> Yes, but I don't know anything of bzrlib. That sounds like an abstract data set sort of thing... how do I hook that up?
[00:03] <LeoNerd> Perhaps you could rewrite my ancestor_of() function?
[00:03] <abentley> branch.repository.get_graph().is_ancestor()
[00:04] <LeoNerd> Hmm.. OK.. I'll try that out
[00:05] <abentley> using heads is actually better, because it will tell you which one is the ancestor or else tell you that they are diverged with one call.
[00:06] <abentley> If you get two results for a heads call, they are diverged.  If you get one head, it is the descendant of the other.
[00:07] <LeoNerd> From what "heads" call..?
[00:08] <abentley> Graph.heads
[00:08] <LeoNerd> But surely each branch individually will only have one head?
[00:08] <LeoNerd> Which is surely just the last_revision ID?
[00:09] <abentley> Graphs represent the revision graph of the repository.
[00:09] <abentley> They have no direct relationship to the branch.
[00:09] <LeoNerd> Yes. But we're comparing two branches here, each with its own repository. (I hope - the point should be they're on different machines)
[00:09] <LeoNerd> The idea is I put this in cron.daily between my two machines, to keep my repo. backed up
[00:10] <abentley> Graphs may also represent the combined revision graph of two repositories.
[00:10] <LeoNerd> Ah. See, I hadn't got that bit
[00:10] <abentley> You just do branch.repository.get_graph(other_branch.repository)
[00:10] <LeoNerd> Right. and that's the combined one?
[00:11] <abentley> Yes.
[00:11] <LeoNerd> I suppose symmetrically, so it doesn't matter which I really call
[00:12] <abentley> This is true, but there are performance implications.
[00:13] <abentley> other_branch should be the remote branch, if possible.
[00:13] <LeoNerd> OK
[00:16] <LeoNerd> Hm. I may play with that tomorrow instead in fact.. it's getting quite late
[00:26] <poolie> beuno: hello?
[00:27] <beuno> poolie, morning  :)
[00:27] <lifeless> poolie: did you put that sketch-of-a-debconf-talk together and I missed it ?
[00:28] <poolie> lifeless: no, it never got to the top of my queue :/
[00:51] <lifeless> I have a design problem
[00:51] <lifeless> I think I'm being overly generic
[00:52] <lifeless> actually, I'm wrong, I'm not. It was just the order I was writing a test in.
[02:30] <Noia> ok, I've installed bzr on my ubuntu server
[02:30] <Noia> how to I interact with it from my mac?
[02:31] <bob2> install bzr on your mac
[02:33] <Noia> ohai bob2
[02:35] <Noia> I'm trying to set up a repo system on one of my servers and its the first time I'm using bzr and  I wouldn't say I'm too accustomed to working with things like this (except tortoise SVN)
[02:36] <Noia> ok so I have bzr on my mac and my server...how do I set up the repo on the server and sync them ?
[02:38] <poolie> Noia: did you read http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html ?
[02:39] <Noia> I read the really skinny guid
[02:43] <poolie> so, basically
[02:43] <poolie> use bzr push, pull and merge to move changes between your mac and your server
[02:44] <Noia> I need to do something like this though right?
[02:45] <Noia> bzr branch sftp://bill@mary-laptop/cool-repo/cool-trunk
[02:46] <bob2> to initially branch it onto your machine, yes
[02:48] <Noia> do I need to set up anything specific on the server side or does it just use the file system?
[02:49] <poolie> Noia: if you use sftp it will just use the filesystem
[02:49] <Noia> ok
[02:49] <poolie> if you use bzr+ssh you need to install bzr on the server, but no more
[02:50] <rolly> and ssh :)
[02:50] <Noia> I've got bzr on the server
[02:50] <Noia> I just don't get this thing though >.<
[02:51] <Noia> I've used CVS and SVN before but SVN was through tortoise, so I'd hadly say it was difficult, and CVS was some years ago now
[02:51] <Noia> so I'm getting quite confused >.>
[02:52] <bob2> which bit don't you get?
[02:53] <abentley> Noia: Repositories are not a central concept in Bazaar.  They provide a space optimization, but they are not a necessary step.
[02:53] <Noia> getting the workflow going seems awefully complex
[02:53] <Noia> abentley, yea thats sort of different
[02:53] <abentley> It seems like you are expecting to do more than you actually have to.
[02:54] <bob2> so, you have a branch on a remote server.  "bzr branch sftp://blah" creates a branch of that on your local machine.  you update your local branch with remote changes with "bzr pull", you push changes back with "bzr push"
[02:54] <Noia> alright
[02:55] <Noia> since I'm running bzr on the server, would it be preferable to run bzr through ssh rather than sftp ?
[02:56] <Noia> I suppose that might yield better user control since you can spec it against the ssh login
[02:57] <foom> yes, it'll be faster too, since it'll use the "smart server"
[02:57] <Noia> hmmm
[02:57] <Noia> alright, how do I set that up?
[02:58] <bob2> is 'bzr' in your PATH on the server?  ie does "ssh host bzr version" work?
[03:02] <Noia> if I ssh in and type bzr version then it works yes
[03:03] <bob2> you can probably just use bzr+ssh:// instead of sftp:// then
[03:03] <Noia> ok
[03:03] <Noia> so er....how? lol
[03:04] <bob2> bzr branch bzr+ssh://blah/blah
[03:07] <Noia> error, not a branch
[03:10] <lifeless> Noia: what exact path are you using, if I may ask ?
[03:11] <Noia> I'm using /repo/noia
[03:11] <Noia> repo is 0777 noia is chown to noia, the user I'm sshing into
[03:11] <lifeless> you're not using ~ in there at all ?
[03:11] <Noia> nope
[03:11] <lifeless> ok, thats weird
[03:11] <Noia> I saw the bug :)
[03:11] <lifeless> and sftp works ?
[03:11] <Noia> not tried sftp
[03:12] <Noia> but I can ssh in, it asks for password so
[03:12] <spiv> And "bzr ... bzr+ssh://..." asks for a password too?
[03:12] <lifeless> have you created a branch?
[03:12] <lifeless> (repositories are not branches, they contain branches)
[03:12] <Noia> spiv, yes it asks for a password
[03:13] <Noia> lifeless, er...no?
[03:13] <Noia> I've only run bzr branch bzr+ssh://....
[03:13] <lifeless> then it is unsurprising that you get NotABranch :P
[03:13] <Noia> lol
[03:13] <Noia> alright, what am I doing wrong >.<
[03:14] <spiv> Noia: "bzr branch" makes a copy of a branch, it doesn't create one.
[03:15] <spiv> Noia: so if you don't have a branch yet, it'll give the "not a branch" error :)
[03:15] <Noia> oh
[03:15] <Noia> durr -_-
[03:15] <spiv> "bzr init" makes a branch
[03:16] <Noia> Branched 0 revision(s).
[03:16] <Noia> w00t
[03:29] <Noia> It wont work! waaaaaah
[03:30] <Noia> so I've got my remote repo, and I've branched to it, and I've got my local repo and I've init'd them both, and when I use bzr commit, it asks for server side password, but it doesn't push any data. When I run bzr push, it says theres no location specified to push to
[03:30] <Noia> did I miss something?
[03:30] <lifeless> it sounds like you want to work like cvs
[03:30] <lifeless> or sv
[03:30] <lifeless> to do that
[03:30] <lifeless> just do 'bzr checkout bzr+ssh://host/repo/noia/branch localpath'
[03:31] <lifeless> cd localpath
[03:31] <lifeless> do stuff
[03:31] <lifeless> bzr commit
[03:31] <lifeless> but that said, what do you mean 'it doesn't push any data' ?
[03:32] <Noia> Committing to: bzr+ssh://noia@nodetoad.com:2200/repo/noia/
[03:32] <Noia> bzr: ERROR: no changes to commit. use --unchanged to commit anyhow
[03:32] <bob2> you need to make some changes before there is any point committing...
[03:33] <Noia> I've added folders and files >.>
[03:33] <bob2> as in "bzr add filename filename folder"?  does "bzr status" show them as "A"(dded)?
[03:35] <lifeless> we have quickstart documentation; you might find that useful to read :P
[03:36] <jdobrien> with a sweet printable reference card (PDF)
[03:37] <Noia> I suspect I've bound this wrong >.>
[03:38] <bob2> if you used bzr checkout, then it is already correctly bound to the branch you checked out
[03:40] <lifeless> Noia: what does 'bzr st' show ?
[03:40] <Noia> unknown:
[03:40] <Noia>   noia/
[03:41] <Noia> I'm pretty certain I've done it wrong
[03:41] <Noia> ok
[03:42] <Noia> how do I unbind and remove all bzr info on a specific folder etc
[03:42] <bob2> Noia: http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html
[03:42] <Noia> just scrap this first thing and start again >.>
[03:43] <lifeless> Noia: rm -rf :P
[03:43] <Noia> =\
[03:43] <Noia> so is it just the .bzr folder ?
[03:43] <lifeless> roughly :P
[03:46] <Noia> oh dear god vim
[03:46] <Noia> help
[03:46] <Noia> I'm stuck in vim >.<
[03:47] <poolie> lol
[03:48] <poolie> did you escape?
[03:48] <spiv> Noia: a prompt for a commit message, I guess? :)
[03:48] <poolie> remember :qa!
[03:48] <Noia> I escaped
[03:48] <fullermd> Once you get into ex mode, it's easy   :p
[03:49] <Noia> bzr: ERROR: Could not start any editor.
[03:49] <Noia> well atleast its progress
[03:55] <jdobrien> noia: you're not alone
[03:59] <Noia> ok...now were getting somewhere
[04:04] <Noia> dah, conflict >.<
[04:25] <lifeless> is there a grue ?
[04:25] <fullermd> Dunno.  How do you light the lantern?
[04:26] <lifeless> use matches
[04:26] <fullermd> Crap.  I dropped the matches so I could pick up this gem...
[04:26] <lifeless> drop gem
[04:27] <lifeless> get matches
[04:27] <lifeless> use matches
[04:27] <lifeless> is there a grue ?
[04:27] <fullermd> AS&$+++   NO CARRIER
[04:28] <jdobrien> Syrnia?
[04:29] <jdobrien> EverCrack
[04:29] <bob2> zork
[04:30] <jdobrien> i don't touch RPG...MajorMudd nearly ended my marriage
[04:31] <rockstar_> Sounds like a problem with dependencies
[04:32] <fullermd> I think you can script around that with a good client.
[04:33] <Noia> yay
[04:33] <rockstar_> Actually, my wife library is pretty stable.  Requires little maintenance
[04:33] <Noia> now I have a truly epic system :D
[04:34] <Noia> lol
[04:35] <rockstar_> It also supports me writing stupid code that never goes anywhere.
[04:35]  * Noia reads up and realises hes taken a step back into the past
[04:36] <lifeless> poolie: transaction backout patch sent
[04:59] <jml> hi
[05:00] <jml> I just noticed that 'bzr st' on my project has gone down from 1+ seconds to about 0.5 seconds between 1.3 and bzr.dev.
[05:00] <jml> well done guys
[06:07] <ubotu> New bug: #62904 in bzr "merge from bundle should allow revision specification" [Low,Confirmed] https://launchpad.net/bugs/62904
[06:07] <ubotu> New bug: #62905 in bzr "smart server is noisy on disconnection" [Medium,Confirmed] https://launchpad.net/bugs/62905
[06:11] <ubotu> New bug: #77753 in bzr "bzr break-lock should take --local argument" [Medium,Confirmed] https://launchpad.net/bugs/77753
[06:11] <ubotu> New bug: #86917 in bzr "option help text grammar is inconsistent" [Wishlist,Confirmed] https://launchpad.net/bugs/86917
[06:11] <ubotu> New bug: #86919 in bzr "transport shouldn't indirect through control_files" [Medium,Confirmed] https://launchpad.net/bugs/86919
[06:17] <poolie> jml: yay
[06:26] <ubotu> New bug: #208017 in bzr "bzr error message for http 500 series error codes is invalid" [Low,Confirmed] https://launchpad.net/bugs/208017
[06:31] <ubotu> New bug: #201907 in bzr "bzr crashed with NoSuchFile in _translate_error()" [Medium,Confirmed] https://launchpad.net/bugs/201907
[11:05] <ubotu> New bug: #218575 in bzr "Rebase fails when the remote and local repositories have not diverged and the local repository is behind the remote repository." [Undecided,New] https://launchpad.net/bugs/218575
[13:23] <nekohayo> ping james_w, is there an ETA on bzr being able to merge rich-root-pack branches into a regular pack-0.92?
[13:23] <james_w> nekohayo: no idea I'm afraid.
[13:24] <nekohayo> weeks? months? :)
[13:24] <james_w> there's a growing number of duplicates of that bug.
[13:24] <nekohayo> yeah I saw that
[13:24] <james_w> I would hope before 1.4, but that's not long now.
[13:25] <nekohayo> is there a roadmap?
[13:25] <james_w> not that I know of.
[13:25] <james_w> releases are monthly
[13:25] <jelmer> nekohayo: rich root pack branches will never be mergeable into 0.92 branches
[13:26] <jelmer> nekohayo: however, a future default format in bzr will support merging rich root branches
[13:26] <nekohayo> jelmer: ah!
[13:27] <nekohayo> I thought for a second that it would never be possible to merge svn stuff into bzr
[13:27] <nekohayo> :)
[13:27] <jelmer> nekohayo: You can also upgrade "regular" bzr branches to the rich root format already
[13:27] <james_w> jelmer: that's true, but the bug in question is https://bugs.edge.launchpad.net/bzr/+bug/177874
[13:27] <ubotu> Launchpad bug 177874 in bzr "upgrading to rich-root-pack fails" [Critical,Confirmed]
[13:29] <nekohayo> then when is that new format planned to be in use as the default?
[13:33] <james_w> nekohayo: hopefully we'll have one for 1.5
[15:44] <igc> night all
[16:49] <nexus10> hi
[16:50] <nexus10> Is there any viable way to use bzr as a front end to a git repo?
[16:52] <jelmer> nexus10: not yet
[16:55] <nexus10> jelmer: ok, ta. Anything on the horizon? Git is just such an .... 'interesting' piece of kit
[16:56] <james_w> nexus10: https://launchpad.net/bzr-git
[16:56] <james_w> it's still a work in progress
[16:56] <nexus10> james_w: thanks, saw that -- that's the most likely project to get this working?
[16:57] <james_w> yes, I think so.
[16:57] <james_w> bzr-fastimport may also help somehow
[16:58] <nexus10> I really need full roundtrip
[16:58] <nexus10> rw
[16:58] <nexus10> jelmer, james_w: thanks a lot -- I'll monitor that project
[17:34] <tolstoy> Anyone have a recommendation for a web based BZR browser you can install in your public_html (for instance) folder?
[17:38] <asabil> tolstoy: loggerhead ?
[17:39] <tolstoy> asabil: Looking at it right now, actually!  Alas, their example server is down.
[17:39] <james_w> bazaar-webserve is the alternative
[17:39] <tolstoy> Hm. Loggerhead hasn't seen much development in the past two years.
[17:39] <james_w> http://bazaar.launchpad.net/~bzr/bzr/trunk/files
[17:39] <james_w> that's loggerhead
[17:40] <tolstoy> bazaar-webserve is the one used by launchpad?
[17:40] <tolstoy> james_w: Thanks for the link!
[17:40] <james_w> nope, they use loggerhead
[17:40] <tolstoy> BTW, I'm trying to get my company to move from cvs to bzr, rather than to svn, but it's a hard sell!
[17:40] <tolstoy> Ok.
[17:41] <tolstoy> My company uses Atlassian tools (sp?) and so there's a bit of an issue there, too.  I'm still hoping, though.
[17:53] <tolstoy> Hm. Logger head doesn't seem set up to visualize a directory tree of many, many branches.
[18:22] <vimes656> While working in a branch I realize that the changes I'm doing should be branched out, how do I branch out with uncommited changes?
[18:23] <beuno> vimes656, I belive you can do bzr branch --uncommited
[18:23] <beuno> but I'm not 100% sure
[18:23] <LarstiQ> merge --uncommitted perhaps
[18:24] <beuno> ah, that's it, merge
[18:29] <vimes656> LarstiQ: then I have to create first an empty branch and merge the one I was working on, right?
[18:30] <LarstiQ> vimes656: I'd cd ..; bzr branch -r -1 previous new; cd new; bzr merge --uncommitted ../previous
[18:30] <vimes656> LarstiQ: that will work, thanks
[18:31] <LarstiQ> vimes656: and then revert in previous. Alternatively (for example if you don't have loads of object files), just mv the current tree to a new name, and bzr branch -r new previous
[18:32] <vimes656> LarstiQ: yeah, that's better in my case, thanks a lot
[18:32] <vimes656> bzr is great, BTW
[18:33] <vimes656> the more I work with it the more I like it
[20:22] <plexq> I'm getting an error running bzr: ImportError: cannot import name RevisionInfo
[20:23] <luks> check the full traceback from ~/.bzr.log
[20:28] <plexq> http://pastebin.com/m64621cf4
[20:31] <mw> whoa, bzr status got way faster since the last time i tried it against a large tree
[20:31] <mw> nice work
[20:32] <mw> commit too
[20:34] <plexq> fixed it
[20:36] <abentley> plexq: what was it?
[21:20] <plexq> bad install
[21:20] <plexq> I re-installed all the files in site-packages/bzr and it worked fine
[21:20] <plexq> anyway
[21:20] <plexq> is there anything like gitk for bzr?
[21:21] <abentley> plexq: Yes, bzrk in the bzr-gtk plugin.
[21:21] <plexq> thats awesome
[21:21] <abentley> Actually, I guess it's called "viz" now.
[21:40] <plexq> hmm I can't get olive-gtk to run
[21:40] <plexq> it says I don't have libglib.dll or somesuch
[21:40] <plexq> but gtk2.0 is in site-packages
[21:40] <plexq> and I have gtk installed
[21:44] <mw> .dll? :)
[21:44] <mw> running on windows?
[21:45] <plexq> yup
[21:45] <mw> i'd like to help, but i wouldn't know where to start, sorry
[22:59] <igc> morning
[23:00] <jam> morning igc, up early?
[23:01] <igc> jam: I've been starting this early most of the week - just haven't been on IRC this early :-)
[23:02] <jam> lifeless: just as a pack repo data point, doing 'bzr log -r 10' grabs revision_history to evaluate the '-r 10'
[23:03] <jam> lifeless: there are 3374 calls to iter_reverse_revision_history
[23:03] <jam> which generates 3373 calls to get_parent_map()
[23:03] <jam> which generates 6758 calls to "iter_entries()"
[23:03] <jam> which generates 30411 calls to index:459(iter_entries)
[23:04] <jam> I'm guessing the 3373 => 6758 is because the second call has to finish out the generator and then get StopIteration raised
[23:04] <jam> And then I'm guessing the 6758 => 30411 is because of pack misses
[23:05] <jam> That repo currently has 17 packs
[23:06] <jam> well, it has 17 files in 'packs' there are only 13 entries in 'pack-names'
[23:06] <jam> it is: http://bazaar.launchpad.net/~bzr/bzr/trunk/
[23:06] <jam> not sure why there are 4 'cruft' packs.
[23:13] <lifeless> jam: iter_entries - is this a fully packed repo?
[23:13] <jam> lifeless: no
[23:13] <jam> it is the launchpad mirror of bzr.dev trunk
[23:13] <lifeless> ok
[23:14] <lifeless> not sure what would lead to cruft packs
[23:14] <lifeless> anyhow, I do think we should get instrumentation like I discussed in my mail in place where it is missing
[23:58] <poolie> good morning