/srv/irclogs.ubuntu.com/2010/12/20/#bzr.txt

=== Meths_ is now known as Meths
pooliehi spiv?00:34
spivHi poolie00:37
pooliehey00:37
pooliei was just going to check you were still ok to pilot00:37
poolieand to see if you wanted reviews or anything00:37
pooliei was going to work on launchpad flags and dkim but i could do that first if you want00:38
spivThe queue looks fairly short... although there are a couple of patches from me in it.00:39
spivPerhaps take a look at https://code.launchpad.net/~spiv/bzr/fetch-spec-everything-not-in-other/+merge/42811 ?  It's a prereq for the other two mps from me, although it is a pretty large diff.00:40
spivOh, although I see jam looked at a the previous iteration of it, so perhaps I should just ask him.00:41
=== frakturfreak_ is now known as frakturfreak
exarkunAre there tools for looking directly at a repository's contents?04:48
exarkunor, which python api should I be looking at? :)04:50
exarkunlike say I wanted to enumerate all of the leaf revision ids in a shared repository, can I do that?04:52
spivexarkun: just a sec04:53
exarkun(I think I deleted a branch that had some stuff in it that I want, and my assumption is that I didn't completely destroy the data since it was a branch in a shared repository...)04:54
spivexarkun: API-wise it's something like python -c "from bzrlib.repository import Repository; repo = Repository.open('code/testtools'); repo.lock_read(); g = repo.get_graph(); print g.heads(repo.revisions.keys())"04:57
spivexarkun: but now that I see you don't really care about the API, try "bzr heads" or "bzr heads --all", from the bzrtools plugin04:58
exarkunOh cool.  Thankee.04:58
exarkunyay recovered05:01
* spiv sighs and restarts his gnome-terminal process, which has run out of fds. Someone really needs to add that fix to maverick-updates...05:32
spivpoolie: any thoughts on the UI change proposed in https://code.launchpad.net/~jelmer/bzr/diff-git/+merge/44185 ?  (allow "bzr diff --git" rather than requiring "bzr diff --format=git")06:01
vilahi all !07:24
pooliehi spiv07:29
pooliehi vila07:33
vilapoolie: hey there !07:33
pooliespiv, i answered07:38
pooliespiv: are you still here?07:40
vilaFunny trick with the new 'bzr config' command: when I do a review locally, I generally create a branch whose parent is lp:bzr08:42
vilaso when people update their branch I have to type again the url to get updates08:42
poolieright08:42
vilawell, I had.08:42
vilaNow I do: bzr config reviewed=lp:<review_url>08:42
vilaand 'bzr pull -v `bzr config reviewed`08:43
vilaor 'bzr diff --old `bzr config reviewed`'08:43
vilano more need to defined specific directory aliases like submit: , parent: and all, and it's supported by all bzr commands :)08:43
pooliehm08:47
poolieonly on unix though08:47
pooliethat's a nice reason to have config emit only the url08:47
vilayup, I'm so totally convinced now :)08:50
poolie:)08:56
poolieon windows we could do something like bzr pull config:reviewed08:56
poolievila, we should probably defer b5 until during/after the sprint08:59
pooliedo you want to hack on it there?08:59
poolieor switch to tarmac there?08:59
=== beaumonta is now known as abeaumont_
vilayeah, I think that would be the best, having everyone involved and aware of all the issues and debugging all nits09:00
vilayeah, definitely for 2.3b5 *and* tarmac, I'll update the release date09:01
vila.. and discuss how we reach 2.3.0 final09:02
pooliewell, we'll need to schedule it with the sysadmins too09:03
vilayeah, but we can play with it on a scratch branch and ask the sysadmins to switch with a working setup09:04
vila(unless I miss something on how tarmac is supposed to work)09:04
vilabut yeah, we can tell them we *will* switch around 2012-01-13 (I've update the 2.3b5 date on lp)09:05
zygaanyone here knows how to use bazaar.conf and lp-propose-merge to get an implicit push location09:51
vilazyga: Most of the time I do: bzr push lp:~vila/bzr/`bzr nick`10:06
vilazyga: the only way to go further today is to use locations.conf but it will take precedence over anything defined in branch.conf which is certainly not what you want10:07
vilazyga: there is a work in progress to allow path-based default values to be defined in bazaar.conf though10:07
zygavila, I want to "bzr push"10:09
zygavila, salgado gave me bazaar.conf that doesn't work that works for him10:09
zygahttp://paste.ubuntu.com/544906/10:09
zygavila, could it be possible that salgado is riding bzr.dev wave?10:09
zygavila, my real problem is on usability of lp-propose-merge10:10
zygait takes bzr push + bzr lp-propose-merge while I just wanted to lp-propose-merge10:10
zyga(and push also is verbose as you explained, you need to specify the push branch which is tedious)10:10
vilazyga: sections defined in bazaar.conf are just ignored10:11
zygahmm10:11
vilazyga: unless salgado has written a plugin... which I doubt10:11
zygavila, that's what salgado is using, I need to check with him again10:11
vilazyga: may he uses locations.conf instea10:11
zygahmm? should I put that in locations conf and see if it worsk?10:11
zygaI'm on 2.2.110:12
vilazyga: but the aim of locations.conf is to *override* branch.conf (so whatever is defined in branch.conf is ignored if a matching is found in locations.conf)10:12
vilazyga: it will work even for 2.0 I think (95% sure)10:13
zygathat's okay, I just want to stop having to type everything twice all the time10:13
zyga(something is happening)10:13
zygayayt10:13
zygait worked10:13
zygabzr lp-propose-merge10:13
zygano push needed :D10:13
zygathanks :-)10:13
zygahmm10:13
zyga(premature happines)10:13
vilazyga: you need to type it once, once it's defined in branch.conf it will be used (--remember can change it)10:13
zygavila, I keep making branches10:14
vilazyga: type it once unless you define a default in locations.conf I mean10:14
zygaI have ~10 branches a day10:14
zygahttp://pastebin.ubuntu.com/545877/10:14
zygawhat does that message mean?10:14
zygathis is my locations.conf10:15
zygahttp://pastebin.ubuntu.com/545878/10:15
vilahmm, it may come either from launch-control not being a project defined on launchpad or some weirdness in the stacked-on branches defined on lp (and dev focus too)10:15
zygahmm10:16
zygalaunchpad.net/launch-control exists10:16
vilaok10:16
mok0Does anyone here have experience maintaining a gnu autotools dependent project in bzr?10:16
vilamay be a missing trailing '/' ?10:16
zygalet's see10:17
vilazyga: if you use bzr trunk, 'bzr config' will display the expanded values that apply in the current dir10:17
zygavila, I don't use trunk, sorry :/10:17
vilanp np10:17
zygavila, is there any difference between lp:~something and the bzr+ssh://longish version?10:18
mok0I'd like to know what your opinion on the autogenerated files is: do you store them in the repo?10:18
zygacan I just use the lp: shorthand?10:18
vilamok0: strictly speaking versioning generated files is... akward, but it may help when creating tarballs, but generally you don't mix the too, you version only files that a re modified by humans10:19
vilazyga: yes you can10:19
zygaI hacked the locations conf a bit and bzr info in the branch I'm working on now says: http://pastebin.ubuntu.com/545881/10:19
zygait looks good IMHO10:19
zygabtw, what is submit branch?10:19
mok0vila: that's exactly the problem I have: "make dist" seems to work at cross purposes of bzr10:19
zygaI never figured that part out10:19
vilazyga: the difference is that the lp: shorcuts can be expanded into their http: variant under some circumstances10:20
zygavila, yeah I know, if lp-login is not used10:20
vilazyga: submit_branch is the branch your merge from or against, a bit confusing10:20
vilamok0: only if you version generated files10:21
zyga"merge from" ?10:21
zygavila, can you give me an example of what command uses that submit_branch?10:21
vilazyga: when you work on a feature branch and you want to update from trunk (merge new changes)10:21
vilazyga: merge10:21
vilazyga: send10:21
vilazyga: lp-propose :)10:22
zygahmm10:22
mok0vila: well, I don't like to store configure, aclocal.m4 and friends, but that means I need to generate configure, and that fails unless you have all the dependencies installed.10:22
vilamok0: exactly10:22
zygavila, so bzr push worked for me10:22
mok0Which is aPITA10:22
vilazyga: don't forget the :policy=append_path bit10:22
zygavila, but lp-propose-merge again said that "bzr: ERROR: bzr+ssh://bazaar.launchpad.net/%2Bbranch/launch-control/ is not registered on Launchpad"10:22
mok0OTOH, storing configure and friends in the repo is a PITA because they keep changing and it pollutes your history10:23
vilamok0: it's more a work flow issue than a VCS issue per se, but depending on the project they often overlap10:23
mok0vila: yeah... I was just wandering if anyone had a smart solution10:23
vilamok0: the question is how you distribute your sources and how you want people to contribute to the project10:23
mok0vila: I'm not upstream, only trying to maintain a deb package10:24
mok0vila: and I _need_ to patch configure.ac10:24
vilamok0: either you version only non-generated files and requires devs to have the generating tools installed or you version the generated files but should ensure you're in sync at commit time10:24
vilaoh, packaging... that's  different :)10:24
vilamok0: In this case you have the additional issue that upstream may be versioning generated files10:25
mok0vila: yes, because you do build work etc. in the directory10:25
zygavila, okay, one step closer, I removed merge_target and submit_branch from locations.conf, now lp-propose-merge wants to have a reviewer, can I make it use the default reviewer for lp:launch-control somehow?10:25
vilazyga: search for the stacked-on branch and check that the dev focus is correct too10:25
vilazyga: isn't it the default ???10:26
zygahmm10:26
vilazyga: -R reviewer ?10:26
zygavila, I don't understand either part10:26
vilazyga: (from 'bzr help lp-propose' I rarely use this command myself)10:27
zygavila, I could use that but lp already knows who is the reviewer10:27
vilazyga: EPARSE10:27
zygaso I want to avoid having to type that, It must be a configuration issue somewhere10:27
zyganote: https://code.launchpad.net/~linaro-infrastructure/launch-control/trunk this is the branch I want to submit to this is the development target10:27
vilazyga: yeah probably10:27
zygavila, if I do lp-propose-merge lp:launch-control10:28
zygait says: $ bzr lp-propose-merge lp:launch-control10:28
zygabzr: ERROR: bzr+ssh://bazaar.launchpad.net/%2Bbranch/launch-control/ is not registered on Launchpad10:28
zygadid I make a typo I cannot see or is there something wrong here?10:28
vilazyga: weird, I can 'bzr info' it but not 'bzr config' it :-/10:29
zygavila, hmm?10:29
zygabzr bug somewhere?10:31
vilazyga: for bzr config, probably10:31
zygavila, how about lp-propose-merge, why does it say that launch-control is not registered?10:31
zygado I need to spell out the actual location of the branch: lp:~linaro-infrastructure/launch-control/trunk10:32
vilazyga: you could try that yes10:32
zygathat worked but said that no reviewer is specified10:33
zygasigh10:33
zygahow did salgado make this work without passing all those arguments10:33
vilasounds like a launchpad config issue then10:33
vilazyga: check with salgado, either he has a different config or you're not part of the same teams ?10:34
zygais the maintainer the default reviwer?10:34
zygawe are both part of the ~linaro-infrastructure team10:34
vilabut who review the proposals ?10:34
zygathat team10:34
vilais it properly configured on lp ?10:34
vila'it' being vague :)10:34
zygavila, good question, how can I check that10:35
zygahttps://launchpad.net/launch-control10:35
zygamaitainer is set10:35
vilabut not driver ?10:35
zygano, driver is not set10:35
* zyga never understood what that really meant10:35
* vila neither :)10:35
zygaI set the driver too10:36
zygalet's see if lp-propose-merge will work now10:36
zyganope10:36
zygaI just want this whole review thing to get out of my way ;-)10:37
vilazyga: hmm, I think that's something that should be specified on the target branch or something10:37
zygavila, thanks for all the help10:37
zygatarget branch being?10:37
zygatrunk?10:37
* vila looks at the bzr lp project10:37
vilazyga: there is a review team for lp:bzr10:38
zygabzr info does not say10:38
vilazyga: it's a launchpad thing10:38
vilazyga: look at https://code.launchpad.net/~bzr-pqm/bzr/bzr.dev10:38
vilathere is a review team there, but nothing comparable on launch-control (may be because I'm not part of the team there, can't say for sure)10:39
mok0Is there a special channel for discussing packaging in bzr?10:41
mok0Or is that here :-P10:41
vilamok0: here is fine10:41
mok0vila, thanks10:41
vilamok0: #ubuntu-devel may be better if you're targeting Ubuntu (or even debian)10:42
mok0So now I am wondering, should I just make all changes in the autobuild system that I need on my bzr branch10:42
mok0... and somehow create my package from that10:42
vilamok0: you're *creating* a package ?10:42
mok0vila: ytes10:42
mok0yes10:42
mok0Upstream doesn't provide a recent tarball, source is distributed via svn10:43
vilamok0: hmm, I'll be on limited help then, I don't have a significant experience here10:43
mok0I have it mirrored in an LP project10:43
vilagood10:43
mok0Then I have a branch off that called "ubuntu" :-)10:43
vilamok0: you're targeting Ubuntu ?10:43
mok0vila: for now, yes10:43
vilamok0: did you look at bzr-builddeb ?10:44
mok0vila: I've used it now and then, but I found it got in my way10:44
vilamok0: you should definitely ask in #ubuntu-devel and file bugs when it gets in your way !10:44
mok0I wasted hours until I discovered that it stashes away its own copy of the tarball in the buildarea10:44
mok0I couldn't understand WFT was going on10:45
vilamok0: I don't know the details but there are several possible workflows, with a bit luck you're just not using the right one10:45
mok0vila: perhaps yes10:45
mok0vila: and then there's quilt..........10:46
zygavila, checking10:46
vilamok0: james_w wrote a very succint document about that, but I don't remember if/where it's published10:46
zygavila, sorry, my son is ill and needed some help10:46
vilazyga: that's a *priority* interrupt10:46
mok0vila, lemme see if mr. Google will come to my help :-)10:46
zygavila, the review team _is_ set10:48
zygahttps://code.launchpad.net/~linaro-infrastructure/launch-control/trunk/+reviewer10:48
zygaI can see linaro-infrastructure as the reviewer10:48
vilazyga: no permission to look at that10:48
zygavila, right but it's set there10:49
mok0vila, would you be referring to this? https://wiki.linaro.org/BzrIntroduction10:49
zygaI think lp might not show the reviewer if it's the same as owner10:49
vilazyga: :-/ I'm out of my league then10:49
vilamok0: no, it was one with pretty pictures :)10:49
vilamok0: but james_w is mentioned so you're on the right track ;)10:50
mok0vila, hehe. I found this now, it looks like I need to read that: http://jameswestby.net/bzr/builddeb/user_manual/10:51
mok0No pretty pictures though10:52
vilamok0: certainly a must read :)10:52
vilamok0: may be https://wiki.ubuntu.com/UbuntuDevelopment/ is a good starting point too10:54
mok0vila: Indeed... thought it mostly looks like a link-collection10:55
vilamok0: could be, but #ubuntu-devel can better answer than me for that10:55
mok0vila: you've been most helpful, thanks10:56
vilamok0: np, happy to help but I know bzr better than packaging (I'm learning though ;)10:56
mok0vila: I think  dvcs packaging is very much in its infancy10:57
vilamok0: yup, actively working on though ;)10:57
mok0vila: AFAIK you still need a tarball10:58
mok0vila: which is kinda crazy if the source can be pulled from a branch and you can construct the debian/ from the packaging branch10:58
vilamok0: that's the part I'm unsure about (since I always start with a bzr branch myself)10:58
vilamok0: that's what 'pristine tar' is about: re-create tarballs from a branch10:59
mok0vila: then that's a new definition... it used to be "the tarball you download from upstream"10:59
mok0vila: anyway, I don't see there's a need for tarballs11:00
vilamok0: but for many operations builddeb re-creates the tarball from the branch11:00
mok0vila: I know... as I wrote above, I was burned by that11:00
vilaso instead of downloading it from upstream you just use the equivalent version11:00
mok0vila: because when you edit edit edit in the branch, the old tarball is still sitting there :-(11:01
vilamok0: which is why I think you may not be using builddeb as intended11:01
mok0vila: and so it seems your edits are gone11:01
mok0vila: perhaps you are right11:01
vilamok0: because you seem to be doing 'normal' things, so builddeb should know how to deal with them11:02
mok0vila: which is why I'd like to see a description of a proper workflow11:02
mok0vila: I agree11:02
vilamok0: have you read the user manual you pointed above ?11:02
mok0vila: not yet ... I'm not THAT fast :-)11:03
vilamok0: hehe, just checking, but I'm 60% sure you'll find many answers there11:04
mok0vila: I am sure I kan learn a lot11:04
mok0s/kan/can11:04
=== zyga is now known as zyga-coffee
=== Ursinha-afk is now known as Ursinha
=== zyga-coffee is now known as zyga
johnfI'm running bzr annotate filename and I'm getting something like "bzr: ERROR: The file id "file-20060906040903-s4f1zy3gz43haztt-3" is not present in the tree" any ideas as to what the problem could be?13:52
jelmerhi johnf13:58
johnfjelmer: howdy13:58
jelmerjohnf: I thought you were based in .au ?13:58
jelmerjohnf: In what context?13:58
johnfjelmer: I usually am. In Germany for the holidays13:58
johnfjelmer: Let me pastie the whole thing13:59
jelmerjohnf: Ah, nice. Enjoying the snow ? :-)13:59
johnfjelmer: Yes :) I've never really experienced snow before. This is totally surreal!14:00
johnfjelmer: sent you the pastie privately since it has some email addresses etc I'd rather not make public :)14:01
jelmerjohnf: np14:01
jelmerjohnf: what's the status of that file in the current working tree?14:02
johnfjelmer: Hmm OK maybe I'm doing something dumb14:03
johnfI have a branch which is currently up to rev130 and I've done this "bzr up -r 20; bzr annotate file"14:04
johnfthat is when I get the error14:04
johnfif instead I do "bzr branch -r 120 orig  copy; cd copy; bzr annotate file" it works fine14:04
johnfshould the first approach work?14:05
* jelmer wonders what "bzr up -r" does exactly14:05
johnfjelmer: yeah I think that't the problem. It makes the working tree the same as rev 20. But I think when I run say the annotate command it is still working on revision 130 where the file no longer exists14:07
jelmerjohnf: does "bzr status" report a lot of changes?14:22
=== bac` is now known as bac
jelmerjohnf: You might want to try "bzr annotate -r -1 <filename>" or "bzr annotate -r 120 <filename>"14:22
johnfjelmer: bzr status says "working tree is out of date, run 'bzr update'"14:23
jelmerjohnf: ah, so "bzr up" only changes the working tree, not the branch14:23
johnfjelmer: yeah. Adding -r to annotate worked fine14:24
=== Ursinha is now known as Ursinha-lunch
ThiasGHello, thank you for making bazaar available. We switched recently from git to bazaar.14:32
ThiasGNow a coworker hat done a bzr rmbranch bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk14:32
ThiasGIs there an easy way to undo this change?14:32
jelmerThiasG: hi14:35
jelmerThiasG: You should be able to run "bzr heads --dead" to find the previous tip revision14:35
jelmerafter that you should be able to create that branch again and then update it to that revision using "bzr pull -rrevid:<revid> ."14:37
ThiasGI found the revid.14:38
ThiasGThe branch I just create with bzr init bzr+ssh://bazaar@bzr.openpetra.org:2208/openpetra/trunk ?14:39
jelmerThiasG: yep14:41
jelmerThiasG: if you don't have local access you'll need a somewhat more complicated pull command14:41
jelmerThiasG: rather than using "." you should probably specify the same branch URL, once for the target (with -d) and once as source14:41
ThiasGI have local access to the shared repo.14:42
ThiasGIn the trunk dir, I typed in bzr pull -rrevid:timotheus.pokorra@solidcharity.com-20101220135316-3qbh20dt0fkwi81114:42
jelmerThiasG: you'll probably need the "." after that as well, unless the default pull location has that revision14:43
ThiasGBut this gave me "bzr: ERROR: No pull location known or specified."14:43
ThiasGokoay14:43
ThiasGNow he is working14:43
ThiasGAll changes applied successfully.14:44
ThiasGNow on revision 1035.14:44
ThiasGI'm finished?14:44
jelmershould be, yeah14:44
ThiasGIs it correct, that I could remove the content of the trunk directory except the .bzr directory? It is the shared remote repo.14:45
jelmerThiasG: yes; "bzr rmtree" should do that for you14:46
ThiasGI dod a bzr status, which gave me 8 modified files.14:47
jelmerif there are modified files you should probably check why they are modified, just in case they're changes you'd like to keep..14:48
ThiasGOkay, thank you very much for your help.14:49
ThiasGDoes someone already have a hook for restricting removing of branches? Otherwise I have to write one ;-)14:50
jelmerI don't think there is anything like that at the moment14:56
ThiasGAber dann ist es nicht so tragisch. Ich checke sie ein, oder?14:58
Takja, selvfølgelig!14:58
ThiasGSorry, wrong channel...14:59
ThiasGJust for completeness: The command for removing the working tree is "bzr remove-tree"15:05
ThiasGThank you for your fast help :-)15:06
=== Ursinha-lunch is now known as Ursinha
=== beuno is now known as beuno-lunch
=== deryck is now known as deryck[lunch]
=== beuno-lunch is now known as beuno
mhall119hi, I'm using bzrlib to do the equivilent of "bzr branch $src $dst"17:26
mhall119given a remove url for $srf17:27
mhall119and a local file path for $dst17:27
mhall119I have:17:27
mhall119src_branch.create_clone_on_transport(get_transport(destination), revision_id=rev_id)17:27
mhall119but that doesn't give me a working tree in $destination17:27
mhall119what am I doing wrong?17:27
jelmermhall119: that's correct, branch.create_clone_on_transport() only creates a branch (and copies revisions where necessary)17:31
jelmeryou can create a tree later by calling bzrdir.create_workingtree()17:32
mhall119that did the trick, thanks a bunch17:46
jelmernp17:46
=== deryck[lunch] is now known as deryck
lifelessmgz: hi21:15
mgzhey lifeless.21:31
mkanatspiv: Thanks for acknowledging and helping clarify that bug.23:31
spivmkanat: you're welcome :)23:43
mkanat:-)23:43

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