/srv/irclogs.ubuntu.com/2011/01/30/#bzr.txt

=== Meths_ is now known as Meths
quotemstrLet's say I make commits (from Base) C1, C2, and C3 and submit them each to an upstream project as a patch. I realize there's an error in C1 and make a fourth commit, C4, to fix it. How can I generate a new patch that includes the changes of C1 and C4 without C2 and C3?02:33
quotemstrDo I just have to back everything else out and rebase?02:33
lifelesscommit it in a branch just for c1+c4; merge that to trunk, send [c1,c4] as the patch02:35
quotemstrUgh. Making a non-stacked branch takes forever.02:36
quotemstrThanks.02:36
wildintellectso I'd like to checkout a copy of an svn repo, work on it a bunch pushing changes to a lp bzr repo, and when I'm done in a few weeks merge back into svn05:01
wildintellecthttp://doc.bazaar.canonical.com/latest/en/user-guide/svn_plugin.html seems close but bzr push sends to svn when I would want it to my lp repo for now05:02
wildintellectmaybe I should just do an svn checkout then bzr init over the top of the same directories05:03
wildintellectusing bzr to manage my branch work and when done use svn to merge it back into the svn repo?05:03
wildintellectguess that would lose the commit history05:03
Kamping_Kaiserand make it hard to merge05:05
Kamping_Kaiserwildintellect: change your push target while you work on it05:05
wildintellectI think I wasn't reading that page close enough05:05
wildintellectcan I have different push locations for each bzr branch I make?05:06
Kamping_Kaiserwildintellect: check the docs for push_location and submit_branch. (parent_location should be the svn repo)05:06
sobersabrehi07:55
sobersabreIs there a way to track file permissions with bzr ?07:55
sobersabre(I know it's "metadata", but still)07:55
spivsobersabre: not built-in.  There are tools like etckeeper though.07:58
sobersabrespiv: hmmm... nice tool. does it source current permissions into some kind of text file and then processes it to ensure the perms are intact ?08:38
jelmersobersabre: yep, basically08:44
sobersabre jelmer ok.09:09
knittlis bzr able to perform cross project merges?10:26
knittlok, it can10:51
jmled12:56
jelmerjml: old school!13:05
jmlheh13:08
jmlI have no idea why I typed that in this channel.13:08
sobersabrehi. where I can read about how to do something like bzr status from within python script.16:22
sobersabreI want to detect changes/additions/removals.16:22
sobersabrether must be some kind of api aournd. right ?16:23
beunosobersabre, yeah16:24
beunolet me dig that up for you16:24
beunosobersabre, http://wiki.bazaar.canonical.com/Integrating_with_Bazaar16:26
sobersabrebeuno: I am on windows. I have bzr installed, I tried import bzrlib, and it didn't manage.16:26
beunohas nice examples16:26
beunoand this is the api documentation: http://people.canonical.com/~mwh/bzrlibapi/16:26
beunoI don't know anything about python in windows, so can't help you there16:27
mgzsobersabre: you want to install the bazaar for your python version, not the all-in-one bundle16:30
mgzthat will put it in your site-packages dir so you can import it.16:30
mgzie 'bzr-2.2.3.win32-py2.6.exe' not 'bzr-2.2.3-setup.exe'16:32
sobersabremgz: thanks, man. I did install the right version for "my" python (2.5)16:34
sobersabrefor some reason bzrlib is not loadable.16:34
mgzdoes C:/Python25/Lib/site-packages/bzrlib exist? (adapt for your pythong location)16:35
mgz...I type 'pythong' way too much.16:35
sobersabreI wear pythongs once in a while.16:37
sobersabreanyway, I have no bzrlib in the site-packages dir.16:37
sobersabreeven though I did install bzr-2.2.1.win32-py2.5.exe16:38
mgzuninstall and try again, it's possible something got screwed up.16:39
awilkinssobersabre, Eclipse problems?16:39
sobersabreawilkins: what do u mean?16:39
awilkinsAh, wrong distro, sorry16:39
sobersabreit is an evening, the sun is down...16:39
sobersabremoon is visible.16:39
awilkinsThe exe bundle has some issues with the bzr-xmloutput plugin and hence the bzr-eclipse plugin16:40
sobersabreawilkins: hm... distro ?16:40
mgzpay attention in the installer to where it's putting the files.16:40
sobersabreoh!16:40
sobersabrehm...16:40
sobersabreI do have that plugin (but not on this computer).16:40
sobersabreis it possible I will have eclipse plugin punishment,16:40
sobersabrebut not on the computer it is installed on ?16:40
mgzyou might have a zombie python install somewhere, or a screwed up registry setting.16:40
sobersabre:-/16:41
sobersabremgz any ideas what setting ?16:41
sobersabrepath ?16:41
awilkinsI have at least one bug for the Eclipse plugin, but it only occurs when your project folders are nested more than 1 deeper than your workspace16:41
sobersabrepython* ?16:41
mgzwell, just try uninstall/reinstall to start with16:41
sobersabreok... it's scary.16:41
mgzthat does a "find where python is" step, if it gets it wrong, then we can go digging16:41
sobersabremgz: I have just rebooted. what step were you talking about?16:48
sobersabreoff a webpage or something ?16:49
mgzuninstall your current bzr. then reinstall. may as well use 2.2.3 while you're at it.16:49
sobersabrebeuno: about windows, as you can see "Me and you are of the same blood"16:50
mgzand look at what paths it's using in the process.16:50
sobersabremgz: I didn't see 2.2.3 for py 2.5 on win the last time I installed...16:50
mgzit's new-ish.16:50
mgzhttp://launchpad.net/bzr/2.2/2.2.3/+download/bzr-2.2.3.win32-py2.5.exe16:50
sobersabrealrightie.16:52
sobersabreI used the main canonical page last time...16:52
sobersabreso where can I look at to see how to answer your 'find where python is' q ?16:52
sobersabreI know where the python is.16:53
sobersabreit's in D:\Python2516:53
mgzthe installer doesn't ask you, it looks for itself.16:54
sobersabrehm, now I can practically SEE the files are being copied and compiled to D:\Python25\Lib\site-packages\bzrlib16:54
sobersabrefeels good.16:54
sobersabrelet's see it works too.16:54
mgzmake sure it's beliefs and yours coincide16:54
mgzokay, that sounds good.16:55
mgz-' dammit.16:55
mgzsobersabre: import works now?17:02
sobersabremgz: oh, it does!17:02
sobersabreI like.17:02
sobersabre:)17:02
sobersabreI am one happy geek now.17:03
sobersabrepreparing a deployment fab.17:03
sobersabreit's my 2nd month with python at work, and I like it.17:03
sobersabretoo much.17:03
mgzso, to get started, you want something like:17:05
mgzfrom bzrlib.workingtree import WorkingTree17:05
mgztree = WorkingTree.open_containing(directory)[0]17:05
sobersabremgz I don't do anything like that :)17:05
sobersabreI prefer to use the long names.17:05
mgzthen you can inspect the working tree, and see bzrlib.status for what the ui does.17:06
sobersabremgz I think it is better to use changes. it gives an iterable thing.17:06
sobersabreI will count what I want. if the counter is > 0 it's the time to act.17:07
AdamDVAny known issues with bzr doing a checkout over sftp with a password protected rsa key?17:07
sobersabrebasically there's: changes.has_changed17:07
sobersabre:)17:07
mgzif that's all you need then fine, status does some more work on top of that as well.17:08
sobersabremgz: the problem with status is its result.17:08
sobersabreI don't want to print out something.17:08
sobersabreI need to do or not do something depending on the changes.17:08
mgzI was suggesting you read the code, not used it as-is.17:09
mgziter_changes may be all you need.17:09
mgzAdamDV: as in, does it work, or as in, are there known security issues?17:10
mgzif you just want to know if it works, try it and see.17:10
AdamDVWell, right now its looking like it does not.17:11
AdamDVEven though I've used *without* a password protected key before.17:11
AdamDVLet me pastey the errors.17:11
sobersabreAdamDV: I think you should be more asking about paramyko. I remember it did have some troubles with default values long ago.17:12
sobersabreparamyko is the module for ssh communication.17:12
sobersabrebzr is just using it.17:12
sobersabre(unless the same people who develop bzr also work on paramyko)17:12
sobersabreAdamDV: did you look at the code of paramyko you're running ?17:13
AdamDVhttp://pastebin.com/pvn4p8X317:13
AdamDVI did not?17:13
AdamDVit works fine connecting to ssh.17:13
AdamDVBUt yes, it looks like a paramiko problem.17:13
AdamDVAnd if sftp+password key arent going to work, what other options do I have? Use a password-less key?17:14
sobersabreAdamDV: also, what kind of network media are you on with this operation ?17:14
AdamDVnetwork media?17:15
AdamDVAs in how I'm connecting?17:15
sobersabreEthernet, WiFi, analog modem ?17:15
AdamDVI'm on WiFi in Toronto, server is on ethernet in Dallas.17:15
sobersabreAdamDV: what OS ?17:15
AdamDVI'm on Maverick, servers on Lucid17:16
sobersabreok.17:16
AdamDV10.04.1 is the server, to be specific.17:16
sobersabreon the client: does ifconfig show you any errors ?17:16
AdamDVNope.17:16
sobersabreTX/RX ...17:16
sobersabre?17:16
sobersabresure ?17:16
AdamDVI was using this yesterday, without a password on the key. We re-imaged the server and I re-generated my key and added a password, now its not working :)17:17
mgzbug 647916 is similar, check the last comment there?17:17
AdamDVLemme pastebin ifconfig17:17
ubot5Launchpad bug 647916 in Bazaar "Push command fails with "Garbage packet received" error" [Undecided,Incomplete] https://launchpad.net/bugs/64791617:17
AdamDVhttp://pastebin.com/2gh1VPsq17:17
sobersabremgz: I looked at it...17:18
AdamDVOh.17:18
AdamDVThat could be it.17:18
AdamDVMy shell is not bash, its actually a custom internal shell we use here.17:18
AdamDV*changes back to bash*17:19
mgzsounds likely.17:19
sobersabreAdamDV: I would not use anything non-standard to debug such problem.17:19
sobersabreand, permission denied is kinda interesting.17:19
sobersabreAre you sure the user you're using to run this has access to /home/adam/.ssh/id_rsa ?17:20
sobersabreAdamDV: is it possible it is chmodded 600, but belongs to ... a different user ?17:20
AdamDVChanging to bash on my server user fixes the problem.17:21
sobersabreAdamDV: is it possible your "supershell" uses the same UID you have as user 'adam' ?17:21
sobersabreI mean it DOESN'T use it.17:21
AdamDVAs in server user id is the same as my local user id?17:22
mgz<AdamDV> Changing to bash on my server user fixes the problem. <- good good.17:22
maxbIt sounds to me that AdamDV's custom shell is not supporting the invocation of sftp on the server properly17:22
AdamDVYea. Its a 100 line shell written in PHP for the secretarys to use.17:22
sobersabremaxb: I know how this can happen:17:22
* maxb runs away screaming17:22
sobersabrethe "supershell" prints out too many lines of output.17:22
sobersabreI mean too many chars of output.17:23
AdamDVmaxb: Yea.17:23
sobersabreAdamDV: can you make your logon shell quieter ?17:23
AdamDV?17:23
AdamDVI'd rather use BASH anyway :)17:24
sobersabreAdamDV: if you can - do, if you cannot - make sure the shell shuts up upon invokation.17:24
sobersabreI remember having added lots of stats upon logon (with colors, etc.) this made sftp inoperable.17:24
AdamDVI have no control over the development of our shell, unfortunatly. If I did, it wouldn't exist..17:24
sobersabreI'm off, mgz thank you!17:25
AdamDVThank you for your help mgz and sobersabre17:25
AdamDV:)17:25
mgzbye both.17:26
* AdamDV idles17:29
=== r0bby is now known as robbyoconnor
=== tchan1 is now known as tchan
majorokay, so I may be in for a heck of a pickle... I have some fairly old Bzr repositories which where converted from TLA using baz-import .. a while ago..19:56
majorwas trying to work at upgrading them, and a bzr log in them claims that it can not locate an ARCH-1 revision near the end of the log19:56
MTecknologyhttp://dpaste.com/370125/ <- any idea why this happens when I try to pull a branch?19:57
jelmermajor: what version of bzr are you using? and what's the exact error message?19:57
jelmerMTecknology: the local branch doesn't support a particular feature that the remote branch uses19:58
jelmerMTecknology: you can upgrade the local branch and try again19:58
jelmerthe error message could admittedly use some work..19:58
MTecknologyoh.. thanks :)19:58
MTecknologyworks perfect now19:58
majorbzr version 2.2.219:59
majorbzr: ERROR: Revision {Arch-1:email@domain--project%package--1.0^Cversion-0} not present in "KnitRepository('file:///home/user/devel/user.bzr/repository/')".19:59
majorerm19:59
majorerm19:59
* major sighs.19:59
majorthat ^C shouldn't be there19:59
majorit is has '--' in that spot20:00
majorI tried to hide the email addresses and accidentally mangled the error a touch20:00
jelmermajor: was the revision present originally?20:01
jelmermissing revisions ("ghosts") were pretty common in baz20:01
majorwell, it didn't used to give this error...20:01
majorand the original repositories where converted from TLA20:01
majorI suspect they where external archives..20:02
jelmerthe original repository  (the bzr one converted from baz) doesn't give that error?20:02
majorthey where all TLA archives, and still are20:03
majorI still have them20:03
majorthey where retained for historical purposes20:03
majorbaz was only used during baz-import, back when it was still part of the bzrtools20:03
jelmerit'd be interesting to see if that revision was actually present in baz20:04
jelmeror if it wasn't present and older baz/bzr simply didn't mention it20:04
majorwell, I can definately look at it20:04
majorand it is definately there20:04
majorit just isn't actually in the bzr repository20:05
majoris there any documented way to fix ghosts like this?20:14
jelmermajor: baz-import shouldn't have created a ghost if the revision was present in the original baz repository20:17
majorwhat if the revision was in a separate tla archive?20:19
majorthough its location was registered20:19
jelmermajor: no idea (I've never used baz)20:19
majorhmm20:20
lifelessit will create ghosts20:20
lifelessit doesn't traverse archives20:20
lifelessyou need to import each archive20:20
lifelessif I'm remembering correctly20:21
majorhmm..20:27
majorI suppose that feels mostly right..20:27
majorjust makes this pretty.. well .. funky20:27
majorI don't suppose importing the parent repository ontop of the already converted repository will make it "just work" ?20:28
jelmermajor: importing it elsewhere and then running "bzr fetch-ghosts <new-repo>" from the original repo should work20:29
jelmerwhere new-repo is the bzr repo created from the parent baz repo20:29
majornifty20:30
jelmeremphasis on /should/, I've never tried that before20:31
lifelessmajor: yes, it should just work.20:32
lifelessemphasis on the should20:32
majorheh20:32
majorwell, I have a number of backups of this stuff already20:32
lifelesswe haven't done much tla imports for about 5 years :)20:32
majoryah ..20:32
majortrying to revive a project that hasn't been touched in almost that long20:33
lifelesscool20:41
Ramosadoes bazaar have the same issues as mercurial with tagging.. that a tag actually does an invisible commit, and that you can't edit history easily of past revisions ?20:44
jelmerRamosa: a tag doesn't do an invisible commit, it's just a named pointer to a particular revision20:50
jelmerRamosa: history can't be edited, but you can rewrite it20:51
majorwell .. it is chugging away at this, hopefully it all works...20:51
majorwill likely take all day to do all these repositories though20:52
majorbut that is better than losing the history20:52
jelmerwhoa.. that's really slow :-(20:54
majorwell, a lot of repositories to fix, with a lot of branching inside of them20:54
majorI suspect the SCM history alone could be used for an interesting white paper on development work-flow20:58
jelmerhehe20:59
majorthe original sources started off in RCS, later converted to CVS, then pulled into Arch via cscvs (a tool to compute change-sets within CVS)20:59
majorfrom there a number of developers created branches from the original Arch archives, and then those where converted to bzr via baz-import21:00
majorand a few developers developed from multiple locations, which in Arch gives them unique global identifiers21:00
majorreally not certain if it could get much more chaotic21:01
=== Ursinha-afk is now known as Ursinha
pooliehello all21:43
jelmerg'morning poolie21:44
pooliehi there jelmer21:44
quotemstrHow can I write a revisionspec that means 'since this branch was forked from its parent'?21:51
quotemstr(And I mean without looking that point up beforehand, of course.)21:51
quotemstrAh, ancestor:, maybe.21:52
jelmerquotemstr: yeah, generally ancestor:21:52
quotemstrBut I still hae to type out the parent branch in that case. Ahwell.21:53
quotemstrHrm. bzr log -r ancestor:./../trunk.. seems to not be pegging the CPU and not making any forward progress21:54
mwhudsonjelmer: lp:bzr-hg seems to have a pdb.set_trace() in it22:04
cbzis there a bzr concepts/internals guide?22:08
jelmermwhudson: oh, whoops22:40
jelmermwhudson: I'm about to land a branch that fixes 75% of the hg imports22:40
mwhudsonjelmer: \o/22:41
spivquotemstr: ancestor::parent22:43
* jelmer waves to spiv22:43
spivGood morning :)22:44
quotemstrThanks.22:44
quotemstrSo ':parent' is magical.22:44
mwhudsonit's a location alias i think the name is22:48
mwhudsonthere are a few22:48
mwhudson:push and :submit are others22:48
quotemstrspiv: That doesn't DTRT at all.22:53
quotemstrIt gives me some random commit from today.22:54
spivquotemstr: perhaps :parent isn't what you expect?  Check 'bzr info'23:00
quotemstrActually, after bzr log -r ancestor::parent.., I get "bzr: ERROR: Start revision not found in left-hand history of end revision.23:00
quotemstrparent is set correctly.23:00
=== spiv changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: spiv | 2.2.3 is officially out ! (rm vila)
spivOh, log is fussy like that.  abentley added some new revision specs that help with that.23:01
quotemstrWuh? Why *wouldn't* that work?23:02
quotemstrAnd why do you need new syntax to make it work?23:02
spivmainline: is the revspec I'm thinking of.23:02
spivI agree, I think log should cope, but currently it doesn't.23:03
spivFor non-trivial history exploration I tend to use 'bzr qlog' (from the qbzr plugin) or 'bzr viz' (similar thing in the bzr-gtk plugin).23:05
quotemstrAh. Anything native for OS X or Win32?23:07
quotemstr(Well, I can use X with both. It's just a pain.)23:07
spivqbzr looks pretty slick on Win32 at least (it and bzr-explorer and some other plugins are bundled in the bzr installer for that platform)23:07
spivIIRC it works ok on OS X too, although there may be some fiddly dependencies that I'm ignorant of.23:08
quotemstrThanks. I'll take a look.23:09
quotemstrI'm leery of GUIs generally though.23:09
majoruse a good solvent23:17
mwhudsonwe does my checkout of lp:loggerhead whinge about not being able to break locks when i run bzr up?23:29
mwhudsoni suspect the fact that it appears to be making three connections to bazaar.launchpad.net is related23:29
jelmerugh23:30
jelmerwhat's so special about it that it needs 3 connections?23:30
mwhudsondon't know23:30
mwhudsonthe working tree is out of date with the local copy of the branch now23:30
mwhudsonhm, unbind/bind fixed it23:31
spivmwhudson: :(23:31
lifelessmwhudson: note that I'm about to push 1.18 to trunk, or something like that23:35
monkey_d_luffyhow can I "fork" my project at a particular revnum?   I tried branch but then why I try to commit changes I get an error "bound branch ... is out of date".   Basically what I want is a copy-paste of everything at a chosen revnum, so that it can stay independent.23:36
spivmonkey_d_luffy: "bzr branch -r REVNO"23:37
monkey_d_luffybut that didn't work...23:37
spivHow did it go wrong?23:38
monkey_d_luffythat's the problem I'm having now23:38
spivYour error says "bound branch" though, which isn't something that "bzr branch" (by itself) could give.23:39
spivDid you use "bzr checkout" instead, or perhaps "bzr bind" or "bzr reconfigure" after "bzr branch"?23:40
monkey_d_luffyI did a branch of my project    bzr branch -r 60   trunk  trunk_new                    then I renamed both directories.   And now when I try to do a commit in my new dir, I get that error23:40
monkey_d_luffyit could have been a checkout, but I'm pretty sure it was a branch... will try again then23:41
spivHmm.  Well, you should be able to "bzr unbind" (or "bzr reconfigure --tree") to change it.23:41
spivAnd "bzr info" can tell you what it is now.23:41
monkey_d_luffyI did a bzr info now... it was a checkout after all :|23:42
monkey_d_luffyso a branch makes it completely independent from the parent branch (which may even be deleted) correct?23:46
spivYes.23:50
monkey_d_luffyok thansk23:51

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