/srv/irclogs.ubuntu.com/2009/10/05/#bzr.txt

RenatoSilvahow to write a multi-line commit comment in command line?00:09
Peng_RenatoSilva: That's a question for your shell, nothing bzr-specific.00:11
Peng_It works automagically in bash. You can just hit Enter while writing a string. But I dunno about any other shells.00:13
Raimif you do not trust that, you can use a file for the message: bzr commit -F msg.txt00:13
RenatoSilvaok00:13
Raimbut actually I would prefer using a real editor00:14
* RenatoSilva trying to find how to do that in windows00:15
mneptokcygwin?00:19
RenatoSilvaI use MinGW00:20
igcmorning00:42
igchi mneptok!00:43
superm1hey guys.  i'm having a hard time pulling a new reversion: [mlimonciello@devel mythbuntu-weekly-build]$ bzr pull00:53
superm1Using saved parent location: http://bazaar.launchpad.net/~mythbuntu/mythbuntu/mythbuntu-weekly-build/00:53
superm1bzr: 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
superm1any suggestions?00:53
verterokigc: hi00:54
Peng_superm1: What version of bzr?00:54
superm1Peng, should be a freshly installed 2.0.000:55
Peng_superm1: Just for fun, try "bzr --no-plugins pull".00:55
superm1Peng, same thing00:55
wgrantsuperm1: 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:55
verterokigc: 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 version00:56
Peng_Ooooh.00:56
superm1wgrant, 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 working00:56
* Peng_ goes /away00:56
wgrantsuperm1: It shouldn't be related to the upgrade.00:56
superm1wgrant, bzr up does the same thing :(00:56
wgrantsuperm1: pastebin 'bzr info -v'00:56
superm1wgrant, 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 stuffs00:57
superm1yup, that worked swimmingly! thanks!00:57
wgrantStrange.00:58
pooliehello all00:59
pooliehi igc, are you at work today?00:59
verterokhi poolie00:59
GaryvdMHi igc.01:00
igchi verterok. Very well done. Even getting the Leopard one out will be huge step forward!01:00
igchi poolie. Are you back in Oz today?01:00
igchi garyvdm!01:00
pooliehi, i am01:00
pooliei'm just cleaning up my receipts and office atm01:00
igcpoolie: I'm well thanks01:00
poolieglad to hear it01:01
igcpoolie: just arrive back this morning? Must be tired I'd imagine01:01
poolieyesterday morning01:01
poolieslept a lot, ok now01:01
pooliefor the moment :)01:01
igc:-)01:02
GaryvdMsuperm1: This is a guess... Maybe you have the webdav plugin, but that location does not support webdav.01:03
GaryvdMsuperm1: 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:04
igcpoolie: a new qbzr (0.14.3) is out which fixes a bad bug in TortoiseBzr apprently01:05
GaryvdMTha will then use bzr+ssh01:05
igcpoolie: I'm not sure if it's serious enough to warrant rebuilding the Windows installer for. GaryVdM may know01:05
igcpoolie: otherwise, I'm hoping you're keen to make the big announcement today.01:06
igcpoolie: we don't want it coming out after the 2.1.0b1 one :-) :-)01:06
poolieigc, i am01:08
igcverterok: did you see the os x tour?01:08
GaryvdMsuperm1: This is a guess... Maybe you have the webdav plugin, but that location does not support webdav.01:09
GaryvdMsuperm1: 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
verterokigc: nope01:09
poolieigc, btw it's a holiday here so spiv will be away01:09
pooliei'm swapping it for next week01:09
poolieand lifeless is in montreal of course01:09
verterokigc: 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/explorer01:11
GaryvdMHi Poolie.01:11
pooliehi gary01:11
poolieand verterok01:11
pygiGaryvdM, poolie hey ho folks01:11
igcpoolie: ah - didn't know about your public holiday01:11
GaryvdMpoolie: I sent my gpg key :-) - I'm not sure if I sent the correct part.01:12
GaryvdMHi pygi!01:12
pooliek, i just got back from a launchpad meeting in london yesterday01:12
pooliestill catching up on stuff01:13
GaryvdMok - sure.01:17
zsquarepluscwhat's up when some viewers show 9 revisions and some other 400... (there are 400 revs merged into that tree)02:01
zsquarepluscwell, 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 revision02:02
zsquarepluscbzr log even shows negative revsions :/02:03
zsquarepluscis there a way to repair that?02:06
mwhudsonzsquareplusc: oh that bug02:16
mwhudsonzsquareplusc: i think reconcile will fix that02:16
zsquarepluscmwhudson: indeed, it did. thanks02:19
zsquarepluscnow that merge command just did nothing. bzr merge . -r 397..398  says "all changes applied" and changed nothing02:20
zsquarepluschow do i remove the changes introduced by a revision? i thought the command above should work.02:37
bob2Y..X02:38
zsquarepluscah.. heh, the example in bzr revert has negative numbers, translating that to positive rev numbers isn't easy ;-)02:39
=== statik` is now known as statik
mwhudsonzsquareplusc: you need to reverse the numbers02:52
zsquarepluscmwhudson: yep. i understood the hint by bob202:53
mwhudsonah cool02:53
fbondI'm getting a "file id ... is not present" error with 2.0.0.03:10
fbondThis is a branch with a single committed revision.03:10
fbondI'm doing a diff before committing a second revision.03:10
fbondStandalone tree (format: pack-0.92)03:11
fbondIs this a known issue?03:11
fbondDoing bzr init in a new dir followed by bzr pull gives me a working branch.03:12
fbondFormat is 2a in that branch.03:12
SamB_XPI'd guess it's bitrot in the support for pack-0.92 ...03:13
SamB_XPI would have guessed that even before you tried 2a03:13
fbondSamB_XP: Not sure which bzr version I was using when I *created* that pack-0.92 branch.03:13
fbondI'm using bzr from the PPA, so I get updates...03:13
SamB_XPwell, if it pulled okay, it must not be too bad!03:13
fbondGuess so.03:13
fbondI'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_XPso, I'd make a bug and attach that repo to it03:14
fbondThis is an internal project, though, so not a big deal in this case.03:14
SamB_XPas a tarball03:14
SamB_XP... if it's not a big deal ...03:14
fbondSamB_XP: Hm, can't publish this particular repo.03:14
SamB_XPoh, not so good :-(03:14
fbondMaybe a log would be okay?03:17
fbondI don't mind creating a bug.03:18
fbondHm, I just created a new pack-0.92 branch and pulled into that.  Works fine.03:20
fbondNot 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:21
* igc lunch03:28
davidstraussabentley: If I have an addition to bzrtools, should I just submit it as a merge proposal to lp:bzrtools?03:32
davidstraussAny idea why a process would hang on process.stdin.write?03:48
davidstraussI'm trying to pipe to tar for a bzrtools extension03:48
davidstraussand tar runs properly, but the code never moves beyond process.stdin.write03:48
SamB_XPdavidstrauss: maybe it needs stdout read ?04:03
SamB_XPor possibly stderr?04:03
davidstraussSamB_XP: I've already decided to move to tarfile, anyway04:04
davidstraussSamB_XP: but thanks04:04
SamB_XPprobably wise ;-)04:04
SamB_XPthat's more portable anyway04:04
pooliedavidstrauss: if i was there, i'd run strace on the tar process and see what it's doing rather than reading from stdin04:07
=== timchen1` is now known as nasloc__
abentleydavidstrauss: Sure.04:09
davidstraussabentley: This utility downloads a tarball and replaces the current stuff in the branch with the tarball contents.04:09
davidstraussabentley: Candidate for bzrtools?04:09
abentleydavidstrauss: Sounds like the import command.04:10
davidstraussabentley: where is that defined?04:10
davidstraussabentley: Neither code nor bzrtools seems to have one04:11
davidstraussabentley: nevermind04:11
abentleydavidstrauss: It's part of bzrtools.  It's mainly defined in the file upstream_import.py04:11
davidstraussabentley: looks perfect. thanks.04:12
davidstraussabentley: And it does exactly what I want with directory stripping, etc.04:13
=== abentley1 is now known as abentley
CameronPHi Everyone -05:06
poolieigc, please don't push to the web site branch for the moment while we're deploying it05:08
igcpoolie: ok, I'm done in any case05:09
poolieok, it's done05:10
igcpoolie: awesome!05:10
poolieigc, search isn't working well though - i don't know if i broke it, or if it was just not working?05:10
* igc takes a look05:11
CameronPGetting 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 letter05:11
CameronPI think it might be a bzr upload plugin issue05:12
poolieigc, do you think we should redirect the /Welcome page too?05:12
pooliei think maybe so05:12
igcpoolie: no, please leave Welcome there as the Wiki home page05:13
poolieCameronP: 2.0.2?05:13
CameronPyeah 2.0.205:13
igcpoolie: buttons aren't rendering properly either btw05:13
poolieCameronP: could you please file a bug with the traceback from bzr.log, then paste the number here05:13
pooliethe ones next to the left hand links? i'm fixing it05:13
CameronPsure, how do i do the traceback from bzr.log05:13
igcpoolie: also Get Xxx buttons05:14
poolieCameronP: open it in notepad and copy from it05:14
CameronPah should i do it from the server (linux) or the client im comitting from (winblows)05:15
pooliethe client05:16
igckirkland ping05:17
poolieigc, the buttons should be ok now05:18
pooliethe default font still looks a bit small to me?05:18
igcpoolie: edit it in css/html-elements.css maybe05:18
igcpoolie: maybe search.html has to move to the end directory as well?05:19
igcpoolie: also, the wiki pages aren't rendering correctly in case you didn't know05:21
pooliei hadn't seen that but you're right05:22
poolieigc, looks ok again now?05:24
igcpoolie: much better05:24
igcpoolie: btw, clicking on the Bazaar logo in the Wiki goes to the home page, not Welcome05:25
igcis that what we want?05:25
poolie(trying to fix search)05:25
pooliehm05:25
poolieprobably yes?05:26
igcI guess we need a link in the header to both somehow?05:26
pooliei'd like to eventually have the top nav bar include a link to the wiki and then be common to both05:27
igcthat would be good05:28
poolieso i propose to change the search thing to have it just present results in a google page05:28
poolielike05:28
pooliehttp://www.google.com/cse?cx=009852948614216791564%3Adr5xzrczfnu&ie=UTF-8&q=checkout&sa=Search05:29
pooliei think ej is trying to have it present them within this page05:29
pooliewhich would be nice but i can't see how it would work with this current code a05:29
poolieand last time i tried it put it in the wrong place in the page05:29
pooliealso i might pay for the ads to be removed from that page05:29
igcok. I know kirkland helped her get it working but he's probably asleep now05:30
kirklandigc: not sleeping, just not paying very close attention05:30
igchi kirkland. we've just make the website live but search isn't working05:31
kirklandigc: url?05:32
igcprobably because index.html moved to en/index.html05:32
kirklandigc: yup, should be trivial to fix05:32
pooliehello kirkland05:32
igchttp://bazaar-vcs.org/05:32
pooliecan you tell me how you're setting this up?05:32
igcpoolie: another minor quibble - the bazaar icon is missing from the tab in ff now05:32
pooliethis is the iframe approach?05:33
igcfavicon.ico?05:33
poolieok05:33
kirkland<form id="searchbox_009852948614216791564:dr5xzrczfnu">05:33
kirklandadd action="/en/"05:34
poolieok, i see05:35
igcpoolie: something has gone weird btw05:36
pooliemm?05:37
igcwell done? We couldn't get that effect if we tried :-) :-)05:37
pooliewhich effect?05:37
igctry refeshing your page05:38
pooliewow05:38
poolielots of strange spacing?05:38
igcyep, something about links05:38
igcI suspect05:38
igcall mine are yellow and on newlines05:39
kirklandmissing a close </div>05:39
CameronPpoolie: 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 error05:40
poolieok, bzr-upload then05:40
poolieigc, kirkland, ok, search and links are ok now istm05:41
kirklandpoolie: well done05:41
igcpoolie: much better05:41
igcsearch button on line below box though?05:42
poolieon the results page? i know05:42
igcmain page05:42
poolieok, i see why05:46
poolieyay version control :)05:46
pooliewe need to switch this to some kind of templating system05:47
igcverison control ftw!05:47
CameronPhttps://bugs.launchpad.net/bzr-upload/+bug/44279805:48
ubottuLaunchpad bug 442798 in bzr-upload "error with --auto feature turned on with 2.0.2" [Undecided,New]05:48
realbadapplecan anyone tell me what the progress of nested trees is?05:48
poolieCameronP: the thing is, there is no 2.0.205:49
poolierealbadapple: it's still pending; the best option atm is probably scmproje05:49
pooliescmproj*05:49
realbadappleanyone? nested trees! how soon till this work flow will be supported?05:50
realbadapplesorry poolie05:51
igcrealbadapple: it's a feature under development05:51
realbadappledid not notice the response05:51
igcrealbadapple: it won't be in production for another 5-6 months given we're now on 6 months releases05:51
realbadapplethanks can't wait!05:52
igcrealbadapple: it *may* appear earlier in a beta but use scmproj for now if you can05:52
realbadapplethis would really help with useing eclipse for development05:52
realbadapplescmproj?05:52
realbadappleis it a plugin?05:52
igcyep05:52
pooliehttp://bazaar-vcs.org/ScmProj05:53
realbadappleok thanks I'll give it a look05:53
pooliek, search looks good now05:53
igcrealbadapple: if you haven't already, see http://bazaar-vcs.org/BzrPlugins05:53
igcthat page has just been reorganised so it ought to be easier to find plugins now05:53
pooliei'm just going to handle the noscript case a bit better by falling back to the google-hosted version05:53
realbadappleya I've glanced at the plugins page but have not looked closely05:54
igcpoolie: search is good for me now. It's pretty damn cool actually05:55
poolieindeed05:55
igcthanks a heap kirkland!05:55
pooliethough it gives me sex ads when i search for 'test'05:55
kirklandigc: cheers05:55
igc:-(05:55
poolieso i'd like to get them off05:55
poolielike many things in life, a small matter of handing over money :}05:55
igcpoolie: maybe we want a Search and an "I'm feeling lucky" button in the nav bar ...05:56
igcthe latter gives the ads :-)05:56
igcpoolie: so favicon.ico is the only issue I can see now05:58
pooliewell, and noscript search06:00
mneptokigc: heya! (late)06:00
igchi mneptok - great to hear from you!06:03
pooliehello mneptok06:04
poolieigc, i think the favicon is now/soon fixed06:12
igcpooie: yep - working now06:12
pooliedo you have any opinion about how to do templating?06:13
luke-jrwith pizza.06:13
pooliei tested in lynx and it looks pretty good, including search06:13
poolie?06:13
luke-jrtemplating is always more enjoyable when you have pizza.06:13
mneptokpoolie / 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:34
igcpoolie: how about this ...06:43
igcWith true rename tracking for files and diriectories,06:44
igcyou can refactor code without fear of merging.06:45
igcstill too sales-ish?06:45
poolieoh thanks very much mneptok06:46
igcpoolie: I haven't though about templating06:46
poolieno plans to go there atm06:46
poolieigc, i might try to convert it to cheetah tomorrow06:46
pooliei'm going to stop for today now06:46
igcsphinx uses jinja fwiw: http://sphinx.pocoo.org/templating.html#working-the-the-builtin-templates06:46
poolieok06:46
poolieconsistency++06:47
davidstraussBefore 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
pooliethere are dozens of libraries implementing "string % kwargs" :_)06:47
pooliedavidstrauss: just have one directory which is both a bzr and cvs checkout?06:47
davidstrausspoolie: More like git-cvsexportcommit06:47
igcdavidstrauss: 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
davidstraussigc: Not really. The complexity is in the CVS/ metadata.06:49
igcDaffyDuck_`: .bzr/branch/last-revision goes close06:50
DaffyDuck_`I'm looking for some kind of "last change" timestamp, which convers _all_ types of changes.06:50
pooliedavidstrauss: what is it that you want to have happen in cvs?06:51
igcI'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:51
igcDaffyDuck_` ^^06:52
pooliesee you later igc06:52
davidstrausspoolie: I need to take the working tree from Bazaar and push it to CVS as a commit on a specified branch.06:52
igcsee ya poolie06:52
davidstrausspoolie: Well, I don't need to take the working tree. I can use a full-on commit.06:52
=== davidstrauss_ is now known as davidstrauss
=== vila is now known as vila-dentist
=== vila-dentist is now known as vila
bialixhello bzr 2.008:45
bialixhi igc08:47
igchi bialix08:48
bialixcongrat on new webpage rollout. I have one comment though, about BzrExtra08:48
igcbialix: ru tranlsation of explorer is looking complete btw08:48
Phurlhi all08:48
igcas is the fr one08:48
Phurlhow can i get a rss feed from launchpad08:48
Phurlis there a public hosting site for that?08:48
bialixthat page listed plugins in the same end. It's a bit obscure08:48
igcI was wondering whether a 0.8.3 was worth it with08:48
Phurlor do i need my own server?08:49
bialixPhurl: what do you mean?08:49
Phurli would like a rss feed from commits08:49
Phurli found some scripts and such to do that08:49
Phurlbut i am missing this in lauchpad08:49
bob2you mean a rss feed of commits to mainline?08:50
Phurlin general I don see any rss feed option08:50
Phurlyes or to my branch08:50
Peng_Loggerhead has one.08:50
Phurlor anything from the project08:50
bialixPhurl: do you mean RSS feed for branch hosted on lp?08:50
Phurlyes bialix08:50
Phurlexactly08:50
bialixPhurl: I'm not aware about such feature08:50
Phurlok08:50
bialixyou may ask in #launchpad though08:51
Peng_Launchpad has one too: http://feeds.edge.launchpad.net/~bzr-pqm/bzr/bzr.dev/branch.atom08:51
* Peng_ points at the feed button in Firefox's location bar.08:51
Phurlnice!!!08:51
Phurlthanks08:51
bialixhmm, I'd prefer to have explicit URL on the page08:52
Peng_bialix: It is explicitly in the page, just in the <head> section.08:52
Phurlbialix, perfect08:52
Phurlhttp://feeds.edge.launchpad.net/~kosova/+junk/openstreetmapkosova/branch.atom08:52
bialixexplicit in the terms of I can copy-paste it08:52
igcbialix: what do you find confusing about BzrExtras again?08:52
bialixigc: it's hard to find plugins now08:53
bialixigc: I mean there is no more short way to plugins from main page anymore08:53
bialixPhurl: you mean Peng_08:53
igcbialix: would it help if the plugins link came at the top?08:53
igcbialix: see the footer links too btw08:54
bialixigc: IMO it will be nice08:54
bialixigc: this is just observation08:54
igcplugins is under Extras08:54
igcat the bottom of the main page08:54
PhurlPeng, thanks!!!08:54
bialixobservation of monday morning mind, my personal wtf for today08:54
igcbialix: also, there's a "Browse the plugins registry" under the introductory text08:55
bialixigc: and btw content of BzrPlugins page is a bit long now ;-) I dunno is it possible to workaround this fact08:55
bialixI mean list of contents08:55
igcnot that I know of08:56
igcI guess we could limit the depth of the contents but it kind of defeats the purpose08:56
bialixyou're right, it is (Browse plugins). hmm, but other (main links) at top and big icon don't imply this08:56
bialixanyway, congrat for new site rollover, I really hope to see BIG announce in next few days08:57
igcbialix: right, so we could move plugins higher up on the BzrExtras page08:57
bialixit's a bit wrong situation IMO08:57
igcbialix: I thought poolie was going to do it today but it might be first thing tomorrow now08:57
bialixit seems so08:58
igcbialix: I suspect he wants people to test the website overnight first08:58
bialixmay be08:58
bialixigc: re translations, I'm a bit digressed. Do you want me to sync translations with lp?08:59
igche's only just back from London btw08:59
igcbialix: it was just an fyi08:59
igcI'm wrapped that the ru and fr translation are so complete!08:59
bialixigc: ah ok, I'm a bit busy at work08:59
bialixand don't check it regularly08:59
igcbialix: if we need to repackage the windows installer to include 0.14.3, then ...09:00
bialixperhaps your new welcome page require translations template update09:00
bialixI can do it right now09:00
bialixigc: jam said he think that 2.0.1 is more preferrable09:01
bialixmaybe it's time to release 2.0.1 and do big announcement with 2.0.1?09:01
igccool. So maybe we'll include an explorer 0.8.3 in that as well - just updated translations09:01
bialixigc: if you have access to http://pypi.python.org/pypi/bzr09:02
bialixthere is still 1.17!!!09:02
bialixit require update09:02
igcit does. I can't do it right now but I'll put it on my list09:03
bialixplease09:03
bialixthis delayed announce stuff is open can for such nit problems here and there09:04
* bialix believes release should be very focused on day job, not something that lasts for weeks09:04
* bialix believes release should be very focused one day job, not something that lasts for weeks09:05
igcagreed09:05
bialixgrrrrr09:06
bialixnew lp ui is....09:06
bialixgrrr09:06
bialixtranslations ui becomes worse and worse in last few month IMO09:06
igcbialix: 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 us09:07
igcgot to go now09:07
* igc dinner09:08
bialixigc: it seems quality of russian translations is below my quality standard. I have to review new stuff before importing it into trunk09:08
igcok09:08
arnarlIs 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
bialixigc: the tour is FANTASTIC09:08
bialixarnarl: your changes backed up in *.~1~ files09:09
arnarlIs there some cure for my stupidity? Not that I have lost much work this time, but still :-)09:09
bialixthere is no unrevert, but changes are usually saved in ~N~ files09:09
arnarla, nice I.09:10
bialixyou may want to use qrevert GUI dialog (from QBzr plugin) as safer revert09:10
arnarlI thought those were some emacs tmp files...09:10
arnarlI just try to commit often09:10
bialixcommit often is ok09:10
arnarlbut, I did not know about the *.~n~ files09:11
arnarlbialix: so thnx09:11
arnarl:-)09:11
bialixglad to help09:11
=== doko__ is now known as doko
=== quicksil1er is now known as quicksilver
nedosahi, quick question about hosting a bzr server on ec2, is there a way to pass an identity file to bzr+ssh ?10:43
nedosasimilar to invoking the -i option on ssh10:43
lifelessnot currently10:50
lifelessyou can configure things in .ssh/config10:50
lifelessor add the identity to your agent10:50
nedosalifeless: cheers, i guess i have to dig around and see how can i add identity info to my ssh agent10:55
mwhudsonnedosa: ssh-add /path/to/identity.pem?10:58
nedosamwhudson: fantastic, thanks !11:01
=== mrevell is now known as mrevell-lunch
=== Noldorin_ is now known as Noldorin
=== mrevell-lunch is now known as mrevell
=== vxnick_ is now known as vxnick
CameronP_Hi All14: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:13
CameronP_I dont think Im meant to use it in  thatway ;) oops14:15
matkorHi ! Is there any way to find when file containing given text was deleted from given file ? in bzr or bzrtools ?14:15
matkorLike:  for every rev listed in  bzr log <file> do  bzr diff -c <rev> | grep <text>14:19
Takthere's a bisect plugin14:20
matkorTak: "Use a binary search algorithm to apply a test of the source code for each revision", test may be simple grep ?14:24
Takthe test may be whatever you wish14:25
Takbasically you say "yes" or "no" for every iteration14:25
matkorTak: Ok. thanks14:31
=== Adys_ is now known as Adys
=== deryck is now known as deryck[lunch]
davidstraussmatkor: bzr-search does good indexing, too16:31
davidstraussmatkor: bi-sect may not work if the file's been deleted more than once16:32
matkordavidstrauss: 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
ubottuLaunchpad bug 408526 in bzr "bzr commit on large projects require large amounts of memory (dup-of: 109114)" [Undecided,New] https://launchpad.net/bugs/40852616:34
ubottuLaunchpad bug 109114 in bzr "[master] bzr holds whole files in memory; raises MemoryError on large files" [Medium,Triaged] https://launchpad.net/bugs/10911416:34
ubottuLaunchpad bug 408531 in bzr "bzr branch on large projects require vast amounts of memory" [Undecided,New] https://launchpad.net/bugs/40853116:34
davidstraussmatkor: yes16:34
Peng_DaffyDuck_`: bzr 2.0 with the 2a format holds a lot less in memory.16:35
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:36
Peng_Ah, it's 1x file bytes + 2x compressed bytes: https://bugs.edge.launchpad.net/bzr/+bug/109114/comments/1516:37
ubottuLaunchpad bug 109114 in bzr "[master] bzr holds whole files in memory; raises MemoryError on large files" [Medium,Triaged]16:37
DaffyDuck_`Peng_: That's promising! Thanks!16:38
michaelforrest#ubuntu-desktop, #ubuntu-devel, #ubuntu-doc, #ubuntu-installer,16:42
michaelforrest#ubuntu-website, #whatwg16:42
michaelforrest(oops - tried a /join command that didn't work - sorry)16:42
phinzecan 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:56
phinzewould this be checking through bzrlib.delta.report_changes(oldtree.iter_changes(newtree), ???)16:57
phinzehmm or maybe better bzrlib.diff.show_diff_trees(oldtree, newtree, stream_to_string), and loop through that looking for my keyword16:58
=== deryck[lunch] is now known as deryck
=== beuno is now known as beuno-lunch
=== beuno-lunch is now known as beuno
LpSolitwhen I get a patch created with bzr, how can I know which file revisions the patch was made against?19:26
LpSolitcvs diff adds the file revision number to the file, so it's easy to know19:26
LpSolitbut bzr diff only adds the date the file was edited, it looks like19:27
Lo-lan-doIs it a bundle generated with bzr send, or just a diff generated with bzr diff?19:27
LpSolitLo-lan-do: with bzr diff19:28
Lo-lan-doNot sure you can then.19:29
LpSolit:(19:29
Peng_LpSolit: Why not use "bzr send"?19:29
LpSolitPeng_: 1) because I never heard about it, and 2) because people create patches using bzr diff19:30
LpSolitdoes bzr send alter my installation?19:31
LpSolitor does it only generate a patch?19:31
bialixLpSolit: why you need to know revision then?19:31
Lo-lan-doIt generates a patch with extra metadata19:31
LpSolitbialix: 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 want19:33
LpSolitbialix: so you can select context=50 and you have the same patch redisplayed with 50 lines of context19:33
LpSolitthis works for years with CVS19:33
LpSolitand I have to update Bugzilla internals to work with bzr19: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 enough19:34
bialix`bzr send --no-bundles` is roughly equal to plain diff but with revision id19:34
LpSolitlet me try bzr send19:35
bialixPeng_: it can be done with plugin19:36
LpSolit$ bzr send --no-bundles test_config.t19:38
LpSolitbzr: ERROR: no such option: --no-bundles19:38
LpSolitPeng_: would it be reasonable to request to append the revno to the file name?19:39
bialix--no-bundle sorry19:39
LpSolitso instead of --- process_bug.cgi2007-10-12 07:21:59 +0000 , we would have:19:39
LpSolit--- process_bug.cgi2007-10-12 07:21:59 +0000 34419:39
LpSolitor something like that19:39
LpSolitmaybe revno:34419:40
bialixLpSolit: revno is local info for the branch19:40
Lo-lan-doIt's still valuable info.  Not everyone uses branches everywhere :-)19:41
bialixin the a diff context you should use revision id19:41
bialixIIRC svn shows revno in the diff comment19:42
Takyeah, it does19:43
LpSolitsame for cvs19:44
* LpSolit really needs this info19:44
LpSolitbzr send --no-bundle -o toto.diff19:45
LpSolitUsing saved submit location "test_config.t" to determine what changes to submit.19:45
LpSolitbzr: ERROR: Not a branch: "/var/www/html/selenium/bugzilla/bzr/3.4/t/test_config.t/".19:45
LpSolitwhat is it trying to do? :)19:45
bialixsend requires trunk branch available and passed as 1st argument19:47
bialixand send works with committed changes19:48
bialixperhaps it's not what you need19:48
LpSolitno, it's not19:48
LpSolitbefore committing changes, the patch has to be approved by reviewers first19:48
bialixIMO you can file a bug asking for this feature or write plugin19:49
bialix> before committing changes, the patch has to be approved by reviewers first19:49
bialixin bzr we working another way19:50
bialixcommit your changes, then send a patch for review19:50
bialixLpSolit: bzr is DVCS19:52
bialixcommit won't clutter trunk until it will be merged19:52
LpSolityes, I know that. Being a CVS user for many years, the change is not obvious :)19:53
LpSolitoh, right19:53
bialixLpSolit: look https://code.launchpad.net/bzr/+activereviews19:54
bialixabentley: can you restart bundle buggy please?19:55
abentleybialix: done.19:56
bialixabentley: error 50319:56
abentleybialix: Bundle Buggy is currently plowing through a big backlog of email, but it works for me.19:58
bialixnow and for me19:58
bialixLpSolit: look also http://bundlebuggy.aaronbentley.com/19:59
bialixthis one works with the output of bzr send command19:59
bialixabentley: thanks20:00
LpSolitwhere is the metadata?20:00
* LpSolit is looking at http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49F22B67.8020703%40aaronbentley.com%3E20:00
abentleybialix: np.  btw, launchpad also works with send.20:00
bialixabentley: IIRC the e-mail should be GPG-signed, right?20:01
LpSolitoh, I can see it when downloading the patch20:01
LpSolitok20:01
abentleybialix: Yes, and you need to have a Launchpad account with that GPG key.20:01
bialixI was not aware about assigning GPG to account20:02
lgoodrichHello 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:02
* bialix forgot about GPG20:03
lgoodrichI 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:03
bialixlgoodrich: if you mean to completely remove history for the file then no20:04
lgoodrichnot even through some sort of export, filter, then import process?20:05
bialixthis will works20:05
LpSolitbzr log test_config.t20:05
LpSolit------------------------------------------------------------20:05
LpSolitrevno: 4820:05
LpSolittimestamp: Mon 2008-10-20 01:41:26 +000020:05
LpSolitworks20:05
bialixbut after re-import you'll have completelly unrelated history20:05
LpSolitbut: bzr cat -r date:2008-10-20,01:41:26 test_config.t    returns:20:05
LpSolitbzr: ERROR: The file id "test_config.t-20081020014126-eujmy2eg2qvr-1" is not present in the tree <Inventory object at b74a650c....20:05
LpSolitwhat's wrong with that?20:05
LpSolitI'm trying to use the timestamp when the revision id is not available20:06
bialixbzr cat -r date:2008-10-20 test_config.t20:06
bialixmaybe20:07
lgoodrichhmm, I'll see if its worth the hassle, thanks20:07
LpSolitbialix: same error20:07
bialixis it possible the file was renamed?20:08
LpSolitno, the file is still here: http://bzr.bugzilla.org/selenium/3.4/annotate/head%3A/t/test_config.t20:08
bialixthis page http://bzr.bugzilla.org/selenium/3.4/changes?filter_file_id=test_config.t-20081020014126-eujmy2eg2qvr-120:10
LpSolithum, so it matches what the error message was reporting20:11
LpSolittest_config.t-20081020014126-eujmy2eg2qvr-120:11
bialixsays the date should be 2008-10-1920:12
bialixperhaps TZ issue20:12
bialixit's a bug though20:12
bialixsee 20081020 in the file-id20:12
LpSolitdoesn't work with 2008-10-19 either20:12
bialixit's the timestamp when file was added20:13
LpSolitif I type: bzr cat -r 48 test_config.t, I get the file content20:16
bialixthere is plugin file-revno which can print revno number of the last change for the file20:16
LpSolitso it only fails with date:20:16
bialixfile a bug please20:16
LpSolitbialix: URL to your bug tracker?20:17
LpSolitI know you don't use Bugzilla :)20:17
bialixhttps://bugs.launchpad.net/bzr20:19
LpSolitbialix: thanks! https://bugs.launchpad.net/bzr/+bug/44341920:35
ubottuLaunchpad bug 443419 in bzr "bzr cat -r date:YYYY-MM-DD,HH:MM:SS filename doesn't work" [Undecided,New]20:35
bialixthanks20:36
maxbHi. 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 at21:45
eferraiuoloI was wondering if there was a planned binary Mac OS X 10.6 install for bzr-explorer?21:46
maxbI'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:46
lifelesseferraiuolo: I suspect there is21:51
mwhudsonmaxb: bzr log --include-merges shows that "lost" history21:51
mwhudsonmaxb: if that's what you mean21:51
mwhudsonmaxb: (or qlog or whatever)21:51
maxbOnly if it actually got merged21:51
lifelessmaxb: what do you mean by 'more cumbersone'?21:51
maxbAs in, in any other VCS, I would point <some log viewer> at the repository and explore all the history21:52
lifelesswell, I dispute the 'any other' phrase :)21:52
lifelessin any DVCS it would only be 'all the local history', in other ones like codeville, they behave like bzr21:53
lifelesshowever, qbzr can do viz on multiple branches21:53
lifelessI think a bug on it to allow qbzr <root of repo> to work would be well received21:54
lifelessmaxb: anyhow, I think it isn't a problem because people don't need to do it21:54
maxbI suppose my consternation is magnified by this being a conversion from CVS, and knowing that I'll have to coax people away from CVS practices21:55
* mwhudson has almost entirely forgotten that software development is even possible with CVS, let alone how it is done21:57
lifelessmaxb: so, one use case is 'find a brnach name' which is replaced by 'ls' [or 'bzr branches']22:00
maxbmwhudson: I wish I _could_ - but I'm forced to use it at work :-) Hence the attempt to plot a way out.22:01
maxblifeless: A use case I'm concerned about is "Find a tag. I don't know which branch it's in"22:01
lifelessmaxb: so, what bzr does is merges release branches to trunk22:02
maxbls / bzr branches are somewhat problematic unless you have *all* branches locally22:03
lifelessmaxb: so all tags are in trunk22:03
lifelessmaxb: yes, but see under distributed22:03
maxbI 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 future22:03
jammaxb: well if a feature isn't merged to trunk, then it would stand to reason that the tag isn't there, no?22:04
bob2what are all these unmerged branches in cvs being used for?22:04
maxbWell, 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" branches22:05
pooliejam, hi?22:07
maxbI wonder how plausible it would be to write a tool which can add an extra parent to an EXISTING revision?22:15
maxbI realise this can only work if you know you hold the only copy of the repository22:16
maxbBut it would be an interesting option for patching up a cvs conversion before making it public22:16
jammaxb: filtering the output of 'cvs2bzr' (the fast-import file) is the perfect time to do that22:16
jambefore it gets imported22:16
maxbjam: Well.... sort of. It's a lot easier to find the joinpoints if you can 'bzr viz'22:17
jammaxb: you can iterate over it22:17
jamconvert, filter, convert again, etc22:17
maxbthis is true. I'm just a bit unsure how you'd inject the information back into the conversion22:18
jammaxb: you might look at fastimport's 'filter-branch' stuff22:18
igcmorning23:17
meoblast001hi23:26
meoblast001i have my email in Bazaar set to "meoblast@aol.com"23:27
meoblast001if i change my email address, that might become a problem23:27
meoblast001is it safe to just set it to "meoblast"23:27
malepthi, 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:35
wgrantmeoblast001: 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
meoblast001ugh23:51
meoblast001i don't like aol though23:51
meoblast001i plan to switch23:51
meoblast001and when i do, everything will recognize me as a new person entirely23:52
wgrantIs it really a problem if some of your old commits have an old email address?23:52
meoblast001wgrant: well, services, such as ohloh, detect developers by email23:54
meoblast001new email makes you a different developer23:54
maleptmeoblast001: those services allow you to have multiple emails per user23:55
wgrantRight.23:55
wgrantYou can easily merge the users.23:55
maleptI am certain of this for at minimum, LP and Ohloh.23:55
meoblast001do pretty much all services like that have those features?23:55
bob2meoblast001: also, changing to 'meoblast' would cause a discontinuity now, anyway23:55
bob2meoblast001: just the same as moving to a new email address would23:55
meoblast001bob2: well, if you do it the normal way ;)23:55
meoblast001keep in mind pretty much no one but me and one other developer has a checkout of my project23:56
meoblast001so now is the best time to fix screw ups23:56
pooliehello igc23:58
igchi poolie23:58

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!