[00:09] <RenatoSilva> how to write a multi-line commit comment in command line?
[00:11] <Peng_> RenatoSilva: That's a question for your shell, nothing bzr-specific.
[00:13] <Peng_> It works automagically in bash. You can just hit Enter while writing a string. But I dunno about any other shells.
[00:13] <Raim> if you do not trust that, you can use a file for the message: bzr commit -F msg.txt
[00:13] <RenatoSilva> ok
[00:14] <Raim> but actually I would prefer using a real editor
[00:15]  * RenatoSilva trying to find how to do that in windows
[00:19] <mneptok> cygwin?
[00:20] <RenatoSilva> I use MinGW
[00:42] <igc> morning
[00:43] <igc> hi mneptok!
[00:53] <superm1> hey guys.  i'm having a hard time pulling a new reversion: [mlimonciello@devel mythbuntu-weekly-build]$ bzr pull
[00:53] <superm1> Using saved parent location: http://bazaar.launchpad.net/~mythbuntu/mythbuntu/mythbuntu-weekly-build/
[00:53] <superm1> bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/~mythbuntu/mythbuntu/mythbuntu-weekly-build/.bzr/branch/lock): Transport operation not possible: http does not support mkdir()
[00:53] <superm1> any suggestions?
[00:54] <verterok> igc: hi
[00:54] <Peng_> superm1: What version of bzr?
[00:55] <superm1> Peng, should be a freshly installed 2.0.0
[00:55] <Peng_> superm1: Just for fun, try "bzr --no-plugins pull".
[00:55] <superm1> Peng, same thing
[00:55] <wgrant> superm1: Did you 'bzr co' from an HTTP URL? It sounds like you have a branch bound to an HTTP URL.
[00:55] <wgrant> (in which case 'bzr up' is what you want, not 'bzr pull')
[00:56] <verterok> igc: good news! I finally got a working installer for PyQt+sip, but only for OS X 10.5...I need to work on the 10.4 version
[00:56] <Peng_> Ooooh.
[00:56] <superm1> wgrant, well this c/o was from ages ago.  since then the branch got upgraded to 2a, and i had to upgrade bzr, and then it stopped working
[00:56]  * Peng_ goes /away
[00:56] <wgrant> superm1: It shouldn't be related to the upgrade.
[00:56] <superm1> wgrant, bzr up does the same thing :(
[00:56] <wgrant> superm1: pastebin 'bzr info -v'
[00:57] <superm1> wgrant, it looks like it might have been something related to being bound to HTTP though. i just did bzr unbind, and it's doing more stuffs
[00:57] <superm1> yup, that worked swimmingly! thanks!
[00:58] <wgrant> Strange.
[00:59] <poolie> hello all
[00:59] <poolie> hi igc, are you at work today?
[00:59] <verterok> hi poolie
[01:00] <GaryvdM> Hi igc.
[01:00] <igc> hi verterok. Very well done. Even getting the Leopard one out will be huge step forward!
[01:00] <igc> hi poolie. Are you back in Oz today?
[01:00] <igc> hi garyvdm!
[01:00] <poolie> hi, i am
[01:00] <poolie> i'm just cleaning up my receipts and office atm
[01:00] <igc> poolie: I'm well thanks
[01:01] <poolie> glad to hear it
[01:01] <igc> poolie: just arrive back this morning? Must be tired I'd imagine
[01:01] <poolie> yesterday morning
[01:01] <poolie> slept a lot, ok now
[01:01] <poolie> for the moment :)
[01:02] <igc> :-)
[01:03] <GaryvdM> superm1: This is a guess... Maybe you have the webdav plugin, but that location does not support webdav.
[01:04] <GaryvdM> superm1: If you have a launchpad account, with a ssh key set up, then set bzr launchpad-login, and run bzr pull lp:~mythbuntu/mythbuntu/mythbuntu-weekly-build/.
[01:05] <igc> poolie: a new qbzr (0.14.3) is out which fixes a bad bug in TortoiseBzr apprently
[01:05] <GaryvdM> Tha will then use bzr+ssh
[01:05] <igc> poolie: I'm not sure if it's serious enough to warrant rebuilding the Windows installer for. GaryVdM may know
[01:06] <igc> poolie: otherwise, I'm hoping you're keen to make the big announcement today.
[01:06] <igc> poolie: we don't want it coming out after the 2.1.0b1 one :-) :-)
[01:08] <poolie> igc, i am
[01:08] <igc> verterok: did you see the os x tour?
[01:09] <GaryvdM> superm1: This is a guess... Maybe you have the webdav plugin, but that location does not support webdav.
[01:09] <GaryvdM> superm1: If you have a launchpad account, with a ssh key set up, then set bzr launchpad-login, and run bzr pull lp:~mythbuntu/mythbuntu/mythbuntu-weekly-build/. That will then use bzr+ssh rather than http.
[01:09] <verterok> igc: nope
[01:09] <poolie> igc, btw it's a holiday here so spiv will be away
[01:09] <poolie> i'm swapping it for next week
[01:09] <poolie> and lifeless is in montreal of course
[01:11] <verterok> igc: btw, I've been trying to get a app bundle working, I have a working bzr.app bundle (with some hacks to py2app)...but only for CLI, I'm having some problems with qbzr/explorer
[01:11] <GaryvdM> Hi Poolie.
[01:11] <poolie> hi gary
[01:11] <poolie> and verterok
[01:11] <pygi> GaryvdM, poolie hey ho folks
[01:11] <igc> poolie: ah - didn't know about your public holiday
[01:12] <GaryvdM> poolie: I sent my gpg key :-) - I'm not sure if I sent the correct part.
[01:12] <GaryvdM> Hi pygi!
[01:12] <poolie> k, i just got back from a launchpad meeting in london yesterday
[01:13] <poolie> still catching up on stuff
[01:17] <GaryvdM> ok - sure.
[02:01] <zsquareplusc> what's up when some viewers show 9 revisions and some other 400... (there are 400 revs merged into that tree)
[02:02] <zsquareplusc> well, the actual problem is that bzr qlog shows e.g. rev 398 and when i try to remove that with merge -r 397..398 it says so such revision
[02:03] <zsquareplusc> bzr log even shows negative revsions :/
[02:06] <zsquareplusc> is there a way to repair that?
[02:16] <mwhudson> zsquareplusc: oh that bug
[02:16] <mwhudson> zsquareplusc: i think reconcile will fix that
[02:19] <zsquareplusc> mwhudson: indeed, it did. thanks
[02:20] <zsquareplusc> now that merge command just did nothing. bzr merge . -r 397..398  says "all changes applied" and changed nothing
[02:37] <zsquareplusc> how do i remove the changes introduced by a revision? i thought the command above should work.
[02:38] <bob2> Y..X
[02:39] <zsquareplusc> ah.. heh, the example in bzr revert has negative numbers, translating that to positive rev numbers isn't easy ;-)
[02:52] <mwhudson> zsquareplusc: you need to reverse the numbers
[02:53] <zsquareplusc> mwhudson: yep. i understood the hint by bob2
[02:53] <mwhudson> ah cool
[03:10] <fbond> I'm getting a "file id ... is not present" error with 2.0.0.
[03:10] <fbond> This is a branch with a single committed revision.
[03:10] <fbond> I'm doing a diff before committing a second revision.
[03:11] <fbond> Standalone tree (format: pack-0.92)
[03:11] <fbond> Is this a known issue?
[03:12] <fbond> Doing bzr init in a new dir followed by bzr pull gives me a working branch.
[03:12] <fbond> Format is 2a in that branch.
[03:13] <SamB_XP> I'd guess it's bitrot in the support for pack-0.92 ...
[03:13] <SamB_XP> I would have guessed that even before you tried 2a
[03:13] <fbond> SamB_XP: Not sure which bzr version I was using when I *created* that pack-0.92 branch.
[03:13] <fbond> I'm using bzr from the PPA, so I get updates...
[03:13] <SamB_XP> well, if it pulled okay, it must not be too bad!
[03:13] <fbond> Guess so.
[03:14] <fbond> I'd rather stick with pack-0.92 for some reason.  I like to sit on the new formats for a bit usually.
[03:14] <SamB_XP> so, I'd make a bug and attach that repo to it
[03:14] <fbond> This is an internal project, though, so not a big deal in this case.
[03:14] <SamB_XP> as a tarball
[03:14] <SamB_XP> ... if it's not a big deal ...
[03:14] <fbond> SamB_XP: Hm, can't publish this particular repo.
[03:14] <SamB_XP> oh, not so good :-(
[03:17] <fbond> Maybe a log would be okay?
[03:18] <fbond> I don't mind creating a bug.
[03:20] <fbond> Hm, I just created a new pack-0.92 branch and pulled into that.  Works fine.
[03:21] <fbond> Not sure what would've been wrong with my other branch... (looks like an issue with the WT, not the branch itself, for whatever that's worth).
[03:28]  * igc lunch
[03:32] <davidstrauss> abentley: If I have an addition to bzrtools, should I just submit it as a merge proposal to lp:bzrtools?
[03:48] <davidstrauss> Any idea why a process would hang on process.stdin.write?
[03:48] <davidstrauss> I'm trying to pipe to tar for a bzrtools extension
[03:48] <davidstrauss> and tar runs properly, but the code never moves beyond process.stdin.write
[04:03] <SamB_XP> davidstrauss: maybe it needs stdout read ?
[04:03] <SamB_XP> or possibly stderr?
[04:04] <davidstrauss> SamB_XP: I've already decided to move to tarfile, anyway
[04:04] <davidstrauss> SamB_XP: but thanks
[04:04] <SamB_XP> probably wise ;-)
[04:04] <SamB_XP> that's more portable anyway
[04:07] <poolie> davidstrauss: if i was there, i'd run strace on the tar process and see what it's doing rather than reading from stdin
[04:09] <abentley> davidstrauss: Sure.
[04:09] <davidstrauss> abentley: This utility downloads a tarball and replaces the current stuff in the branch with the tarball contents.
[04:09] <davidstrauss> abentley: Candidate for bzrtools?
[04:10] <abentley> davidstrauss: Sounds like the import command.
[04:10] <davidstrauss> abentley: where is that defined?
[04:11] <davidstrauss> abentley: Neither code nor bzrtools seems to have one
[04:11] <davidstrauss> abentley: nevermind
[04:11] <abentley> davidstrauss: It's part of bzrtools.  It's mainly defined in the file upstream_import.py
[04:12] <davidstrauss> abentley: looks perfect. thanks.
[04:13] <davidstrauss> abentley: And it does exactly what I want with directory stripping, etc.
[05:06] <CameronP> Hi Everyone -
[05:08] <poolie> igc, please don't push to the web site branch for the moment while we're deploying it
[05:09] <igc> poolie: ok, I'm done in any case
[05:10] <poolie> ok, it's done
[05:10] <igc> poolie: awesome!
[05:10] <poolie> igc, search isn't working well though - i don't know if i broke it, or if it was just not working?
[05:11]  * igc takes a look
[05:11] <CameronP> Getting an error with v 2.0.2 - when trying to commit bzr: ERROR: Invalid url supplied to transport: "file:///home/developm/public_html/xyz/": Win32 file urls start with file:///x:/, where x is a valid drive letter
[05:12] <CameronP> I think it might be a bzr upload plugin issue
[05:12] <poolie> igc, do you think we should redirect the /Welcome page too?
[05:12] <poolie> i think maybe so
[05:13] <igc> poolie: no, please leave Welcome there as the Wiki home page
[05:13] <poolie> CameronP: 2.0.2?
[05:13] <CameronP> yeah 2.0.2
[05:13] <igc> poolie: buttons aren't rendering properly either btw
[05:13] <poolie> CameronP: could you please file a bug with the traceback from bzr.log, then paste the number here
[05:13] <poolie> the ones next to the left hand links? i'm fixing it
[05:13] <CameronP> sure, how do i do the traceback from bzr.log
[05:14] <igc> poolie: also Get Xxx buttons
[05:14] <poolie> CameronP: open it in notepad and copy from it
[05:15] <CameronP> ah should i do it from the server (linux) or the client im comitting from (winblows)
[05:16] <poolie> the client
[05:17] <igc> kirkland ping
[05:18] <poolie> igc, the buttons should be ok now
[05:18] <poolie> the default font still looks a bit small to me?
[05:18] <igc> poolie: edit it in css/html-elements.css maybe
[05:19] <igc> poolie: maybe search.html has to move to the end directory as well?
[05:21] <igc> poolie: also, the wiki pages aren't rendering correctly in case you didn't know
[05:22] <poolie> i hadn't seen that but you're right
[05:24] <poolie> igc, looks ok again now?
[05:24] <igc> poolie: much better
[05:25] <igc> poolie: btw, clicking on the Bazaar logo in the Wiki goes to the home page, not Welcome
[05:25] <igc> is that what we want?
[05:25] <poolie> (trying to fix search)
[05:25] <poolie> hm
[05:26] <poolie> probably yes?
[05:26] <igc> I guess we need a link in the header to both somehow?
[05:27] <poolie> i'd like to eventually have the top nav bar include a link to the wiki and then be common to both
[05:28] <igc> that would be good
[05:28] <poolie> so i propose to change the search thing to have it just present results in a google page
[05:28] <poolie> like
[05:29] <poolie> http://www.google.com/cse?cx=009852948614216791564%3Adr5xzrczfnu&ie=UTF-8&q=checkout&sa=Search
[05:29] <poolie> i think ej is trying to have it present them within this page
[05:29] <poolie> which would be nice but i can't see how it would work with this current code a
[05:29] <poolie> and last time i tried it put it in the wrong place in the page
[05:29] <poolie> also i might pay for the ads to be removed from that page
[05:30] <igc> ok. I know kirkland helped her get it working but he's probably asleep now
[05:30] <kirkland> igc: not sleeping, just not paying very close attention
[05:31] <igc> hi kirkland. we've just make the website live but search isn't working
[05:32] <kirkland> igc: url?
[05:32] <igc> probably because index.html moved to en/index.html
[05:32] <kirkland> igc: yup, should be trivial to fix
[05:32] <poolie> hello kirkland
[05:32] <igc> http://bazaar-vcs.org/
[05:32] <poolie> can you tell me how you're setting this up?
[05:32] <igc> poolie: another minor quibble - the bazaar icon is missing from the tab in ff now
[05:33] <poolie> this is the iframe approach?
[05:33] <igc> favicon.ico?
[05:33] <poolie> ok
[05:33] <kirkland> <form id="searchbox_009852948614216791564:dr5xzrczfnu">
[05:34] <kirkland> add action="/en/"
[05:35] <poolie> ok, i see
[05:36] <igc> poolie: something has gone weird btw
[05:37] <poolie> mm?
[05:37] <igc> well done? We couldn't get that effect if we tried :-) :-)
[05:37] <poolie> which effect?
[05:38] <igc> try refeshing your page
[05:38] <poolie> wow
[05:38] <poolie> lots of strange spacing?
[05:38] <igc> yep, something about links
[05:38] <igc> I suspect
[05:39] <igc> all mine are yellow and on newlines
[05:39] <kirkland> missing a close </div>
[05:40] <CameronP> poolie: should i file this bug under the upload plugin or under bazaar - i have confirmed when the auto upload feature is turned off of the plugin on the server, I no longer get the error
[05:40] <poolie> ok, bzr-upload then
[05:41] <poolie> igc, kirkland, ok, search and links are ok now istm
[05:41] <kirkland> poolie: well done
[05:41] <igc> poolie: much better
[05:42] <igc> search button on line below box though?
[05:42] <poolie> on the results page? i know
[05:42] <igc> main page
[05:46] <poolie> ok, i see why
[05:46] <poolie> yay version control :)
[05:47] <poolie> we need to switch this to some kind of templating system
[05:47] <igc> verison control ftw!
[05:48] <CameronP> https://bugs.launchpad.net/bzr-upload/+bug/442798
[05:48] <realbadapple> can anyone tell me what the progress of nested trees is?
[05:49] <poolie> CameronP: the thing is, there is no 2.0.2
[05:49] <poolie> realbadapple: it's still pending; the best option atm is probably scmproje
[05:49] <poolie> scmproj*
[05:50] <realbadapple> anyone? nested trees! how soon till this work flow will be supported?
[05:51] <realbadapple> sorry poolie
[05:51] <igc> realbadapple: it's a feature under development
[05:51] <realbadapple> did not notice the response
[05:51] <igc> realbadapple: it won't be in production for another 5-6 months given we're now on 6 months releases
[05:52] <realbadapple> thanks can't wait!
[05:52] <igc> realbadapple: it *may* appear earlier in a beta but use scmproj for now if you can
[05:52] <realbadapple> this would really help with useing eclipse for development
[05:52] <realbadapple> scmproj?
[05:52] <realbadapple> is it a plugin?
[05:52] <igc> yep
[05:53] <poolie> http://bazaar-vcs.org/ScmProj
[05:53] <realbadapple> ok thanks I'll give it a look
[05:53] <poolie> k, search looks good now
[05:53] <igc> realbadapple: if you haven't already, see http://bazaar-vcs.org/BzrPlugins
[05:53] <igc> that page has just been reorganised so it ought to be easier to find plugins now
[05:53] <poolie> i'm just going to handle the noscript case a bit better by falling back to the google-hosted version
[05:54] <realbadapple> ya I've glanced at the plugins page but have not looked closely
[05:55] <igc> poolie: search is good for me now. It's pretty damn cool actually
[05:55] <poolie> indeed
[05:55] <igc> thanks a heap kirkland!
[05:55] <poolie> though it gives me sex ads when i search for 'test'
[05:55] <kirkland> igc: cheers
[05:55] <igc> :-(
[05:55] <poolie> so i'd like to get them off
[05:55] <poolie> like many things in life, a small matter of handing over money :}
[05:56] <igc> poolie: maybe we want a Search and an "I'm feeling lucky" button in the nav bar ...
[05:56] <igc> the latter gives the ads :-)
[05:58] <igc> poolie: so favicon.ico is the only issue I can see now
[06:00] <poolie> well, and noscript search
[06:00] <mneptok> igc: heya! (late)
[06:03] <igc> hi mneptok - great to hear from you!
[06:04] <poolie> hello mneptok
[06:12] <poolie> igc, i think the favicon is now/soon fixed
[06:12] <igc> pooie: yep - working now
[06:13] <poolie> do you have any opinion about how to do templating?
[06:13] <luke-jr> with pizza.
[06:13] <poolie> i tested in lynx and it looks pretty good, including search
[06:13] <poolie> ?
[06:13] <luke-jr> templating is always more enjoyable when you have pizza.
[06:34] <mneptok> poolie / igc: i've been sort of incomunicado the past 10 days while my wife and i moved to a new house we just bought. there's a guest bedroom if any bzr devs feel like seeing New Mexico before/after North American sprints. :)
[06:43] <igc> poolie: how about this ...
[06:44] <igc> With true rename tracking for files and diriectories,
[06:45] <igc> you can refactor code without fear of merging.
[06:45] <igc> still too sales-ish?
[06:46] <poolie> oh thanks very much mneptok
[06:46] <igc> poolie: I haven't though about templating
[06:46] <poolie> no plans to go there atm
[06:46] <poolie> igc, i might try to convert it to cheetah tomorrow
[06:46] <poolie> i'm going to stop for today now
[06:46] <igc> sphinx uses jinja fwiw: http://sphinx.pocoo.org/templating.html#working-the-the-builtin-templates
[06:46] <poolie> ok
[06:47] <poolie> consistency++
[06:47] <davidstrauss> Before I go down any more rabbitholes, is there a streamlined way to take a bzr branch and check in the current working copy to CVS?
[06:47] <poolie> there are dozens of libraries implementing "string % kwargs" :_)
[06:47] <poolie> davidstrauss: just have one directory which is both a bzr and cvs checkout?
[06:47] <davidstrauss> poolie: More like git-cvsexportcommit
[06:49] <igc> davidstrauss: is the export command useful to you for that?
[06:49] <DaffyDuck_`> Is there a file under .bzr which will always be updated when some change has been made? (a commit, a tag created, changes have been pulled, etc?)
[06:49] <davidstrauss> igc: Not really. The complexity is in the CVS/ metadata.
[06:50] <igc> DaffyDuck_`: .bzr/branch/last-revision goes close
[06:50] <DaffyDuck_`> I'm looking for some kind of "last change" timestamp, which convers _all_ types of changes.
[06:51] <poolie> davidstrauss: what is it that you want to have happen in cvs?
[06:51] <igc> I'm not sure you ought to rely on a given file. Can you use a hook instead?
[06:51] <igc> (filenames can always change over time as formats evolve)
[06:52] <igc> DaffyDuck_` ^^
[06:52] <poolie> see you later igc
[06:52] <davidstrauss> poolie: I need to take the working tree from Bazaar and push it to CVS as a commit on a specified branch.
[06:52] <igc> see ya poolie
[06:52] <davidstrauss> poolie: Well, I don't need to take the working tree. I can use a full-on commit.
[08:45] <bialix> hello bzr 2.0
[08:47] <bialix> hi igc
[08:48] <igc> hi bialix
[08:48] <bialix> congrat on new webpage rollout. I have one comment though, about BzrExtra
[08:48] <igc> bialix: ru tranlsation of explorer is looking complete btw
[08:48] <Phurl> hi all
[08:48] <igc> as is the fr one
[08:48] <Phurl> how can i get a rss feed from launchpad
[08:48] <Phurl> is there a public hosting site for that?
[08:48] <bialix> that page listed plugins in the same end. It's a bit obscure
[08:48] <igc> I was wondering whether a 0.8.3 was worth it with
[08:49] <Phurl> or do i need my own server?
[08:49] <bialix> Phurl: what do you mean?
[08:49] <Phurl> i would like a rss feed from commits
[08:49] <Phurl> i found some scripts and such to do that
[08:49] <Phurl> but i am missing this in lauchpad
[08:50] <bob2> you mean a rss feed of commits to mainline?
[08:50] <Phurl> in general I don see any rss feed option
[08:50] <Phurl> yes or to my branch
[08:50] <Peng_> Loggerhead has one.
[08:50] <Phurl> or anything from the project
[08:50] <bialix> Phurl: do you mean RSS feed for branch hosted on lp?
[08:50] <Phurl> yes bialix
[08:50] <Phurl> exactly
[08:50] <bialix> Phurl: I'm not aware about such feature
[08:50] <Phurl> ok
[08:51] <bialix> you may ask in #launchpad though
[08:51] <Peng_> Launchpad has one too: http://feeds.edge.launchpad.net/~bzr-pqm/bzr/bzr.dev/branch.atom
[08:51]  * Peng_ points at the feed button in Firefox's location bar.
[08:51] <Phurl> nice!!!
[08:51] <Phurl> thanks
[08:52] <bialix> hmm, I'd prefer to have explicit URL on the page
[08:52] <Peng_> bialix: It is explicitly in the page, just in the <head> section.
[08:52] <Phurl> bialix, perfect
[08:52] <Phurl> http://feeds.edge.launchpad.net/~kosova/+junk/openstreetmapkosova/branch.atom
[08:52] <bialix> explicit in the terms of I can copy-paste it
[08:52] <igc> bialix: what do you find confusing about BzrExtras again?
[08:53] <bialix> igc: it's hard to find plugins now
[08:53] <bialix> igc: I mean there is no more short way to plugins from main page anymore
[08:53] <bialix> Phurl: you mean Peng_
[08:53] <igc> bialix: would it help if the plugins link came at the top?
[08:54] <igc> bialix: see the footer links too btw
[08:54] <bialix> igc: IMO it will be nice
[08:54] <bialix> igc: this is just observation
[08:54] <igc> plugins is under Extras
[08:54] <igc> at the bottom of the main page
[08:54] <Phurl> Peng, thanks!!!
[08:54] <bialix> observation of monday morning mind, my personal wtf for today
[08:55] <igc> bialix: also, there's a "Browse the plugins registry" under the introductory text
[08:55] <bialix> igc: and btw content of BzrPlugins page is a bit long now ;-) I dunno is it possible to workaround this fact
[08:55] <bialix> I mean list of contents
[08:56] <igc> not that I know of
[08:56] <igc> I guess we could limit the depth of the contents but it kind of defeats the purpose
[08:56] <bialix> you're right, it is (Browse plugins). hmm, but other (main links) at top and big icon don't imply this
[08:57] <bialix> anyway, congrat for new site rollover, I really hope to see BIG announce in next few days
[08:57] <igc> bialix: right, so we could move plugins higher up on the BzrExtras page
[08:57] <bialix> it's a bit wrong situation IMO
[08:57] <igc> bialix: I thought poolie was going to do it today but it might be first thing tomorrow now
[08:58] <bialix> it seems so
[08:58] <igc> bialix: I suspect he wants people to test the website overnight first
[08:58] <bialix> may be
[08:59] <bialix> igc: re translations, I'm a bit digressed. Do you want me to sync translations with lp?
[08:59] <igc> he's only just back from London btw
[08:59] <igc> bialix: it was just an fyi
[08:59] <igc> I'm wrapped that the ru and fr translation are so complete!
[08:59] <bialix> igc: ah ok, I'm a bit busy at work
[08:59] <bialix> and don't check it regularly
[09:00] <igc> bialix: if we need to repackage the windows installer to include 0.14.3, then ...
[09:00] <bialix> perhaps your new welcome page require translations template update
[09:00] <bialix> I can do it right now
[09:01] <bialix> igc: jam said he think that 2.0.1 is more preferrable
[09:01] <bialix> maybe it's time to release 2.0.1 and do big announcement with 2.0.1?
[09:01] <igc> cool. So maybe we'll include an explorer 0.8.3 in that as well - just updated translations
[09:02] <bialix> igc: if you have access to http://pypi.python.org/pypi/bzr
[09:02] <bialix> there is still 1.17!!!
[09:02] <bialix> it require update
[09:03] <igc> it does. I can't do it right now but I'll put it on my list
[09:03] <bialix> please
[09:04] <bialix> this delayed announce stuff is open can for such nit problems here and there
[09:04]  * bialix believes release should be very focused on day job, not something that lasts for weeks
[09:05]  * bialix believes release should be very focused one day job, not something that lasts for weeks
[09:05] <igc> agreed
[09:06] <bialix> grrrrr
[09:06] <bialix> new lp ui is....
[09:06] <bialix> grrr
[09:06] <bialix> translations ui becomes worse and worse in last few month IMO
[09:07] <igc> bialix: I hoped you like the explorer tour btw. It should help get some more Windows users on board which will be good for all of us
[09:07] <igc> got to go now
[09:08]  * igc dinner
[09:08] <bialix> igc: it seems quality of russian translations is below my quality standard. I have to review new stuff before importing it into trunk
[09:08] <igc> ok
[09:08] <arnarl> Is there an unrevert in bzr? A couple of times now I've forgotten to add the filename that I want to revert and accidentally reverted all changes.
[09:08] <bialix> igc: the tour is FANTASTIC
[09:09] <bialix> arnarl: your changes backed up in *.~1~ files
[09:09] <arnarl> Is there some cure for my stupidity? Not that I have lost much work this time, but still :-)
[09:09] <bialix> there is no unrevert, but changes are usually saved in ~N~ files
[09:10] <arnarl> a, nice I.
[09:10] <bialix> you may want to use qrevert GUI dialog (from QBzr plugin) as safer revert
[09:10] <arnarl> I thought those were some emacs tmp files...
[09:10] <arnarl> I just try to commit often
[09:10] <bialix> commit often is ok
[09:11] <arnarl> but, I did not know about the *.~n~ files
[09:11] <arnarl> bialix: so thnx
[09:11] <arnarl> :-)
[09:11] <bialix> glad to help
[10:43] <nedosa> hi, quick question about hosting a bzr server on ec2, is there a way to pass an identity file to bzr+ssh ?
[10:43] <nedosa> similar to invoking the -i option on ssh
[10:50] <lifeless> not currently
[10:50] <lifeless> you can configure things in .ssh/config
[10:50] <lifeless> or add the identity to your agent
[10:55] <nedosa> lifeless: cheers, i guess i have to dig around and see how can i add identity info to my ssh agent
[10:58] <mwhudson> nedosa: ssh-add /path/to/identity.pem?
[11:01] <nedosa> mwhudson: fantastic, thanks !
[14:13] <CameronP_> Hi All
[14:13] <CameronP_> trying to use bzr patch command - should it work fine with a .diff file, in  the directory of the file I want to patch?
[14:15] <CameronP_> I dont think Im meant to use it in  thatway ;) oops
[14:15] <matkor> Hi ! Is there any way to find when file containing given text was deleted from given file ? in bzr or bzrtools ?
[14:19] <matkor> Like:  for every rev listed in  bzr log <file> do  bzr diff -c <rev> | grep <text>
[14:20] <Tak> there's a bisect plugin
[14:24] <matkor> Tak: "Use a binary search algorithm to apply a test of the source code for each revision", test may be simple grep ?
[14:25] <Tak> the test may be whatever you wish
[14:25] <Tak> basically you say "yes" or "no" for every iteration
[14:31] <matkor> Tak: Ok. thanks
[16:31] <davidstrauss> matkor: bzr-search does good indexing, too
[16:32] <davidstrauss> matkor: bi-sect may not work if the file's been deleted more than once
[16:34] <matkor> davidstrauss: Thanks.  bzr-search is another module ?
[16:34] <DaffyDuck_`> Has any work gone into making bzr less resource hungry in 2.0? (see bug 408526 and bug 408531).
[16:34] <davidstrauss> matkor: yes
[16:35] <Peng_> DaffyDuck_`: bzr 2.0 with the 2a format holds a lot less in memory.
[16:36] <Peng_> DaffyDuck_`: IIRC, it's down to file text + compressed version when committing.
[16:36] <DaffyDuck_`> Peng_: Would that specifically be 2.0, 2a or a combination of both? I already use 2a, but with 1.7/1.8, but they both exhibit the problem.
[16:36] <Peng_> DaffyDuck_`: It requires the 2a format, but I don't know the version of bzr.
[16:37] <Peng_> Ah, it's 1x file bytes + 2x compressed bytes: https://bugs.edge.launchpad.net/bzr/+bug/109114/comments/15
[16:38] <DaffyDuck_`> Peng_: That's promising! Thanks!
[16:42] <michaelforrest> #ubuntu-desktop, #ubuntu-devel, #ubuntu-doc, #ubuntu-installer,
[16:42] <michaelforrest> #ubuntu-website, #whatwg
[16:42] <michaelforrest> (oops - tried a /join command that didn't work - sorry)
[16:56] <phinze> can someone help me translate this into bzrlib API terms?  i want to build a pre-commit hook that greps through the incoming diff for a keyword.
[16:57] <phinze> would this be checking through bzrlib.delta.report_changes(oldtree.iter_changes(newtree), ???)
[16:58] <phinze> hmm or maybe better bzrlib.diff.show_diff_trees(oldtree, newtree, stream_to_string), and loop through that looking for my keyword
[19:26] <LpSolit> when I get a patch created with bzr, how can I know which file revisions the patch was made against?
[19:26] <LpSolit> cvs diff adds the file revision number to the file, so it's easy to know
[19:27] <LpSolit> but bzr diff only adds the date the file was edited, it looks like
[19:27] <Lo-lan-do> Is it a bundle generated with bzr send, or just a diff generated with bzr diff?
[19:28] <LpSolit> Lo-lan-do: with bzr diff
[19:29] <Lo-lan-do> Not sure you can then.
[19:29] <LpSolit> :(
[19:29] <Peng_> LpSolit: Why not use "bzr send"?
[19:30] <LpSolit> Peng_: 1) because I never heard about it, and 2) because people create patches using bzr diff
[19:31] <LpSolit> does bzr send alter my installation?
[19:31] <LpSolit> or does it only generate a patch?
[19:31] <bialix> LpSolit: why you need to know revision then?
[19:31] <Lo-lan-do> It generates a patch with extra metadata
[19:33] <LpSolit> bialix: because in Bugzilla (it's a bug tracking system developed by Mozilla), we want the ability to display patches with their context, i.e. patches most of the time have 3 lines of context, and we have the ability to display patches with as many lines of context as you want
[19:33] <LpSolit> bialix: so you can select context=50 and you have the same patch redisplayed with 50 lines of context
[19:33] <LpSolit> this works for years with CVS
[19:34] <LpSolit> and I have to update Bugzilla internals to work with bzr
[19:34] <Peng_> You can't do that with bzr, though it likely wouldn't be hard to add.
[19:34]  * LpSolit wonders if what I said is clear enough
[19:34] <bialix> `bzr send --no-bundles` is roughly equal to plain diff but with revision id
[19:35] <LpSolit> let me try bzr send
[19:36] <bialix> Peng_: it can be done with plugin
[19:38] <LpSolit> $ bzr send --no-bundles test_config.t
[19:38] <LpSolit> bzr: ERROR: no such option: --no-bundles
[19:39] <LpSolit> Peng_: would it be reasonable to request to append the revno to the file name?
[19:39] <bialix> --no-bundle sorry
[19:39] <LpSolit> so instead of --- process_bug.cgi	2007-10-12 07:21:59 +0000 , we would have:
[19:39] <LpSolit> --- process_bug.cgi	2007-10-12 07:21:59 +0000 344
[19:39] <LpSolit> or something like that
[19:40] <LpSolit> maybe revno:344
[19:40] <bialix> LpSolit: revno is local info for the branch
[19:41] <Lo-lan-do> It's still valuable info.  Not everyone uses branches everywhere :-)
[19:41] <bialix> in the a diff context you should use revision id
[19:42] <bialix> IIRC svn shows revno in the diff comment
[19:43] <Tak> yeah, it does
[19:44] <LpSolit> same for cvs
[19:44]  * LpSolit really needs this info
[19:45] <LpSolit> bzr send --no-bundle -o toto.diff
[19:45] <LpSolit> Using saved submit location "test_config.t" to determine what changes to submit.
[19:45] <LpSolit> bzr: ERROR: Not a branch: "/var/www/html/selenium/bugzilla/bzr/3.4/t/test_config.t/".
[19:45] <LpSolit> what is it trying to do? :)
[19:47] <bialix> send requires trunk branch available and passed as 1st argument
[19:48] <bialix> and send works with committed changes
[19:48] <bialix> perhaps it's not what you need
[19:48] <LpSolit> no, it's not
[19:48] <LpSolit> before committing changes, the patch has to be approved by reviewers first
[19:49] <bialix> IMO you can file a bug asking for this feature or write plugin
[19:49] <bialix> > before committing changes, the patch has to be approved by reviewers first
[19:50] <bialix> in bzr we working another way
[19:50] <bialix> commit your changes, then send a patch for review
[19:52] <bialix> LpSolit: bzr is DVCS
[19:52] <bialix> commit won't clutter trunk until it will be merged
[19:53] <LpSolit> yes, I know that. Being a CVS user for many years, the change is not obvious :)
[19:53] <LpSolit> oh, right
[19:54] <bialix> LpSolit: look https://code.launchpad.net/bzr/+activereviews
[19:55] <bialix> abentley: can you restart bundle buggy please?
[19:56] <abentley> bialix: done.
[19:56] <bialix> abentley: error 503
[19:58] <abentley> bialix: Bundle Buggy is currently plowing through a big backlog of email, but it works for me.
[19:58] <bialix> now and for me
[19:59] <bialix> LpSolit: look also http://bundlebuggy.aaronbentley.com/
[19:59] <bialix> this one works with the output of bzr send command
[20:00] <bialix> abentley: thanks
[20:00] <LpSolit> where is the metadata?
[20:00]  * LpSolit is looking at http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49F22B67.8020703%40aaronbentley.com%3E
[20:00] <abentley> bialix: np.  btw, launchpad also works with send.
[20:01] <bialix> abentley: IIRC the e-mail should be GPG-signed, right?
[20:01] <LpSolit> oh, I can see it when downloading the patch
[20:01] <LpSolit> ok
[20:01] <abentley> bialix: Yes, and you need to have a Launchpad account with that GPG key.
[20:02] <bialix> I was not aware about assigning GPG to account
[20:02] <lgoodrich> Hello all. I've come up dry on google so I'm wondering if anyone on here knows. Is there any way to delete a file from your revision history?
[20:03]  * bialix forgot about GPG
[20:03] <lgoodrich> I was able to do it in Subversion a while back through an annoying process of exporting and importing the repository. I'm hoping there is at least some similar way, if not easier.
[20:04] <bialix> lgoodrich: if you mean to completely remove history for the file then no
[20:05] <lgoodrich> not even through some sort of export, filter, then import process?
[20:05] <bialix> this will works
[20:05] <LpSolit> bzr log test_config.t
[20:05] <LpSolit> ------------------------------------------------------------
[20:05] <LpSolit> revno: 48
[20:05] <LpSolit> timestamp: Mon 2008-10-20 01:41:26 +0000
[20:05] <LpSolit> works
[20:05] <bialix> but after re-import you'll have completelly unrelated history
[20:05] <LpSolit> but: bzr cat -r date:2008-10-20,01:41:26 test_config.t    returns:
[20:05] <LpSolit> bzr: ERROR: The file id "test_config.t-20081020014126-eujmy2eg2qvr-1" is not present in the tree <Inventory object at b74a650c....
[20:05] <LpSolit> what's wrong with that?
[20:06] <LpSolit> I'm trying to use the timestamp when the revision id is not available
[20:06] <bialix> bzr cat -r date:2008-10-20 test_config.t
[20:07] <bialix> maybe
[20:07] <lgoodrich> hmm, I'll see if its worth the hassle, thanks
[20:07] <LpSolit> bialix: same error
[20:08] <bialix> is it possible the file was renamed?
[20:08] <LpSolit> no, the file is still here: http://bzr.bugzilla.org/selenium/3.4/annotate/head%3A/t/test_config.t
[20:10] <bialix> this page http://bzr.bugzilla.org/selenium/3.4/changes?filter_file_id=test_config.t-20081020014126-eujmy2eg2qvr-1
[20:11] <LpSolit> hum, so it matches what the error message was reporting
[20:11] <LpSolit> test_config.t-20081020014126-eujmy2eg2qvr-1
[20:12] <bialix> says the date should be 2008-10-19
[20:12] <bialix> perhaps TZ issue
[20:12] <bialix> it's a bug though
[20:12] <bialix> see 20081020 in the file-id
[20:12] <LpSolit> doesn't work with 2008-10-19 either
[20:13] <bialix> it's the timestamp when file was added
[20:16] <LpSolit> if I type: bzr cat -r 48 test_config.t, I get the file content
[20:16] <bialix> there is plugin file-revno which can print revno number of the last change for the file
[20:16] <LpSolit> so it only fails with date:
[20:16] <bialix> file a bug please
[20:17] <LpSolit> bialix: URL to your bug tracker?
[20:17] <LpSolit> I know you don't use Bugzilla :)
[20:19] <bialix> https://bugs.launchpad.net/bzr
[20:35] <LpSolit> bialix: thanks! https://bugs.launchpad.net/bzr/+bug/443419
[20:36] <bialix> thanks
[21:45] <maxb> Hi. I've been considering moving a project from cvs to bzr. After deliberation, I think the sticking point is bzr's worldview of having a branch, not a repository, as the primary object. Specifically, I'll end up losing history (or at least having it cumbersome to access) as parts of it become confined to branches which no one remembers to look at
[21:46] <eferraiuolo> I was wondering if there was a planned binary Mac OS X 10.6 install for bzr-explorer?
[21:46] <maxb> I'm wondering if anyone has any bzr documentation or evangelism that might help me understand how this isn't a problem for more people.
[21:51] <lifeless> eferraiuolo: I suspect there is
[21:51] <mwhudson> maxb: bzr log --include-merges shows that "lost" history
[21:51] <mwhudson> maxb: if that's what you mean
[21:51] <mwhudson> maxb: (or qlog or whatever)
[21:51] <maxb> Only if it actually got merged
[21:51] <lifeless> maxb: what do you mean by 'more cumbersone'?
[21:52] <maxb> As in, in any other VCS, I would point <some log viewer> at the repository and explore all the history
[21:52] <lifeless> well, I dispute the 'any other' phrase :)
[21:53] <lifeless> in any DVCS it would only be 'all the local history', in other ones like codeville, they behave like bzr
[21:53] <lifeless> however, qbzr can do viz on multiple branches
[21:54] <lifeless> I think a bug on it to allow qbzr <root of repo> to work would be well received
[21:54] <lifeless> maxb: anyhow, I think it isn't a problem because people don't need to do it
[21:55] <maxb> I suppose my consternation is magnified by this being a conversion from CVS, and knowing that I'll have to coax people away from CVS practices
[21:57]  * mwhudson has almost entirely forgotten that software development is even possible with CVS, let alone how it is done
[22:00] <lifeless> maxb: so, one use case is 'find a brnach name' which is replaced by 'ls' [or 'bzr branches']
[22:01] <maxb> mwhudson: I wish I _could_ - but I'm forced to use it at work :-) Hence the attempt to plot a way out.
[22:01] <maxb> lifeless: A use case I'm concerned about is "Find a tag. I don't know which branch it's in"
[22:02] <lifeless> maxb: so, what bzr does is merges release branches to trunk
[22:03] <maxb> ls / bzr branches are somewhat problematic unless you have *all* branches locally
[22:03] <lifeless> maxb: so all tags are in trunk
[22:03] <lifeless> maxb: yes, but see under distributed
[22:03] <maxb> I think you are right, using bzr is going to entail convincing cvs2bzr to merge branches to trunk whereever possible, for the past, and convincing developers of the same, for the future
[22:04] <jam> maxb: well if a feature isn't merged to trunk, then it would stand to reason that the tag isn't there, no?
[22:04] <bob2> what are all these unmerged branches in cvs being used for?
[22:05] <maxb> Well, some of them probably have been merged. (but being CVS, you can't tell). And some are ad-hoc "just getting a release out there" branches
[22:07] <poolie> jam, hi?
[22:15] <maxb> I wonder how plausible it would be to write a tool which can add an extra parent to an EXISTING revision?
[22:16] <maxb> I realise this can only work if you know you hold the only copy of the repository
[22:16] <maxb> But it would be an interesting option for patching up a cvs conversion before making it public
[22:16] <jam> maxb: filtering the output of 'cvs2bzr' (the fast-import file) is the perfect time to do that
[22:16] <jam> before it gets imported
[22:17] <maxb> jam: Well.... sort of. It's a lot easier to find the joinpoints if you can 'bzr viz'
[22:17] <jam> maxb: you can iterate over it
[22:17] <jam> convert, filter, convert again, etc
[22:18] <maxb> this is true. I'm just a bit unsure how you'd inject the information back into the conversion
[22:18] <jam> maxb: you might look at fastimport's 'filter-branch' stuff
[23:17] <igc> morning
[23:26] <meoblast001> hi
[23:27] <meoblast001> i have my email in Bazaar set to "meoblast@aol.com"
[23:27] <meoblast001> if i change my email address, that might become a problem
[23:27] <meoblast001> is it safe to just set it to "meoblast"
[23:35] <malept> hi, I have a repository being served with the bzr+http protocol. I recently upgraded the server from 1.9 to 2.0, and now commands to it die with "An attempt to access a url outside the server jail was made". I'm not entirely sure how to fix this.
[23:51] <wgrant> meoblast001: Some applications (eg. Launchpad) identify you by email address, so changing it to just 'meoblast' would result in Launchpad no longer linking your commits to you.
[23:51] <meoblast001> ugh
[23:51] <meoblast001> i don't like aol though
[23:51] <meoblast001> i plan to switch
[23:52] <meoblast001> and when i do, everything will recognize me as a new person entirely
[23:52] <wgrant> Is it really a problem if some of your old commits have an old email address?
[23:54] <meoblast001> wgrant: well, services, such as ohloh, detect developers by email
[23:54] <meoblast001> new email makes you a different developer
[23:55] <malept> meoblast001: those services allow you to have multiple emails per user
[23:55] <wgrant> Right.
[23:55] <wgrant> You can easily merge the users.
[23:55] <malept> I am certain of this for at minimum, LP and Ohloh.
[23:55] <meoblast001> do pretty much all services like that have those features?
[23:55] <bob2> meoblast001: also, changing to 'meoblast' would cause a discontinuity now, anyway
[23:55] <bob2> meoblast001: just the same as moving to a new email address would
[23:55] <meoblast001> bob2: well, if you do it the normal way ;)
[23:56] <meoblast001> keep in mind pretty much no one but me and one other developer has a checkout of my project
[23:56] <meoblast001> so now is the best time to fix screw ups
[23:58] <poolie> hello igc
[23:58] <igc> hi poolie