[00:22] <lifeless> poolie: quick sanitty check
[00:22] <lifeless> /usr/lib/python2.6/dist-packages/bzrlib/transport/local.py(484)stat()
[00:22] <lifeless> that does a 'stat()'
[00:22] <lifeless> not an 'lstat()'
[00:22] <lifeless> is it just me or is that nuts ?
[00:27] <poolie> hi
[00:28] <poolie> this was discussed a while ago
[00:28] <poolie> during the review that added it
[00:28] <poolie> i can see arguments either way
[00:28] <poolie> consistency vs probably wanting to know about symlinks explicitly
[00:30] <lifeless> oh, actually.
[00:30] <lifeless> I think my package version is just a little old
[00:30] <lifeless> trunk does an lstat
[00:35] <SmileyChris> i just did a checkout lp:django and realised i should have really used a shared repo
[00:35] <SmileyChris> is there an easy way to copy a stand alone repo into a shared one?
[00:35] <lifeless> sure
[00:35] <lifeless> make a shared repo and move your branch under it
[00:35] <lifeless> then do bzr reconfigure --use-shared (It hink thats the option - --help will tell you)
[00:35] <SmileyChris> cool
[00:37] <SmileyChris> lifeless: thanks
[00:37] <poolie> lifeless: and you want it to do an lstat?
[00:37] <poolie> i think that's what i recommended
[00:37] <lifeless> poolie: trunk does an lstat, and yes thats what I want.
[00:37] <poolie> generally we want to handle symlinks explicitly/consciously
[00:37] <lifeless> 2.1.1 does a stat
[00:43] <poolie> that's slightly surprising, i thought it all landed together
[00:45] <lifeless> transport.stat is very old
[00:45] <lifeless> IIRC
[01:02] <spiv> Good morning.
[01:04] <AfC> Saw an O'Reilly book on Git. It was very confusing :)
[02:10] <lifeless> spiv: did you sleep on https://code.edge.launchpad.net/~lifeless/bzr/commands/+merge/23068
[02:10] <lifeless> ?
[02:13] <spiv> lifeless: oh right, thanks
[02:20] <spiv> lifeless: reviewed.  (Spoiler: I approved it)
[02:20] <lifeless> changes needed ?
[02:21] <spiv> Suggested a docstring change.
[02:21] <spiv> Your call on what to do with that.
[02:24] <thumper> I have a question...
[02:24] <thumper> if I call b.iter_merge_sorted_revisions(some_rev_id), i.next() is the revision I specify
[02:24] <thumper> but if I call b.iter_merge_sorted_revisions(some_rev_id, direction='forward'), i.next() is the first revision
[02:25] <thumper> as in revno 1
[02:25] <thumper> why?/
[02:25] <thumper> is it an error
[02:25] <thumper> or expected behaviour
[02:26] <spiv> thumper: The docstring does say "forward returns tuples in the opposite order to reverse."
[02:26] <spiv> And direction='reverse' is the default.
[02:26] <lifeless> spiv: thanks
[02:32] <thumper> spiv: ah
[02:45]  * igc out for a few hours
[02:48] <lifeless> thumper: hey, can I chat with you for a minute (voice) ?
[02:48] <thumper> lifeless: sure
[02:48] <thumper> lifeless: pots or skype?
[03:02] <lifeless> skype :P
[03:04] <lifeless> poolie: subunit : http://pqm.bazaar-vcs.org/
[03:05] <poolie> sounds intriguing...
[03:05] <poolie> meaning... progress bars? or it now mails back subunit spam?
[03:10] <lifeless> both
[03:11] <lifeless> the display is pqm parsing the subunit stream
[04:14] <thumper> lifeless: do you know of an object that acts like a list, but is fed by a generator and reusable?
[04:14] <lifeless> uhm
[04:15] <lifeless> I've written things that are likish that
[04:15] <lifeless> storm might have one
[04:16] <thumper> lifeless: it would make my logic much more easy to follow
[04:16] <thumper> lifeless: and still benefit from not calling a whole history operation
[04:18] <spiv> thumper: "acts like a list" meaning "indexable"?
[04:18] <thumper> spiv: no, I mean iterable again
[04:19] <spiv> Oh, reiterable.
[04:19] <lifeless> caching iterator
[04:19] <thumper> yeah
[04:19] <lifeless> http://code.activestate.com/recipes/576941-caching-iterable-wrapper/
[04:25] <lifeless> thumper: ^
[04:25] <thumper> lifeless: yeah, saw it, looks overly complicated for what I want
[04:25] <thumper> making something simpler
[04:25] <thumper> thanks though
[04:25] <lifeless> de nada
[04:36] <wolfgang00> is there anyway to get bazaar to push changes to a host filesystem? i've tried using bzr+ssh://domain.com but keep getting the error "bzr: command not found" and then ERROR: Connection closed: Unexpected end of message.
[04:37] <RAOF> wolfgang00: Just drop the “bzr+” bit of that url and you'll be able to push the changes.
[04:38] <lifeless> RAOF: bzr doesn't support ssh urls
[04:38] <lifeless> wolfgang00: you can relpace bzr+ssh with sftp
[04:38] <RAOF> Gah, of course.
[04:40] <wolfgang00> when i just use ssh: bzr: ERROR: Unsupported protocol for url "ssh://yardbutl@yardbutlerstore.com": bzr supports bzr+ssh to operate over ssh, use "bzr+ssh://user@domain.com".
[06:10] <lifeless> our network fetching really is choppy :(
[06:15] <spiv> :(
[06:16] <poolie> hi spiv
[06:16] <poolie> welcome back to full time
[06:18] <spiv> Thanks :)
[06:35] <lifeless> poolie: theres another hydrazine branch up for you, fwiw
[06:36] <poolie> heh, that's more cheering
[06:37] <lifeless> I've tested status='Queued' and it works ok on staging
[06:37] <lifeless> not flawless, but the web pages don't blow up
[06:38] <bialix> igc: ping
[07:14] <poolie> hi bialix
[07:36] <igc> hi bialix
[07:38] <lifeless> poolie: I have a fairly big hydrazine change
[07:39] <lifeless> lp:~lifeless/hydrazine/cron - I hope you'll like it
[07:39] <poolie> k
[07:39] <poolie> hi igc
[07:39] <poolie> i was just merging some of them now actually
[07:39] <igc> hi poolie
[07:40] <lifeless> poolie: I'm calling it a day
[07:41] <lifeless> poolie: if you want to talk this one through with me before I sign off, I'd be delighted to do so.
[07:41] <lifeless> poolie: btw tomorrow mornign I'll be awolish - popping up to the doctor at sparrows fart
[07:46] <poolie> wow, interesting
[07:46] <poolie> let's chat tomorrow afternoon?
[07:47] <mwhudson> spiv: do you have any ideas on how to test the ssh rekeying thing locally?
[07:48] <mwhudson> it would be good to test both paramiko against an openssh server and openssh client against conch i guess
[07:49] <spiv> mwhudson: manually hack REKEY_BYTES in paramiko/packet.py, maybe?
[07:51] <lifeless> poolie: ok
[07:51] <mwhudson> spiv: ah, that might work
[07:51] <lifeless> poolie: I have some personal stuff to organise with you too, this week before the weekend if at al possible
[07:52] <spiv> mwhudson: it's possible there's something in conch for that too
[07:52] <spiv> mwhudson: I don't know if it's something either side can trigger
[07:52] <mwhudson> spiv: ah, i was going to say
[07:52] <mwhudson> i /thought/ it was a client side thing
[07:52] <mwhudson> maybe not though
[07:52] <spiv> mwhudson: maybe Conch gets confused if both sides trigger at about the same time? ;)
[07:53] <mwhudson> spiv: oh god, if it's that complicated someone else can fix it :)
[07:53] <mwhudson> although noone will :/
[07:54] <spiv> mwhudson: heh
[07:54] <spiv> mwhudson: thinking of concurrency, I happened to see your lp code review about CachingIterator, and you need to be more devious :)
[07:54] <spiv> mwhudson: I sent mail explaining how :)
[07:54] <mwhudson> spiv: "don't use it with threading"
[07:55] <spiv> mwhudson: pfft
[07:55] <mwhudson> ah i see
[07:55] <spiv> mwhudson: I don't need no stinking threads to break stuff ;)
[07:55] <mwhudson> spiv: does thumper's update work better with your code?
[07:55] <spiv> Haven't seen it, so don't know.
[07:56] <spiv> If it does better than giving three different answers, all wrong, then that's a start :)
[07:58] <vila> hi all
[07:58] <lifeless> vila: hi!
[07:58] <lifeless> vila: hey, lost+found merges; is that in progress, or just something we've been discussing
[08:01] <vila> lifeless: still not in progress but my next target once I come back to conflicts
[08:01]  * mwhudson becomes a little stabby trying to get paramiko to connect to launchpad.dev
[08:07] <igc> hi vila, spiv
[08:07] <igc> hi mwhudson
[08:07] <vila> hi Ian
[08:07] <poolie> hi vila
[08:07] <vila> hi  poolie
[08:08] <mwhudson> igc: hello
[08:12] <mwhudson> spiv: it's conch
[08:12] <spiv> mwhudson: \o/
[08:13] <spiv> mwhudson: I guess the rekeying logic in conch is not carefully unit tested...
[08:13] <spiv> mwhudson: btw
[08:13] <spiv> mwhudson: thumper's updated code is differently broken :)
[08:13] <mwhudson> spiv: what an outrageous accusation
[08:14] <mwhudson> (both of those!)
[08:15] <mwhudson> spiv: what are the chances that the hardest part of fixing this upstream will be figuring out how to test it
[08:16] <spiv> mwhudson: depressingly high :(
[08:23] <mwhudson> i wonder if it's something as dumb as the server continuing to send the data from the subprocess while key exchange is happening
[08:24] <spiv> mwhudson: that sounds quite plausible.
[08:24] <thumper> spiv: what update code?
[08:25] <mwhudson> what also sounds plausible is that it's time for dinner
[08:26] <spiv> thumper: your CachingIterator has bugs, see my post to the code review
[08:26] <thumper> spiv: do you have a solution too?
[08:27] <MvG> Has Command.pligin_name() been deprecated or something? Doesn't seem to work on my bzr 2.1.1 any more, though it used to in the past.
[08:27] <mwhudson> spiv: is there any way i can change what options bzr passes to ssh?
[08:27] <spiv> thumper: no, although simply raising an exception if someone tries to use it re-entrantly would probably be adequate.
[08:27] <mwhudson> spiv: other than "hack the source dummy"
[08:28] <spiv> mwhudson: write a plugin to override the ssh vendor implementation, dummy? :)
[08:28] <spiv> mwhudson: (no)
[08:28] <mwhudson> luckily i can use .ssh/config for this
[08:32] <mwhudson> ah "cool" can reproduce with openssh as well as paramiko
[08:33] <spiv> mwhudson: That's... "good"  :)
[08:34] <mwhudson> yeah
[08:35]  * mwhudson files a twisted bug
[08:47] <poolie> spm, can you answer the mail thread about bzr-email and the hpss chroot?
[08:48] <spm> poolie: which list?
[08:48] <spiv> poolie: you me, perhaps?
[08:48] <poolie> oops, i did mean spiv
[08:48] <spiv> "you mean me", rather.
[08:48] <spiv> Obviously it's too late in the day to expect accurate typing :)
[08:48] <spm> spiv: which should so do a nick change and really confuse people - som april fools ideas just come too late....
[08:49] <vila> poolie: could you land your 2.2b1 branch into lp:bzr/2.0 ? That would make it easier to track what is in the corresponding 2.2b1 tarball
[08:49] <poolie> do you mean into bzr/2.2?
[08:49] <vila> poolie: what ? You still can't parse my typos ? :-/ Yeah I meant lp:bzr/2.2 of course
[09:23] <poolie> vila, sure, i'll try to do that soon
[09:24] <vila> poolie: thanks !
[09:24] <bialix> hi all
[09:27] <igc> hi bialix, spm
[09:27] <bialix> hi igc
[09:29] <bialix> igc: I think I also need CRT90 redistributable?
[09:30] <bialix> igc: I don't trust the tools that I don't understand
[09:33] <igc> bialix: yes, you'll need that
[09:33] <igc> bialix: do you have VS 2008?
[09:33] <igc> bialix: http://www.py2exe.org/index.cgi/Tutorial#Step52
[09:33] <bialix> igc: no, I haven't
[09:34] <igc> bialix: thei nstaller code tries to implement that process
[09:34] <igc> installer
[09:35]  * bialix reads
[09:35] <igc> bialix: http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en
[09:35]  * bialix starts to think using buildout is not the best idea
[09:37] <igc> bialix: my feeling is that buildout is not the best fit here - wget + bzr would be less complex and more reliable IMO
[09:38] <bialix> igc: maybe I should install VC2008 Express?
[09:38] <bialix> http://www.microsoft.com/express/Downloads/#2008-Visual-CPP
[09:39] <bialix> igc: I think my traceback caused by damaged svn-1.6.6.zip file.
[09:39] <igc> bialix: can you remember why we need pywin32? Was it needed for tbzr packaging?
[09:39] <bialix> *svn-win32-1.6.6.zip
[09:39] <igc> bialix: got to run
[09:39] <igc> delete that corrupted zip and try again
[09:39]  * igc dinner
[09:39] <bialix> pywin32 is must have for windows and bzr
[09:39] <bialix> igc: bon appetit and gnight
[09:43] <bialix> igc: deletinbg file does not help: I have the same problem again
[10:47] <millun> hi
[10:48] <millun> just wondering... what if i use colocated tree model and happen to delete the whole directory?
[11:26] <jelmer> millun: how do you mean?
[11:56] <millun> jelmer: if i delete the php project (not intentionally) including the .bzr directory
[11:56] <millun> i am screwed right? i use bzr explorer. i obviously should PUSH quite often?
[11:57] <millun> to some remote repository
[11:57] <jelmer> millun: yes
[11:57] <jelmer> unless you're using a shared repository that you haven't deleted?
[11:57] <millun> no, i am not using a shared repository (not quite sure what you mean by that). i come from SVN, u know
[11:58] <millun> i use "colocated branches"
[11:59] <millun> because that's what i've learned in the tutorial
[11:59] <jelmer> millun: colocated branches aren't an officially supported feature
[12:00] <jelmer> millun: what tutorial was this?
[12:00] <millun> on the official pages
[12:00] <millun> lemme look it up
[12:01] <millun> http://doc.bazaar.canonical.com/explorer/en/guide/processes/starting_a_project.html
[12:01] <millun> at the very end
[12:02] <millun> In most cases, the best model comes down to personal preference. In some case though, the colocated branches model is the only choice, e.g. if you want to version control files in a special location (like /etc or a set of web-server configuration files).
[12:04] <jelmer> igc: hi
[12:04] <jelmer> igc: The starting_a_project page seems to use the term colocated branches for something different than we do elsewhere
[12:19] <lifeless> gnight
[14:59] <cr3> how can I create a branch which only contains code until a specific revision and not the subsequent revisions? the problem is that I forgot to create a milestone at some point for my project and I now need to go back in time to create a bugfix for an earlier milestone
[15:01] <rubbs> cr3: it's been a while since I've done it, but you can do the branch command with -r rev# it should work
[15:01] <rubbs> like this bzr branch -r 2.3.1 ./ ./new
[15:01] <rubbs> IIRC that is. you can do bzr help branch to make sure I got the syntax right
[15:03] <cr3> rubbs: seems like you got it right, thanks!
[15:04] <rubbs> np
[17:11] <Lo-lan-do> Hi all
[17:12] <Lo-lan-do> I hacked a bzr-gc.sh script (http://paste.debian.net/68592/), does it make you run away screaming?
[17:16]  * fullermd runs and screams.
[17:23] <__monty__> How would I go about fixing this bug: https://bugs.launchpad.net/bzr/+bug/45599 ?
[19:13] <wolfgang00> is it possible to push files to a remote server? ive tried bzr push sftp:// but i get the error This transport does not update the working tree
[19:17] <gioele> wolfgang00: use the bzr-upload plugin
[19:17] <gioele> push will push only the branch-related info, not the real files
[19:30] <wolfgang00> hmmm. when i use bzr upload i get the message "bzr: ERROR: Cannot upload to a bzr managed working tree:"
[19:42] <jelmer> wolfgang00: bzr upload is only for non-bzr managed trees
[19:43] <jelmer> wolfgang00: I mean, it can only update a remote tree without a .bzr directory
[19:44] <wolfgang00> jelmer: so is there a way to upload to a bzr managed tree? im not entirely opposed to just removing the .bzr folder and not having it managed but its been a nice feature up till now.
[19:47] <IslandUsurper> wolfgang00, there's the push-and-update plugin
[19:52] <wolfgang00> IslandUsurper: do i have to then use checkouts?
[19:59] <IslandUsurper> wolfgang00, no, you just push from one branch to the other, and push-and-update runs `bzr update` over ssh
[20:22] <jam> vila: if you are still around, /wave
[20:50] <wolfgang00> with push and update installed i get "This transport does not update the working tree of: ..." still
[20:51] <IslandUsurper> wolfgang00, it lies
[20:51] <IslandUsurper> a bug has been filed
[20:51] <IslandUsurper> but you should log in to the other server to make sure
[20:52] <IslandUsurper> you can see it say "running ssh bzr update" right?
[20:56] <wolfgang00> i do not get it running bzr update.
[20:57] <wolfgang00> it pushes the changes but i have to do update manually
[21:42] <IslandUsurper> when you do `bzr hooks`, do you have update-after-push under "BranchHooks: post_push:" ?
[21:42] <IslandUsurper> wolfgang00 ^^
[21:43] <dougx> How do I delete a branch?
[21:46] <awilkins> dougx, delete the folder
[21:47] <dougx> awilkins: thanks
[21:47] <awilkins> dougx, if it's in a shared repo, the revisions will remain but they will have no accessible tip
[21:47] <dougx> ok, I see
[21:47] <dougx> done:-)
[21:48] <wolfgang00> ok figured out the push and update plugin was not installed properly. thats fixed but when i run bzr push i get the error that ssh cannot find the file specified but it looks like its dropping the ~ out of the location
[21:53] <matt2000> Hi. I'm trying to upgrade an Ubuntu Jaunty server to Bazaar 2.x. I've added the PPA source to apt, but it's still nto upgrading it. Am I missing something?
[23:33] <wolfgang00> when i try to push to a remote server i get the error "ssh yardbutl@yardbutlerstore.com bzr update "public_html/testing.yardbutlerstore/" its dropping the ~/ from public_html
[23:35] <wolfgang00> and i do not seem to have update-after-push under branchhooks