/srv/irclogs.ubuntu.com/2009/02/02/#bzr.txt

kfogellifeless: so reading Martin's mail, I think error code 2 makes more sense here.00:00
thumpermlh_: I think we've lost the context to the question00:00
kfogelUrgk.  What's the way to make a command throw a specific error code?  Do I raise() something (such as BzrCommandError)?00:02
mlh_thumper: yeah sorry I didn't want to distract people from the current one.00:04
mlh_10:30 < mlh_> a bit OT but do any DVCs support having the repo on one disk and the checkout/tree on another?00:04
mlh_10:30 < lifeless> mlh_: bzr does00:04
mlh_10:30 < lifeless> mlh_: bzr does00:04
mlh_oops00:04
=== mark1 is now known as markh
thumpermlh_: I use lightweight checkouts for this00:07
lifelesskfogel: see e.g. cmd_diff00:21
lifelesskfogel: I have replied to the original thread btw00:21
lifelessI think that its ok to do this00:21
lifelessbut commit needs attention00:21
lifelessand it needs to be more visible; this is an exceptional case00:22
lifelessAs stephen said, its nonsense to argue that this matters for vc-el00:22
kfogellifeless: reading your reply00:22
lifelessfrom the user perspective I grant the argument about just-another-status00:22
lifelessyay, I finally have a scrubbed repo00:24
lifelessweirdness from 2005 eliminated :P00:24
kfogellifeless: dang it, I hate how mail archives are always a bit behind.  I'd like to refer to lifeless's mail in a commit message right now, but I don't have the archive URL yet.00:32
lifelesskfogel: in an implementation sense, do the status operation, then raise an error00:32
kfogellifeless: already done :-)00:32
kfogeljust writing the log message now00:32
kfogelI went with code 3.  Still need to make sure that commit also behaves that way, but I think it does.00:32
lifelesskfogel: oh, have I introduced you to bzr-search?00:34
kfogellifeless: ?00:35
kfogelhttps://edge.launchpad.net/bzr-search00:35
kfogeloh, nice!00:35
kfogelSVN has needed that for years, and no production-ready solution exists still.00:35
lifeless:)00:36
kfogellifeless: be interesting to have it index the diffs of the commits too, as in "Show me changes containing string S"00:36
lifelessit indexes the diffs00:36
kfogellifeless: !00:36
kfogellifeless: home page doesn't say that00:36
lifelessunique text of merges too00:36
lifelesscontent of files ;P00:37
lifelessI can tweak it00:37
kfogellifeless: "content of files" means something different :-)00:37
lifelesswell you get the content by starting with nothing and patching :)00:37
lifelessI started with whole text every time, it was useless00:37
lifelessI'm not sure I even committed that version :P00:37
lifelessanyhow, give it a spin00:39
lifelessif you have bzr-search present, loggerhead will do ajax search completion stuff00:40
lifelesswishlist item, tab completion of deleted files00:51
davidstrausslifeless: is there a way to automate bzr-search reindexing/00:58
lifelessdavidstrauss: how do you mean?00:59
davidstrausslifeless: I have Loggerhead showing some server-side branches, but nothing handles reindexing them automatically, it seems.00:59
lifelessdavidstrauss: what bzr version are the clients?00:59
lifelessdavidstrauss: its meant to index new revisions automatically01:00
lifelessI presume thats what you mean, rather than delete the index and start over01:00
davidstrausslifeless: yes01:00
lifelessare you pushing/committing with bzr+ssh?01:00
davidstrausslifeless: does the smart server automatically handle that?01:00
lifelesstheres a post branch tip change hook01:01
onoxI get Errno 13 when doing bzr update01:03
onoxhow do I know which file is permission denied?01:03
lifelessonox: bzr doesn't tell you? Hm, please file a bug.01:04
lifelessonox: and I'll give you a workaround -01:04
onoxbzr: ERROR: [Errno 13] Permission denied01:04
lifelessrun with01:04
lifelessBZR_PDB=1 bzr .....01:04
lifelessthen you will be dropped into pdb01:04
lifelessyou can use that to find the filename and print it, probably01:04
onoxand a lot of -D <file> and M <file>01:04
onoxpdb?01:04
lifelesspython debugger01:04
lifelessthis clearly isn't user friendly, but it will help get you going again :)01:05
lifelessthe bug report will help us fix the root cause01:05
onoxlifeless: http://dpaste.com/115462/01:06
onoxhow to proceed? :)01:06
lifelesstype in01:07
lifelessbt01:07
lifelessand01:08
lifelesslist01:08
onoxlifeless: http://dpaste.com/115463/01:09
spivonox: pp from_, to01:09
onox(u'/home/mark/workspaces/python/awn-extras/src/tomboy-applet/icons/Makefile.am', u'/home/mark/workspaces/python/awn-extras/.bzr/checkout/pending-deletion/new-85')01:10
igcmorning all01:10
spivThe permission denied happened while renaming that Makefile.am to that second filename.01:11
spivPossibly you lack write permission in either the source or destination directory?01:11
onoxpending-deletion/ doesn't exist01:12
spivonox: that's weird!  That directory is created by the TreeTransform constructor.01:13
onoxah, lol01:13
onoxfound it01:13
onoxsrc/tomboy-applet/icons/tomboy.png was root:root01:13
onoxbut has nothing to do with the revisions I tried to fetch01:14
onox:S01:14
onoxso, bzr tried to delete src/tomboy-applet/icons/Makefile.am (among other files), but it failed because icons/tomboy.png was root:root01:15
lifelessonox: please do file a bug01:17
onoxbugtracker at LP?01:17
spivonox: right01:17
=== kiko is now known as kiko-zzz
onoxspiv: bug report filed01:28
=== asac_ is now known as asac
=== RAOF_ is now known as RAOF__
=== RAOF__ is now known as RAOF
lifelesstrying for zen-hacking mode, will poll back here hourly or so02:10
=== timchen119 is now known as nasloc__
lifelessmemo to self, tell vila 13:08 < cortana> however it uses M2Crypto.HTTPSConnection which can possibly be used as a replacement for the default HTTPSConnection class02:15
fullermdigc: ping02:29
igchi fullermd02:29
fullermdHey.  You did some log change recently that sped it up with a specified revision range, right?02:29
igcI did but it's not yet landed02:30
igcjam voted tweak and I'm yet to do the tweaks02:30
igctoday possibly02:30
fullermdHm.  Ok.  I came across a really weird performance thing, thought it might be related.02:30
igcnamely?02:31
fullermd(flog = log --forward --short)02:31
fullermdOn bzr.dev, bzr flog -r-16.. takes 2.88 seconds.02:31
fullermd-r-16..-1 takes .55.02:31
igcmy patch fixes that02:31
lifelessso they both take 2.88 seconds?02:31
lifeless:P02:31
igc:-)02:31
fullermdMaybe they take 1.44 each  ;)02:32
igcsorry to surprse but they both take .55 now :-)02:32
fullermdSweet.02:32
fullermdigc++02:33
igcfullermd: in case your curious, bzr.dev loads all of mainline history for -10.. but not for -10..-1 :-(02:33
thumperigc: why?02:34
igckind of sucks on an emacs repo with 93K revisions on the mainline02:34
fullermdLeprechauns.02:34
igcthumper: a bug02:34
igcwell, a bug in that it search all of history to find '' instead of realising that it's the tip when at the end of a revisionspec02:35
thumper:)03:01
thumperigc: at least that sounds simple03:01
* igc lunch03:18
thumperis there a way with bzr to grab a tarball of a remote branch (for buildout) ?03:56
lifelessbzr export ?03:57
spivthumper: bzr export foo.tar.gz lp:foo, iirc03:58
thumperta03:58
thumperis there any way to set the parent branch for a light weight checkout?04:24
thumperwe have a utility that uses sed to check for the parent branch in `bzr info`04:25
thumpermy branch doesn't have a parent set04:25
spivbzr pull --remember04:27
spivYou could probably even abuse -r to avoid actually pulling anything, e.g. "bzr pull -r revid:FAKE --remember $parent_url"...04:28
lifelessthumper: parent branch is in the branch, not the tree04:46
=== samurai is now known as samiam
lifelessnight all06:18
kfogelnight, lifeless06:19
vilahi all07:18
=== AfC1 is now known as AfC
=== mark1 is now known as markh
lifelessvila: urllib2 https possible hint: 13:08 < cortana> however it uses M2Crypto.HTTPSConnection which can possibly be used as a replacement for the default HTTPSConnection class07:30
vilalifeless: I looked into M2Crypto long ago, except if some serious upgrade has been made, I'll prefer to use the ssl module introduced by python-2.6, for which 2.5 and 2.4 support exists via dedicated module, but thanks for the hint07:32
vilalifeless: and hi ! Always a pleasure to cross you here ;)07:32
spivI wouldn't cross lifeless if I could help it ;)07:32
viladamn... cross doesn't carry the idea of meeting briefly ?07:33
spivvila: it does somewhat, but it also carries the meaning of "To run counter to; to thwart; to obstruct; to hinder; to clash or interfere with." :)07:34
vilaOuch :-)07:35
lifelessits ok, I took your meaning as intended07:35
vilaWhat  common verb or expression should I use then ? (In case I came across less tolerant people :)07:35
spivvila: "overlap" is probably more unambiguous, unless someone wants to be interpret it in a physical rather than temporal sense ;)07:35
spivCross is fine, I was just being silly.07:36
vilamore unambiguous... you try to lose me again :)07:36
spivWell, nothing's *totally* unambiguous in English.07:36
lifelessmeet07:37
lifelessencounter07:37
spivintersect if you're feeling geeky.07:37
* davidstrauss also has an English degree. Is this a debate about diction?07:38
vilaYeah, I think intersect carries the time scale I wanted to point to :-)07:38
spivBasically the problem isn't English, it's my enthusiasm for creative misinterpretation...07:38
vilaspiv: Oh, I see, strangely enough fullermd haven't intersect with the discussion yet.... :)07:40
davidstraussOh, I see now that nothing of substance is being debated. Carry on. ;-)07:40
spivHeh.07:40
fullermdHmmwhat?  Did I miss a chance to screw English around?08:32
* fullermd gets rather cross.08:33
* igc dinner08:38
jelmerlifeless, yeah09:00
LarstiQjelmer: moin09:06
LarstiQjelmer: I'm back at dizzy, want me to do anything?09:06
jelmerLarstiQ, see privmsg09:08
=== gdmfsob is now known as mishok13
=== mark1 is now known as markh
* AfC wonders what we'd have to do to get ohloh to support bzr10:24
luksgiven it's open source now and already supports hg, it shouldn't be that hard10:25
LarstiQis it open source now?10:28
LarstiQAfC: the +1s from users have been ignored so far10:28
LarstiQAfC: jelmer (iirc) and myself offering to help implementing notwithstanding10:29
LarstiQapparently not the right avenue to get things done10:29
lukshttp://thechaw.com/ohloh_scm/10:30
AfCLarstiQ: I know. Lots of us have offered10:41
jelmerthe source code for Ohloh has been published10:52
jelmerat least the SCM-related bit10:52
jelmerso somebody *could* contribute bzr support10:53
Pieterhow about you just create a patch, send it in and see what the feedback is?10:53
jelmerunfortunately it's all ruby :-(10:53
jelmerAfC: do you know any ruby ?10:53
LarstiQPieter: that is now indeed possible, it wasn't before.10:57
AfC1jelmer: not a line11:07
=== AfC1 is now known as AfC
LarstiQjelmer: I have the pickaxe book, does that count? ;)11:19
lifelessnight all12:14
jamvila: just wondering if you had a chance to play with my updated fix277537, and see how it worked for you13:21
jamI'm going to be offline in about 10 min13:21
jamI guesss a bit earlier, as my machine wants to reboot. hopefully bbiab13:23
vilajam: rats, too late13:23
santagadais there a bzr-html plugin, like the qt one?15:28
=== joshuablount is now known as jblount
=== kiko-zzz is now known as kiko
ymlis there a way to include in a file the rev and the date each time I commit a change on that particular file?16:02
KinnisonThere's a keywords plugin IIRC16:03
KinnisonBut that kind of thing is kinda nasty IMO16:03
ymlThe context is that I would like to update this piece of information on the documentation store in the bzr branch.16:03
=== abentley1 is now known as abentley
KinnisonAs I said, I think there's a plugin which may help you16:04
=== apw is now known as cafetiere
=== cafetiere is now known as apw
Takwill bzr-git work with bzr 1.5?17:04
Lo-lan-doI think it requires a newer version.17:04
Lo-lan-doHm, actually I'm not so sure.  The code doesn't seem to check.17:05
TakI tried doing a branch with 1.5, and got an error message saying bzr couldn't load the git plugin, but I didn't know if I'd done something wrong, or if the version was incompatible17:09
Lo-lan-doWhat was the error message?17:12
Takoh, sorry: "Unable to load plugin 'git' from '/home/lbar4/.bazaar/plugins'"17:21
Lo-lan-doNothing else?17:22
Taknope17:23
jelmerTak, anything in ~/.bzr.log ?17:25
Lo-lan-dojelmer: He uses bzr 1.5, but I didn't see any requirement for a greater version in git/__init__.py17:25
jelmerLo-lan-do, oh, you need bzr 1.1217:25
jelmeror perhaps 1.1117:25
jelmerthe bzr API call to check the bzrlib version probably isn't in 1.517:26
Takok17:26
TakI guess I'll just use git for now then17:26
jelmerhi btw :-)17:26
* Tak cry17:26
Takjelmer: have you looked at/tried my md-bzr branch recently?17:28
jelmerTak: Yeah, but I haven't managed to build it yet17:29
jelmerdinner time, back in ~an hour17:29
Lo-lan-doUh, that time already?17:29
Lo-lan-doDamn, the day went past without me noticing.17:30
* Tak nods17:30
jelmerLo-lan-do, well, Dutch traditionally eat at 18:00, I think it's more like 20:00 for the French?17:30
Takor later17:31
Lo-lan-doI'm usually hungyr (and tired of work ;-) at around 19:00, but I was just generally wondering how it was already half past six and I thought I still had some time to do stuff.17:31
ronnyhmm17:37
ronnyargh dammit17:37
ronnyjelmer: how fast can you guys get rid of the single head branch thing - its the main gipe i always run into over and over17:38
Lo-lan-doIs that the "colocated branches" thing?17:38
ronnynot exactly17:41
ronnyi dont care if they are named, but i want more than one head on the same branch17:41
ronnywell, not exactly branch - i just want multiple heads accessible from the same workingtree as easy as possible17:48
nDuffronny, ...referring to a git-like workflow?17:56
nDuffronny, "bzr switch foo" strikes me as pretty similar in effect, even if the implementation is different.17:58
ronnynDuff: mostly monotone and hg alike17:58
ronnybzr switch is a lot more for me to do17:58
nDuffronny, how so? if only providing the last element (not the full path), it reuses the location of your existing branch except for the last element, so it really does only need the branch name as the argument, not the URL.17:59
ronnydoesnt fit my workflow18:01
beunosantagada, loggerhead18:02
nDuffronny, ...hmm; I haven't worked with monotone at all, and hg fairly little, so I'm not entirely sure what you're looking for... would it be similar to looms?18:02
ronnyno18:03
nDuff...hmm; as I don't grok the workflow distinction between using switch within a shared repo and multiple heads within a branch, I don't think I can help.18:05
=== abadger19991 is now known as abadger1999
ronnynDuff: i mainly want to have a as simple structure in the fs as possible18:09
ronnyi dont care how exactly management works - but it should stay the hell outa my fs18:10
nDuffronny, ...oh, so it's not a workflow issue, but an aesthetics issue.18:11
ronnyi did set up my whole env to deal with the projects being in their place18:12
ronnyif they are suddenly in another place, its fucked18:13
jelmerronny, I need to get comments on my proposal for colocated branches first18:14
ronnyhmm18:14
ronnyjelmer: whats the url again18:14
jelmerfor the spec? It was posted to the mailing list?18:14
ronnyjelmer: i dont follow the ml and google didnt find it18:16
jelmerronny, one sec18:16
ronnyoh yikes18:16
ronnyi just noticed how broken the new bzr support for anyvc is18:16
jelmerronny, https://lists.ubuntu.com/archives/bazaar/2009q1/051320.html18:17
ronnyjelmer: as for collated branches in url's - how about a http get param?18:21
ronnyjelmer: alternatively collated branches can just be mapped to a directory containing multiple branches on a remote18:23
ronnymagic chatacters wont be nice18:23
jelmerronny: yes, but what if there is a on-disk branch with the same name?18:24
jelmerronny, this has already been discussed separately on the list, in a different thread18:24
jelmerthere wasn't a conclusive outcome18:24
ronnyjelmer: repo/branchname vs repo/collation/branchname or repo/collation?branch=branchname18:26
ronnysince collated branches wont have a physical path i think a get param maps the intend better, but a path maps it more restfull18:27
jelmerronny, GET-style parameters is more typing18:27
jelmerronny, martin has suggested using regular path separators and using GET-style parameters in case there is ambiguity18:28
ronnybut if one uses collated branches for git-alikeness wont he actually sync with the main url of the collation18:28
jelmerronny: ?18:29
CaMasonHi guys. I'm getting "bzr_log.random-" files appearing in my working copy after commits (all successful). Any ideas how to prevent that?18:29
ronnyjelmer: as far as i understand git users usualy deal with paths to repos, not paths to branches18:29
CaMasonthe contents of the files are the prefilled commit templates18:30
ronnyso they would deal with repo/collation instead of repo/collation/branch18:30
ronnyjelmer: also would there be an issue in just adding an extra path element to let the whole collation have a name?18:31
jelmerronny, yes, ambiguity with any actually existing branches on disk18:31
MvGHi! Can I push a bzr branch into a subdirectory of a svn repository using bzr-svn, even though the two are unrelated at first? How would I specify a merge base revision, as the error message "Branches have no common ancestor, and no merge base revision was specified." indicates?18:31
ronnyjelmer: can people do things like get a collation a repo/foo and a branch at repo/foo/bar18:32
jelmerronny: bzr's UI is very much oriented towards branches, git only uses URLs for repositories18:32
jelmerronny: yes, there can be a (nested) branch or regular branch at repo/foo/bar18:32
jelmerMvG, you can merge in that case using -r0..-118:32
jelmerMvG, I mean "bzr merge -r0..-1 <url>"18:33
MvGjelmer: But I want to push, not merge. I can't merge from a nonexistant directory, can I?18:33
jelmerMvG, are you using "bzr svn-push" ?18:33
MvGjelmer: No. Should I?18:33
jelmerMvG, yes - see the bzr-svn FAQ18:34
ronnyjelmer: oh :/ then it needs an url param18:34
MvGOK, will do. Once I've reestablished my bzr-svn setup, which I've just nuked by pulling and deleting subvertpy...18:35
jelmerronny, See my lines earlier - Martin suggested using path separators but falling back to GET-style parameters to deal with ambiguity18:35
ronnyjelmer: there is a major issue - how does a user decide if he needs to fall back18:36
ronnyhmm18:36
ronnynow i need  the docs for workingtree - is there anything beside source/pydoc?18:37
asabiljelmer: what about adding a -b option flag ?18:37
jelmerronny, pydoc should be pretty comprehensive18:37
asabilor would that break a lot of things UI wise ?18:38
jelmerasabil, impractical and that would mean adding a branch parameter in the API everywhere as well18:38
asabilyes I see18:39
MvGjelmer: Is there an easy way to install bzr-svn + subvertpy as user - preferably with unmodified branches symlinked to dirs like ~/.bazaar/plugins? Used to work before subvertpy got factored out, but I can't seem to get it working now.18:48
jelmerMvG, you can install subvertpy into the system or set PYTHONPATH appropriately18:49
MvGBoth feel ugly, but I'll use this for now I think.18:50
=== abadger19991 is now known as abadger1999
jelmerronny, also feel free to ask questions here if you have them, of course19:02
ronnyjelmer: just started fixing stuff, seems like the bzr stuff someone else added to anyvc is highly bugged19:05
santagadabeuno: sorry, what was it19:05
santagada?19:05
beunosantagada, if you want a web UI for bzr, you can use loggerhead19:08
ronnyhmm19:09
santagadabeuno: no I wanted something like a plugin that output html19:09
ronnygod i wish anyvc was already usable for web ui's19:09
santagadaso I could use the result of bzr blame inside some other tool (in my case textmate)19:10
beunosantagada, you can use bzr-xmloutput19:10
santagadabeuno: then use a xslt transform to transform it to xhtml?19:10
beunosantagada, maybe, yes  :)19:11
jelmerbeuno: Hi Martin :-)19:12
santagadabeuno: not a big fan of xslt... maybe I will use the bzr api and generate html using something like jinja templates19:12
santagadabeuno: thanks19:12
ronnywhat package defines the NotBranchError?19:13
jelmerronny, bzrlib.errors19:13
nDuffsantagada, as an aside, if you're trying to generate xhtml, I'd consider using Genshi as a way to be certain that your output is always well-formed.19:13
santagadanDuff: I don't care much about well formed, and it will be any html that webkit can grok19:14
santagadaand I don't like genshi19:14
santagadait's better than xslt19:14
kfogelI've done 'bzr init-repo .; bzr branch lp:bkrpr bkrpr-trunk; <<bind bkrpr-trunk to lp:bkrpr so it's a mirror, using instructions from http://bazaar-vcs.org/Scenarios/RepeatedContributions>>; bzr branch bkrpr-trunk bkrpr-task-branch-foo; cd bkrpr-task-branch-foo; <<edit some files>>; bzr commit -m 'Finish my task.' "19:18
kfogelIs 'bzr push lp:bkrpr' the right way to send my change to the upstream?19:19
kfogelI'm reading '6.2.5   Merging a feature into the trunk' in the User's Guide, but I'm not 100% sure 'bzr push' is the right thing...19:20
bialixCaMason: ping19:28
bialixCaMason: you has asked your question about bzr_log files19:29
CaMasonbialix: yes :)19:30
bialixCaMason: these files have created by your editor when you type the commit message. I suppose it's auto-backup. What is your editor?19:30
CaMasonI'm actually wondering if it is anything to do with vim... I did vimtutor the other day (which helped set up a .vimrc)19:30
bialixI recall this question has raised in the past19:31
bialixIMO you can delete these files safely. I don19:31
CaMasonI do delete them.. it's just messy having them in my wc :)19:31
CaMasonmust be a setting within this .vimrc then19:32
bialixI don't use vim, so I can't help and suggest how to prevent them19:32
rblaschjelmer: Hi, can I ask you a bzr-svn question?19:32
jelmerrblasch, yeah, np19:32
bialixCaMason: something like :w!-+?@ combinaion needed. more or less19:32
CaMasonbialix: no worries, thanks either way.. it's help me pinpoint my thoughts :)19:32
rblaschGreat!  I've set up thing to work with the latest 0.5 version.19:33
rblaschWhen doing a branch, bzr suddenly hangs.19:33
bialixCaMason: It's just silly to see how you ask this question several days in row and nobody answer19:33
rblaschThe last message I get is "determining revisions to fetch 11111/36167", without any further progress.19:33
rblaschCPU load stays high, though.19:34
CaMasonbialix: I was thinking.. if this was an editor issue, somebody would have seen it before :s19:34
rblaschSame thing with 0.4 works fine.19:34
bialixyep19:34
bialixCaMason: that's all I know. good luck19:34
rblaschIs there any diagnostics I can enable to track this down?19:35
Lo-lan-dorblasch: Could it be the same as http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513412 ?19:35
ubottuDebian bug 513412 in bzr-svn "bzr-svn: Fetching revisions from SVN is slow" [Normal,Open]19:35
CaMasonbialix: aha, I think i've spotted the line. An if statement was overriding my set nobackup :)19:35
jelmerrblasch: you can run with -Dtransport -Dcache and see what it is doing19:35
Lo-lan-dorblasch: Try with -Dtransport -Dcacne19:35
jelmerrblasch, also, you can try with bzr.dev, that will have better progress indication19:35
bialix:-)19:35
CaMasonbialix: ahh I've seen what confused me now. I'm used to vim making backup files with a tilde. However, for some reason my terminal is showing tilde more like a dash19:36
CaMasonso the 'backup' files didn't look like normal vim backups to me19:36
rblaschjelmer: Will do.  Actually I'm using bzr.dev.19:36
bialixCaMason: so now you know kung-fu ;-)19:36
CaMasonbialix: oh yes >:)19:36
bialixgreat19:37
jelmerrblasch, it will write status messages to ~/.bzr.log19:37
rblaschjelmer: Yes, it looks like the same issue.  "revprop list" counting down.19:40
rblaschjelmer: It's just that I got 36k+ revisions, that's why it feels like it's taking forever.19:41
jelmerrblasch, ah, k19:42
rblaschjelmer: So it's already a known issue.  Thanks for your time, and a whole lot more thanks for this brilliant plugin!19:45
jelmerrblasch, np!19:45
jelmerrblasch, Hopefully this will be fixed in 0.5.119:45
Lo-lan-do\o/19:46
Lo-lan-do(One more beer for jelmer on Friday night :-)19:46
ronnyjelmer: whats the correct way to get a diff of the workingtree?19:48
Lo-lan-do"Lightweight checkout (format: 1.6 or 1.6.1-rich-root or 1.9 or 1.9-rich-root or dirstate or dirstate-tags or pack-0.92 or rich-root or rich-root-pack)"19:49
ronnyhttp://paste.pocoo.org/show/102476/ <- see the diff method in line 148 for the current broken way :(19:49
Lo-lan-doWow, that's incredibly useful :-)19:49
jelmerronny, yikes, that *is* broken19:50
jelmerronny, you're trying to get the changes against the last committed revision here right?19:50
ronnyjelmer: yeah19:50
ronnyjelmer: im fixing javiers stuff :(19:50
jelmerronny, call show_diff_trees(self.wt.basis_tree(), self.wt, strdiff, specific_files=relpaths)19:51
jelmerronny: new_tree.branch.revision_history()[-2] will always be wrong, the last committed revision is (obviously) [-1]19:51
ronnyjelmer: i noticed by accident that the diff was bewen tip and tip-119:52
jelmerronny, also, some other notes (while I'm looking at this code anyway):19:53
jelmerronny, wt.remove() can take a list of files, there's no need to iterate over all files19:53
jelmerronny, revert() seems right only in the case paths=None19:53
beunoronny, is this for pida?19:54
kfogelI've done 'bzr init-repo .; bzr branch lp:bkrpr bkrpr-trunk; <<bind bkrpr-trunk to lp:bkrpr so it's a mirror, using instructions from http://bazaar-vcs.org/Scenarios/RepeatedContributions>>; bzr branch bkrpr-trunk bkrpr-task-branch-foo; cd bkrpr-task-branch-foo; <<edit some files>>; bzr commit -m 'Finish my task.' "19:54
kfogelIs 'bzr push lp:bkrpr' the right way to send my change to the upstream?19:54
kfogelI'm reading '6.2.5   Merging a feature into the trunk' in the User's Guide, but I'm not 100% sure 'bzr push' is the right thing...19:54
ronnybeuno: yeah19:54
beunoronny, many bugs in the bzr integration?19:54
ronnyit was less when i used subprocess19:55
ronnythen i merged the work of someone else19:55
ronnynow i do myself19:55
ronnyand of course i lack unittests :(19:55
jelmerronny, I also don't think the converting to relative paths is necessary19:55
ronnyjelmer: absolute paths is necessary, since i pass paths relative to the repo base, i have to reiterate a few time till its more nice19:56
jelmerronny, but there's no need to convert *back* to relative paths afaik, as is done in a few places19:56
ronnyk19:57
beunoronny, this is Javier Derderian's work?  is it not good quality?19:57
ronnyunfortunately it seems like this part of his work isnt good19:58
beunoronny, I'm sorry to hear that  :(20:00
ronnyjelmer: hmm, is there a tool to do globing?20:02
ronnyi think i could use that20:02
jelmerronny, not that I'm aware of, the shell takes care of that for us I think. There may be something in the win32-specific code20:03
ronnyhmk20:03
jelmerronny, what would you need globbing for anyway, it seems like a bad thing to be part of a UI..20:04
jelmereeuhm, API20:04
ronnyjelmer: probably right, shell mindset sometimes is nasty20:05
ronnyhmm20:09
=== kiko is now known as kiko-afk
ronnyjelmer: for some reason my current usage of diff causes a traceback, please take a look at the current code + trace on http://paste.pocoo.org/show/102490/20:22
jelmerronny, one of paths is not known by bzr?20:23
ronnyjelmer: thats the base path of the repo20:24
ronnyhmm, let me dig if i find where it comes in20:24
jelmerronny, perhaps try ["."]20:24
ronnyseems like it doesnt like an abspath20:25
bialixLarstiQ around?20:29
ronnyjelmer: i intend to make the shell command vc diff work in bzr repos20:29
ronny(anyvc ships a executable called vc)20:29
bialixLarstiQ: ping20:30
LarstiQbialix: yeah20:34
LarstiQbialix: pong :)20:34
bialixLarstiQ: I've finished new format of project.cfg20:35
LarstiQbialix: cool20:35
LarstiQbialix: is it in trunk, or in a seperate branch?20:35
bialixI've implemented some of your notes as well20:35
bialixit's separate branch20:36
ronnyjelmer: diff seems to work fine as soon as i use a relative paths20:36
jelmerronny, hmmok20:36
LarstiQbialix: ok20:36
bialixLarstiQ: so if/when you will be curious you can play with lp:~bialix/bzr-scmproj/format-change20:36
LarstiQbialix: noted20:37
bialixLarstiQ: you have to upgrade your .scmproj by hands. Or may be recreate it20:37
bialixsorry for inconvenience20:37
LarstiQbialix: that's ok20:37
bialixthere is doc for early adopters20:37
bialixat least it says what should be changed20:37
* LarstiQ is very tolerant of this sort of inconvenience.20:38
LarstiQJSF t:updateActionListener not working, not so much20:38
* LarstiQ had a long day at work20:38
bialixyeah, it's still alpha. so I have a poor excuse20:38
LarstiQ:)20:38
* LarstiQ branches the format-change branch20:38
bialixLarstiQ: I understand. It's just head u20:38
bialixhead up20:38
bialixyou seem to be interested20:39
* LarstiQ nods20:39
LarstiQbialix: I am.20:39
* LarstiQ just needs to blow off steam re work20:39
bialixI saw good news about nested trees here, abentley will continue this work20:40
bialixthis is great20:40
bialixbut in the meantime I'll continue my work too20:40
bialixin some sense I feel they are orthogonal20:41
bialixLarstiQ: rest well! I'm going to rest too.20:41
LarstiQbialix: hey, part of my rest is reading irc (backlog) ;)20:41
bialix:-D20:42
LarstiQbialix: yeah, I'm happy that Aaron is coming back to them.20:42
bialixI understand20:42
LarstiQbialix: and I'll certainly keep you posted of the progress20:42
ronnyhmm20:42
ronnynow i have to figure iter_changes20:42
bialixLarstiQ: it's great20:42
bialixwoohoo!20:42
LarstiQ:)20:43
* bialix disappears20:43
lifelessmoin20:47
mwhudsonhi lifeless20:47
jelmerkfogel, still there?20:52
jelmerkfogel, In that particular workflow, pushing to trunk would be appropriate I think20:53
ronnyjelmer: is there any description on how to interpret the items that wt.iter_changes yields?20:57
ronnyan 8 tuples with some items + nested 2 tuples is pretty confusing at first sight20:58
jelmerronny, see the docstring for bzrlib.tree.InterTree.iter_changes20:59
LarstiQronny: bzrlib.tree.InterTree.iter_changes docstring20:59
ronnynice21:02
LarstiQronny: you might also want to look at bzrlib.delta21:03
LarstiQronny: and bzrlib.dirstate for more gory details21:04
ronnyiter_changes seems to be the right way to get what i need21:07
ronnynice full detail level and easy to translate to the terms of anyvc21:09
beunoronny, maybe loggerhead's code can help you as well: http://bazaar.launchpad.net/~loggerhead-team/loggerhead/trunk/annotate/head%3A/loggerhead/history.py21:09
beunowe generate diffs21:09
beunomaybe this is better: http://bazaar.launchpad.net/~loggerhead-team/loggerhead/trunk/annotate/head%3A/loggerhead/controllers/diff_ui.py21:10
ronnyhmm21:10
ronnybeuno: at some point i'll have to add a web ui for anyvc21:10
ronnyremote branch/repo management + smart servers for hg/bzr21:11
=== dereine[OFF] is now known as dereine
lifelesshere we compressbench again21:24
lifelessjelmer: did you use the compressbench results at all ?21:24
lifelessJc2k: ping21:24
jelmerlifeless, not yet21:24
jelmerlifeless, I'm going to this week21:24
jelmerlifeless, dpush is almost working for bzr-git21:24
jelmerthat was the main thing I worked on21:24
lifelesscool21:25
Lo-lan-doLook, at some point it will cease to be reasonable for me to buy you drinks, you know.21:27
jelmerLo-lan-do, at some point I assume it will also start affecting the quality of my code ;-)21:27
* Lo-lan-do tries to think of a way to hack a two-way bzr/git gateway for several branches without colocated branches21:31
lifelesslooms21:31
mwhudsondo the error reports in https://answers.edge.launchpad.net/launchpad/+question/59649 ring bells with anyone here?21:34
mwhudsonhe's using an ancient bzr, but still21:34
lifelessI'm down to console only while profiling21:34
lifelessif you need me don't email :) and I can't read pastebin easily21:34
lifelessmwhudson: what is he seeing?21:35
mwhudsonweird-ass errors from pushing over sftp mostly21:35
mwhudsonthe other stuff i think i can explain21:36
mwhudsonbut really, 0.11.021:36
lifelessuhm21:36
=== dereine is now known as dereine[OFF]
lifelessthats pre-packs21:36
lifelessiz bad21:36
mwhudsonyar21:36
Lo-lan-doi can haz pakz?21:37
=== dereine[OFF] is now known as dereine
ronnyjelmer: btw, are there any plans for a bzr-hg when bzr-git is done?21:53
jelmerronny, there is a bzr-hg already, https://launchpad.net/bzr-hg21:53
jelmerit already allows you to browse logs, etc21:53
ronnyoh, i missed that21:53
jelmerthough not much more beyond that21:53
santagadajelmer: so you also have a time machine?21:53
santagadaI tought only guido could go back in time21:54
lifelesssantagada: we're quite fond of 'heres one I prepared earlier' here :)21:54
santagada:)21:55
ronnyjelmer: im mainly asking cause hg wont grow a hg-bzr anytime soon and i prefer to use hg21:58
LarstiQronny: it needs more love to be useful21:59
ronnyim pretty busy with exams + moinmoin + anyvc + pida + vellum atm22:01
ronnyhmm22:01
ronnyok, mapping stuff from iter_changes to my personal anyvc status info is more tricky than i tought22:01
ronnytime to wire up a plan22:02
LarstiQronny: Jelmer is doing a vcs tour, I'm sure he'll make a bridge for everything eventually ;)22:05
jelmerLarstiQ, I think the key is convincing the other Samba developers to switch to hg22:06
ronnyoO22:06
lifelessjelmer: ?22:06
Lo-lan-doSounds like a plan :-)22:06
ronnysamba developers to hg ?22:06
ronnywhats up with that?22:06
jelmerlifeless, that way I'll end up working on bzr-hg to make sure I can still work on Samba with bzr22:06
lifelessindeed22:06
Lo-lan-doSamba switches to X → jelmer does bzr-X22:06
lifelessronny: he's trolling/being humuour22:06
jelmerronny, I started working on bzr-svn because Samba was using that at the time, I started working on bzr-git when Samba switched to Git22:08
ronnyah i see22:10
LarstiQand started looking at bzr because tridge had mentioned that as a possible succesor to svn?22:11
ronnyhmm22:12
jelmerLarstiQ: no, I looked at it before that22:13
LarstiQjelmer: ah ok22:13
jelmerLarstiQ, I started looking into early versions after seeing Martin's talk at LCA 200522:13
* LarstiQ started because uws was using it, and he wanted to try a dvcs other than (l)arch22:13
Lo-lan-doUgh, arch.22:13
LarstiQLo-lan-do: when it was all still shell scripts22:14
Jc2klifeless: pong22:14
Lo-lan-doI used tla and baz, but that didn't make it much better.22:14
Lo-lan-doI still resent (a bit) the annexion of the Bazaar name by bzr, but I have to concede it's *vastly* superior :-)22:15
lifelessJc2k: I want to eliminate fork() from my compressbench; that means calling into libgit directly etc22:15
lifelessJc2k: if this is hard I will skip it in the interests of time22:15
lifelessJc2k: I hear you've done some stuff in this area22:15
Jc2klifeless: probably nothing thats suitable for what you need right now22:17
Jc2klifeless: i dont think there is a c-lib for packing stuff, unless libgit2 has advanced *a lot* from last time i heard about it22:18
lifelessJc2k: I don't care about time-to-pack at this point, rather reliable comparisons for time-to-unpack22:18
lifelessI want to know precisely how long git takes to extract the same corpus knits do22:18
lifelessit would be stupid to go to a slower disk level format, for instance, if the performance win is purely that 'its C'22:19
lifelessand right now we're still largely flying blind22:19
Jc2k*nod*22:19
Jc2kso aside from dulwich and calling git binaries the only other options are:22:20
lifelessall I know for sure is that dulwich is something like 200 times slower at extracting texts from packs than bzr is from its packs22:20
Jc2klibgitcore. unfinished refactor of git into a library22:20
Jc2klibgit2. ground up rewrite of git as a library. might not have any pack foo.22:21
lifelessok, thanks22:22
Jc2kim pretty sure libgitcore would need non-trivial hacking on before you could use it22:22
Jc2kwe gave up on it post-guadec22:22
lifelessso groupcompress22:22
lifelessavg 0.083630347998222:22
lifelessknit22:22
lifelessavg 0.011913512597822:23
lifelessI'm going to determine an answer as to 'why' today22:23
lifelessI hope22:23
lifelessif its design, I'll be shelving it, for now.22:23
lifelessOne candidate reason is space-time tradeoff, the knits corpus is 25.4M, the gc corpus is 3.5M22:24
Jc2khttp://repo.or.cz/w/libgit2.git22:24
Jc2kdoesnt have any pack stuff by the looks of things22:24
lifelessin such a scenario, a group cache would win22:25
lifelessso thats a knob I'm tinkering with now22:25
lifelessas basic profiling has simply told me 'zlib is much of it'22:26
lifelessdo you know, does git use any buffers22:26
lifelessor caches22:26
lifelesse.g., if it reconstructs texts X, Y, Z22:26
lifelessand X was compressed against Y, and Y against Z22:26
lifelessso getting X out first means getting Y and Z, but the command then wants Y, will it start over, or have it ready to use?22:27
Jc2kthere is a delta_base_cache22:28
lifelessgreat22:28
lifelessdo you recall how big it is ?22:28
Jc2kits an LRU of 256 objects22:29
lifelesscool22:29
lifelessso the pattern of recent-at-front, compression will tend to get a good hit rate22:30
lifelessas well as making the first objects asked for rapidly available22:30
lifelessit would be interesting to find history patterns that make the cache thrash22:30
lifelessvila: ping23:03
igcmorning23:10
mwhudsonhi igc23:12
mwhudsonigc: i need to look at bzr-revnocache sooner or later but i should read the source first :)23:13
jelmerdown to only 26 bzr-svn bugs, a lot of which wishlist items (-:23:21
igchi mwhuson23:21
igcbzr-revnocache still needs a lot of work but ...23:22
igcthat can come after the 1.12rc ships23:22
trobzrtools 1.11 isn't present in the hardy ppa :(23:23
igcin particular, it currently stores the full sorted history for every branch23:23
igcwhen there's a local mirror + feature branches, I want it to store just the new history for feature branches and delegate back to the mirror for the rest23:24
igcmwhudson:^^23:24
mwhudsonigc: do you just dump it and recalc when the tip changes?23:25
mwhudsonit sounds a little bit like having .bzr/branch/revision-history back23:25
igcthat's before my bzr time :-)23:26
lifelessigc: revision-history stored the full left hand history23:26
lifelessigc: its an O(history) operation to update23:27
igcright23:27
lifelessigc: and it dominated push and pull23:27
igcmy caching doesn't slow down either or those23:27
igcwhen the tip moves, it removes the cache ...23:27
mwhudsoni have this feeling that i'm going to end up working on O(new-stuff) updates to merge-sorted revision graph23:27
mwhudsonfor loggerhead23:27
igcand it gets saved the next time it's calculated23:28
mwhudsonunless i can trick someone else into doing it :)23:28
lifelessigc: my point is that updating it over the wire is a huge amount of work23:28
Lo-lan-dojelmer: Would a "AttributeError: 'SvnRepository' object has no attribute '_iter_revmeta_ancestry'" count? :-)23:28
igcright - I only support local caches23:28
lifelessigc: I think a plugin is the right place to work on this problem23:28
lifelessigc: and I think its good you are doing it23:28
igcthanks23:29
jelmerLo-lan-do, which branch are you using?23:29
Lo-lan-dohttp://bazaar.launchpad.net/~jelmer/bzr-svn/0.5/23:29
Lo-lan-dor250023:29
jelmerLo-lan-do, ah, the main branch is on http://people.samba.org/bzr/jelmer/bzr-svn/0.523:29
jelmerlaunchpad mirrors it, but it seems to take up to half a day for it to do so23:29
Lo-lan-doOkay, I'll rerun my checkout then, but I'll let it run during the night since it takes forever and I really should be in bed by now.23:30
lifelessjelmer: you can tell lp to do it faster23:31
lifelessjelmer: e.g. on push23:32
jelmerlifeless, how?23:32
spivlifeless: oh, that plugin exists now?23:32
lifelessI filed a bug asking for this capability23:32
* Lo-lan-do → sleep23:32
lifelessit has been closed with info that its somewhere in lp-api23:32
jelmerLo-lan-do, g'night23:32
jelmerlifeless, I don23:32
jelmer't have launchpadlib here, I'm on Debian :-)23:32
lifelessjelmer: I don't see why that precludes launchpadlib23:33
jelmerlifeless: being on Debian, you mean?23:35
lifelessright23:35
lifelessinstall the dependencies, install the jaunty package23:35
jelmerlifeless, launchpadlib, wadlib and httplib2 aren't packaged there23:35
jelmerAnyway, I don't care enough about launchpad to do so23:36
lifelesssubvertpy - new dependency? Didn't it use to be bundled?23:37
jelmerlifeless: yes, it's now developed and distributed separately23:37
* lifeless removes bzr-svn again23:37
lifelessits too muc futzing around to keep it going when I'm not actively hacking on it or using it23:38
jelmerit's in the PPA these days, fwiw23:39
lifelessin particular, I run all my dev plugins from source23:39
lifelessso a dependency that has to be installed to be used is a real nuisance23:39
lifeless(I run them all from source to allow version switching trivially)23:39
jelmerlifeless, it's just a python module like any other, the API is stable, no ties to bzr23:43
lifelessI know, but its namespaced outside23:43
lifelessso rather than rm foo; ln -s /other foo23:44
lifelessI have to do a dance23:44
spivI have a one-line hack in my bzr-svn checkout to add my subvertpy checkout to sys.path...23:44
lifelessjelmer: don't get me wrong, I think its great to promote reuse like you are23:47
lifelessbut it has a cost23:47
lifelesswhich I'm not willing to pay until I need to do something with bzr-svn again23:47
lifelesse.g. loggerhead tweaks or whatever23:47
lifelessok, group cache working, lets give it a spin23:50
* lifeless wait()s23:50
jelmerlifeless, sure, I understand. Similar to what I have with launchpadlib...23:50
lifelessI wish lplib didn't use httplib223:51
lifelessthat thing is terrible23:51
lifelessI looked, went blind, walked away23:51
jelmer(which is one of the reasons why I pinged James about uploading to Debian as well)23:51
lifelessbreakfast while this runs23:53
furicleWarning - RCS newbie - I've taken a tarball, did a bzr init - bzr add - hacked, commited - now I want to export only my changes back upstream as patches - but  bzr diff is putting out binary crud because I removed some pdfs.  What do I do?23:53
lifelessfuricle: bzr normally detects binary files;23:57
lifelessfuricle: what command are you running to get this export ?23:58

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