/srv/irclogs.ubuntu.com/2010/10/11/#bzr.txt

stewarthi! I'm trying to write a python program that uses bzr lib to take a series of revisions in one branch A and re-applies them to a subdirectory of branch B (A and B are different and have no common history in bzr, although in reality they do)00:38
stewarti've managed to get the logger to output a patch for each revision in the gap i want00:39
stewartbut... a) i'm sure there's a better way and b) i'm wanting the metadata as a sep object so that I can construct a commit message.00:39
stewartI'm also having some issues of revno versus revid and wondering why the difference? as in, why can't i just use the full id everywhere?00:40
peitschiehi stewart... things have been rather dead all day here to warn ya.  I suspect the regulars are on their weekend :)00:43
peitschieit might be worth posting the questions to the mailing list?00:43
fullermdstewart: I can't help you with the bzrlib stuff.  But the reasons for revno vs revid is that they have different properties of permanence and convenience.01:23
fullermdCertainly you _can_ just use the revid everywhere.01:23
thumperhi stewart01:23
stewartfullermd, not in bzrlib calls it seems. i get strange errors passing things around.01:23
stewartthumper, hi!01:23
thumperstewart: have you looked at a plugin that has replay?01:24
thumperstewart: it may not do exactly what you want01:24
thumperstewart: but may be close01:24
stewartthumper, haven't seen one...01:24
* thumper wonders where replay lives01:24
mwhudsonbzr-rewrite i think01:24
fullermdMmm.  I'd be tempted to assume an API that requires a revno and refuses a revid (other than ones inherently biased to that of course) is a bug...01:25
thumperstewart: I agree with fullermd about the revid thing01:25
stewartmost of the things i've seen have either been a) epically undocumented or b) tries something with ids of files :)01:25
thumperstewart: I use revid almost everywhere in bzrlib calls01:25
fullermdOh, well, stuff with file-id's is totally outside that axis   :)01:25
thumpera revno is a valid revision speci01:26
thumperas is revid:some-long-id01:26
thumperat least I think so...01:26
thumpers/speci/spec/01:26
thumpermost bzrlib calls will work with revision specs01:26
stewartthumper, check out my loop in http://paste.drizzle.org/show/65/  - the obvious of passing in the id from iter_merge_sorted_revisions to make_log_request_dict ends in an error for me.01:26
fullermdRevision specs sit way up at the top of the API, right below the UI.01:26
thumperstewart: why are you wanting to convert a revid to a dotted revno?01:28
thumperfor log.make_log_request_dict ?01:28
stewartthumper, i don't know.01:28
stewartthumper, an attempt to get it to work :)01:29
thumperstewart: so... you are trying to get the diff for a particular revision?01:29
stewartthumper, yep.01:29
stewartthumper, to then apply to another tree.01:29
mwhudsonstewart: there are definitely easier ways of doing this01:29
* thumper wants a simple way to do this too01:29
thumperabentley pointed me at some docs01:30
thumperlet me see if I can find them01:30
stewartthumper, just for reference, the config file being used is http://paste.drizzle.org/show/66/01:30
stewartthumper, the next step is to parse the revision and work out if it would apply or not. as i only want revisions that touch a certain subdirectory :)01:31
thumperhttp://doc.bazaar.canonical.com/developers/integration.html was the doc, but it doesn't give an example of getting the diff01:31
thumperstewart: I know there is a relatively simple way to get an iterator of the changes01:32
thumperstewart: and check the files for each change chunk01:32
thumperstewart: so it shouldn't be too hard...01:32
* thumper thinks01:32
thumperwe do get diffs for particular revisions in LP01:32
thumperlike in the outgoing email01:32
* thumper checks the code01:32
thumper gah01:36
thumpersometimes the bzrlib code reminds me of looking at zope internals01:37
thumperstewart: I'll point you at the bzrlib.diff file01:37
stewartthumper, luckily, i've never had to deal with zope internals01:37
mtaylorzope internals are AMAZINGLY convoluted01:38
thumperstewart: http://paste.drizzle.org/show/67/01:38
stewartthumper, it would be nice if a bunch of this was exposed via command line interfaces too. for the purposes of what i'm doing now, a list of revisions and a loop in shell would have been fine :)01:38
thumperstewart: that is how we get a text representation of the diff between two revisions01:38
thumperstewart: yep...01:38
thumperstewart: luckily bzr plugins a pretty easy to write01:39
thumperstewart: to actually get to the guts of the diff, you need to look at the differs01:39
mwhudsonstewart: how about this: http://pastebin.ubuntu.com/510517/01:40
thumperstewart: IIRC you get some form of iterater over changes01:40
mwhudsonstewart: then for i in $(seq $(bzr revno)); do bzr diff -c $i > $i.diff; done ?01:41
stewartmwhudson, relatively close... the next step being to have teh diff in a variable that i can analyse and change before applying to another tree.01:42
mwhudsonstewart: use a stringio instead of a real file?01:42
stewartmwhudson, looking01:43
* stewart not a python programmer. is ENOTPERL :)01:43
stewartor, rather, ENOTC01:43
pooliehi stewart, mwh01:43
stewartpoolie, hi!01:43
fullermdI heard of somebody once doing some stuff with bzrlib via Inline::Python or something   ;)01:43
* thumper leaves stewart in poolie's capable hands01:43
spivHi poolie01:45
pooliehi spiv, how are you?01:45
pooliei thought today i'd try to clear the queues a bit, both mine and others-01:45
spivSounds good.  I'm going to finish up my split-NEWS branch, then also look at the review queue, seeing as I promised vila I'd look at some of his patches :)01:47
pooliek01:47
pooliestewart: are you all set now?01:47
stewartpoolie, possibly... enough to go occupy myself for a while at least :)01:48
jbowtieBazaar doesn't use blueprints?  (according to launchpad)01:53
jbowtieShould I just write up my proposal on the mailing list, then?  Or propose an Ubuntu-level blueprint for UDS?01:54
spivThe mailing list is a good place for discussion.  For work-in-progress documents (which can include proposals) you could consider a merge-proposal to add to doc/developers/, or a wiki page... and probably post to the list about it.01:59
pooliejbowtie: for what proposal?01:59
jbowtiepoolie: My binary diff/merge proposal. Right now it's sitting in a text file on my hard drive.02:05
jbowtieI was thinking of splitting it into three blueprints: core changes, archive handling, GIMP xcf file handling.02:06
poolieok02:06
pooliei'm coming to think that doing blueprints02:06
pooliecan be most useful if you're clear what you're trying to achieve02:07
poolie(which sounds obvious)02:07
jbowtie..and therefore?02:10
lifelesspoolie: you may like to know that consolidation of the various trackers in LP is back on the table02:14
pooliesorry jbowtie, distracted02:15
poolietherefore, are you writing this02:15
poolie- to get it straight in your mind02:15
poolieor02:15
poolie- to make sure no one objects later or02:15
poolie- to get other people to find mistakes before you do or02:15
poolie- because you want other people to actually do it..02:16
poolieetc02:16
pooliei think the spec tracker is most useful, perhaps, when there is a long dependency chain and the person writing the spec is not the one who will implement it02:16
pooliebut that's not really true for us02:16
poolieso for you, i think just sending mail and then turning the thing into user-oriented docs should be enough02:17
pooliedon't send mails that are individually too big or you may swamp people and they'll glaze over02:17
jbowtieOK, that sounds reasonable. I'll split it up into bite-sized pieces for the mailing list.02:18
pooliemay also help to think 'what is the simplest thing in this direction that could possibly help?'02:19
jbowtieIs it helpful to create a tracking bug for future reference?  Once I have some consensus, of course.02:19
jbowtieOr is better to just wait until I have a branch with something implemented.02:20
pooliejbowtie: well, do whatever helps you best02:32
pooliemy feeling is that bugs generally should be something where you can say when it's done02:32
poolieor at least you should be able to decompose them into that02:32
poolieso a bug like "should support managing non-source files" is kinda true but it's pretty hard to say when you have enough "support"02:33
pooliebut if you make it something more specific about diffing an archive by diffing the components02:33
poolieit's more clear what's needed02:33
poolieand you can always file more bugs ify ou want more02:34
pooliespiv, in https://code.launchpad.net/~mbp/bzr/http-messages/+merge/37931 i'm inclined to just land it02:36
spivpoolie: +102:36
pooliethanks02:37
spivpoolie: I can definitely think of more nice-to-have things (e.g. checking for content-type == text/html before munging), but I'd rather have it landed than wait for polish that will rarely matter.02:38
pooliemm02:39
pooliethis area is in practice really messy02:39
spivYeah, exactly.02:39
poolieexhibit A, the tendency for browsers to hide the error message together even though it's html02:39
spivSo I'm happy for incremental improvements to be driven by practical experience.02:39
spivRather than what I think would be nice-to-have :)02:39
pooliespiv, i don't know if this was you but "compatibility breaks" seems to list a lot of internal changes at the moment.04:30
poolieor were you trying to fix that?04:30
spivI don't recall doing anything to cause or fix that.04:33
spivI did move some news entries to b3 that were misattributed to b2, I don't think that involved any recategorisation thouhg.04:33
pooliek04:34
pooliei might fix them up but i don't want to clash with your splitting-up branch04:35
spivIt shouldn't clash, or if it does I think I can cope without undue pain.04:35
pooliestill otp?04:45
poolieyou know we could just keep NEWS for the current series and move it away for old ones04:45
poolieif that's an easier change04:45
spivpoolie: not otp, but still helping thumper somewhat04:55
spivI think that's fractionally harder, actually, because it makes the build logic slightly more complex04:56
AfCHi06:02
pooliehi afc06:15
pooliespiv, hi, iirc keyboardinterrupt is under systemerror, not exception?06:15
spivpoolie: in recent Python (definitely 2.6, maybe 2.5?) it is under BaseException but not Exception, yes06:16
spivI'd be ok with catching and reraising it explicitly if you like06:16
pooliei think it's good the way it is06:48
pooliein general i think it's pretty important repr methods don't crash06:48
gourmorning07:02
gourcan someoned comment some of the points mentioned in regard to bzr in http://selenic.com/pipermail/mercurial/2010-April/031191.html ?07:03
poolieah, i don't know07:05
spivgour: most of those points are a matter of personal taste, as the poster says.07:05
poolieone benchmark recently found us faster than them on commit07:05
poolieand some other operations07:05
pooliebut people who don't like that result can always find a different benchmark07:06
gourspiv: in few places, iirc, i saw criticism at "bazaar relies on a linear integer index for its revision numbering07:06
gourare there any consequences about it?07:06
pooliewe have a deterministic numbering of revisions on any graph07:06
spivgour: I've seen other people comment on how much they like our revnos compared to the other DVCS systems.07:06
spivgour: matters of taste can have consequences :)07:07
pooliehg last i looked had a numbering that varied between different copies of the repo depending what order they pulled07:07
gourspiv: heh07:07
gourafter mostly stopping using darcs, i used monotone a bit, which i like, but considering whether bzr/hg may be better due to wider support07:08
poolieoh, and for colocated branches, i think bzr-colo is very very nice07:09
gourthat's plugin?07:09
poolieyes07:10
gourbtw, what's with fast-import plugin after Ian left us?07:11
spivNo-one is actively working on it, but it also seems to be working very well for most people.07:14
glyphis there a way to list branches in a remote repository?07:15
glyph'bzr ls' seems to only work on branches.  I'm looking for some equivalent to 'svn ls .../branches/'07:16
gourspiv: https://bugs.launchpad.net/bzr-fastimport/+bug/54162607:16
ubot5Launchpad bug 541626 in Bazaar "'BTreeBuilder' object has no attribute '_find_ancestors' (affected: 5, heat: 24)" [High,Confirmed]07:16
fullermdgour: 'bzr ls' is for listing stuff within a branch.  bzrtools provides a 'branches' command that lists branches under a given location.07:17
fullermd(but only on indexable transports)07:17
gourfullermd: you thought about glyph ^^^07:18
fullermdBah.  All you 'g' folk look alike   :p07:18
vilahi all !07:19
fullermdWell, there goes the neighborhood.07:20
vilaOn the subject of neighbourhood, I heard complaints about goat smells....07:22
vilano pointing fingers of course07:22
fullermdGoats?  I don't see no *burp* goats 'round here...07:22
pooliehi vila07:22
vilapoolie: hey !07:23
glyphfullermd: what makes a transport 'indexable'?07:23
fullermdglyph: Roughly, "I can do ls on it"07:23
vilaglyph: the ability to list a directory07:23
fullermdSo e.g. http doesn't count.07:23
glyphPROPFIND!07:23
fullermdsftp does.07:23
glyphyou can hella do ls on http.07:23
poolieand webdav does07:24
pooliemaybe we should do that07:24
vilaglyph: PROPFIND is for DAV and can work for more than just directories iirc07:24
glyphvila: I work on calendarserver.org, so I know _all about_ all the crap PROPFIND can do ;-)07:25
glyphbut one of the things it can do is list a directory.07:25
vilaglyph: great ! :)07:25
vilaglyph: thanks for confirming :)07:25
spivDoesn't the bzr-webdav plugin provide listdir?07:25
* glyph tries 'bzr branches' on a few representative things07:25
spiv(Although you may need to use http+webdav as the url scheme)07:26
vilaspiv, glyph : yes, bzr-webdav does it (with PROPFIND ;-) but it's rather crude (from memory)07:27
vilaI haven't touch this plugin code for the last two years :-/07:28
vilaerr, last year07:28
vilatimes doesn't fly that fast finally07:28
lifelesspoolie: so, I'd return a small class with __iter__07:47
lifelesspoolie: -or-07:47
lifelesspoolie: there is a iter caching decorator around somewhere07:47
pooliei thought about that but it seems too easy to get it wrong and have it accidentally called earlier07:48
lifelessits trivial, might want to embed it itself07:48
poolieand then i thought, yagni07:48
poolieload_tests is called barely any later than the test module is loaded, probably07:48
poolieso you just need to make sure any wanted stuff is created earlier07:48
lifelessfirst iter it iterates its delegate, caches the results, etc07:48
lifelesspoolie: yeah, also in bzr's case its registries are initialized before any tests are laoded.07:49
lifelesslibrary init, plugin load, test load07:49
poolieright07:50
pooliei do think in the other course there are a couple of antipatterns07:50
poolieone is holding an iterator in a place where it could possibly be resued07:50
pooliebecause the second attempt will tend to just look like [] rather than an error07:51
poolieand the other is anything that takes "might be a callable or might just be the thing" tends to give a similar trap07:51
lifelesspoolie: I don't like the 'might be callable or object'  either ;)07:52
pooliespecifically saying '.scenarios' might be a list or might be callable (or a list of callables) is a dangerous idea07:53
lifelesspoolie: agreed; it is currently defined as 'an iterable' which implies 'not a generator'07:53
lifeless(for it to be a generator it needs to be defined as 'an iterable which will be iterated once'07:54
lifeless(as you know :P)07:54
lifelessafk for a bit07:54
vilaspiv: I briefly looked at your split-NEWS mp, sounds nice, don't forget to fix all references and usage descriptions in docS though08:03
spivvila: thanks08:04
peitschiehi guys.... is there an easy way to get from the sha1 to the commit message for a given rev in a tree?08:04
spivvila: it also needs some of the non-sphinx glue fixed up :/08:04
vilaspiv: exactly, or we should accelerate the switch-to-sphinx work08:04
vilapeitschie: sha1 ? Did you mean revid ?08:05
peitschievila: as in the specific key that is printed in the sha1 static tuple thingy08:06
vilapeitschie: ECONTEXT08:06
fullermdI put those little sheets in my dryer to avoid static tuple thingies.08:07
spivpeitschie: static tuple thingy?  Are you trying to debug a traceback?08:07
peitschiespiv: yup...repo keeps dying from bug #485601... i have tried reconcile and a few other things... but it works for a few commits then dies again08:09
ubot5Launchpad bug 485601 in Bazaar "missing chk node(s) for id_to_entry maps (affected: 2, heat: 13)" [Medium,Incomplete] https://launchpad.net/bugs/48560108:09
peitschievila: so i have dropped into a pdb session and found NoSuchRevision(<bzrlib.groupcompress.GroupCompressVersionedFiles object at 0x01C1EAF0> has no revision StaticTuple('sha1:9e2e17285dde089256cf0a2567416008c67559b4',))08:11
peitschievila: I don't quite understand how to get the ECONTEXT from there however....08:11
vilapoolie: https://code.edge.launchpad.net/~barry/bzr/609186-shortcuts/+merge/37787 might be a good place to play with your new ideas about load_tests, there are a nuch of very similar tests there that could be parametrized from the _ubuntu_series_shortcuts dict08:12
vilapoolie: there are fine *as is*, but look simple enough for you to play with too08:12
vilapeitschie: haaa. now you give me context :)08:13
peitschievila: I only just got the error back again :)... sorry!08:13
vilapeitschie: so this sha1 is not directly linked to a tree revision, more probably linked to a *file* revision, so the way to the commit message is a bit longer08:14
spivpeitschie: your original question isn't very on target, because that SHA-1 is not directly associated with a particular revision08:14
spiv(And quite possibly there are multiple revisions referring to that record)08:15
peitschiespiv: indeed :).  I'm trying to figure out the revision at which things are starting to go haywire :)08:15
vilapeitschie: you probably need to go up a bit in the stack...08:15
spivpeitschie: are stacked branches involved?08:15
peitschiespiv: is a bound branch the same as a stacked?08:16
spivpeitschie: no08:16
peitschiespiv: as far as I know I have no stacked branchs... I do have a local repo, with a bound branch that points to a remote repo though08:16
spivpeitschie: if you don't know what stacking is, and you aren't hosting the branches on Launchpad, then it's reasonably safe to say it isn't involved.08:16
spivIs bzr-svn involved?08:16
peitschieyupperz08:16
peitschiesorry... need to clarify that08:17
peitschiethe central trunk code gets checked into is svn08:17
vilapoolie: oh, re-reading the comments on https://code.edge.launchpad.net/~barry/bzr/609186-shortcuts/+merge/37787, yes a helper first and on top of that the parametrization, I was thinking about adding the helper myself as part of landing, thoughts ?08:17
peitschieso most dev changes are bzr => svn => bzr08:17
peitschiehaving said that, this exact bug is bzr => bzr08:17
spivpeitschie: have you tried the suggestion in jelmer_'s latest comment?08:18
spiv(upgrade to bzr-svn 1.0.4 or newer and a fresh conversion from svn->bzr?)08:18
peitschiespiv: that is likely a good place to start.  I've upgraded and run reconcile on the central repository, but the challenge is the difficulty of migrating all teh version history across to a "clean clone"08:19
spiv*nod*08:19
peitschiespiv: i'm not sure of an easy way to simply fetch all the ghosts from the old repository... or whether that might defeat the whole purpose of the clean clone and migration08:20
peitschiespiv: is it likely to be a bad idea to use fetch-ghosts or similar do you think?08:21
spivpeitschie: so08:22
* spiv hmms08:22
spivI'd try making a new shared repo, and branch into it all the branches you already have in SVN08:23
spivThen I guess try to branch across all the others08:23
spivI don't think it would hurt to try fetch-ghosts08:23
spivAlthough my guess is it won't help08:23
spivI have something else that may help08:23
peitschiespiv: the branches into the new one is painful... there is currently >500 I think :)08:24
peitschiespiv: yah?08:24
spivpeitschie: bzr branch lp:~spiv/+junk/bzr-chk-used-by ~/.bazaar/plugins/chk_used_by08:25
spivThen look at 'bzr help chk-used-by'08:25
spivIt may help you answer your original question08:25
peitschiespiv: oh!  thas cool :)... thanks very much for that08:26
spivpeitschie: IIRC it expects keys to be written as 'sha1:........'08:27
spivit's pretty rough and simple, just something I threw together for debugging a different bug a while back.08:28
peitschiespiv: hmm... comes out blank on both sides08:30
spivpeitschie: I don't think it will ever give any results on an SVN repo08:30
peitschiespiv: i've tried various combinations of with and withouth sha1 :)08:30
peitschiespiv: yep... I'm running this between the bzr => bzr broken stuff08:30
spivwell, it can't tell you about keys that aren't there, of course :)08:31
spivWell, hmm.08:31
spivAnd it only reports CHK root keys, I guess.08:31
peitschiei figured ;)... i'm running this in on boths sides of the break08:31
peitschieoh... so this could likely not be a root key then08:32
spivActually, it will tell you about any root key that is referenced by an inventory in your repo.08:32
spivI don't think it actually requires that root key to even be present (although perhaps it would raise an exception if it isn't?)08:33
peitschiespiv: hmm... quite mysterious.  do repo => repo transfers cause any inventories to be re-evaluated in any way?08:36
peitschiespiv: I wonder if this is related to ghosting somehow08:53
vilaping losa about pqm upgrade status08:58
mthaddonvila: it's on my list - should be able to get to it soon08:58
vilamthaddon: great ! And which kind of upgrade will be done ? I'm waiting for a testtools one myself, but I understand a lucid one has also been discussed08:59
mthaddonvila: I thought you'd rejected that possibility as you wanted to maintain python2.4 compatibility?09:00
vilamthaddon: indeed, but I lose on this front, I need to address it in another way, hence my question :)09:00
vilamthaddon: indeed, but *if* I lose on this front, I need to address it in another way, hence my question :)09:00
mthaddonI wasn't aware of that...09:00
vilaaware of what ?09:01
mthaddon(from your first comment it sounded like you had "lost" at that and we were going to upgrade to lucid)09:01
vilaor did my missing *if* started a misunderstanding :-/09:01
vilano, I have no idea why the lucid update is proposed so I don't know if it's required for some more important reasons or it if makes it impossible to only upgrade testtools, hence my query for status09:02
poolievila, hi there09:05
pooliei'm going to sign off soon09:05
pooliei'm interested in what you think about https://code.edge.launchpad.net/~mbp/bzr/597791-http-tests/+merge/3794109:05
poolieand about news09:05
pooliethanks for making a 2.3b2 freeze09:06
vilapoolie: clarification about news, I duplicated the entries as it was the *current* policy, I agree we should change the policy, but until it's done, I've applied the old one09:07
pooliefair enough09:07
pooliei think soon spiv is going to split the news files and that would be a good moment to change09:07
vilapoolie: exactly, I've looked at it but it's not proposed yet and I've already asked for the docs to be fixed too :) This kind of imply explaining how we should address that :)09:08
vilaabout the http test, I agree with the approach (I haven't review it yet, I'm starting pp'ing with non-core contributors ;) but it seems you're also discussing it with lifeless so I was tempted to wait for more stuff from you ;)09:10
vilapoolie: s/variations/scenarios/ sounds nice to me09:10
vilafor the attribute name I mean09:10
vilapoolie: and my remark about barry's shortcuts was related too09:11
pooliesorry, which remark?09:17
vila<vila> poolie: https://code.edge.launchpad.net/~barry/bzr/609186-shortcuts/+merge/37787 might be a good place to play with your new ideas about load_tests, there are a nuch of very similar tests there that could be parametrized from the _ubuntu_series_shortcuts dict09:22
vila<vila> poolie: there are fine *as is*, but look simple enough for you to play with too09:22
vilapoolie: I went ahead, introduced the helper and sent the result to pqm already09:23
poolieah, yes09:23
pooliei think, generally, if you can write it out just as a series of tests09:23
poolieor a static list, in a single test, that might be better?09:23
pooliemaybe not - if they're variations then you can run just one of them09:23
vilawell, the problem with a single test is that you get only one failure...09:23
poolieright09:24
poolieanyhow, i should go09:24
pooliegood night09:24
=== Christian is now known as Guest65924
=== Guest65924 is now known as Christian12
Christian12Hi I have a general question concerning version control tools. atm we have a central coldfusion test server(unix). The developers run windows machienes and work directly on the files on that system. when the development is dont the files are replicated to the prod system. Which bazaar workflow would fit best in this case? Do I need to install on all local machines a webserver + coldfusion?09:49
vilamthaddon: can you clarify why a lucid upgrade is needed ?09:50
mthaddonvila: it's not necessarily needed - it's just that's what we're upgrading all the servers in the DC to, so we were asking if it made sense to do that09:51
vilaok09:52
vilagrrrRRRR pqm submission failing but no mail :(11:03
vilaping losa, two of my last submissions to pqm failed and I didn't get the associated email11:04
vilaold problem with some MTA dropping it because it's too big, but I can't reproduce locally and I need some hints about which tests are failing :-/11:04
vilathe submissions are related to https://code.edge.launchpad.net/~vila/bzr/609186-shortcuts/+merge/3809811:05
mthaddonvila: we're getting mail returned from the address PQM is trying to send to...11:05
mthaddonvila: seems your smtp gateway thinks it's spam and is rejecting it11:06
vilamthaddon: ha !11:06
vilamthaddon: argh :(11:06
vilamthaddon: can you forward to my canonical email both the pqm mail and the spam report ones ?11:07
mthaddonk, have done11:08
vilathks !11:08
vilaI hate spam and it's unintended consequences....11:08
vilamthaddon: I got the spam report one but not the pqm one (that part cited in the first doesn't mention any failure)11:22
mthaddonvila: that email includes the entire test run output11:23
vilamthaddon: the spam report says it's truncated but more importantly, I see *no* failures there11:24
mthaddonvila: what about https://pastebin.canonical.com/38477/ ?11:25
vilamthaddon: it's an *expected* failure XFAIL not FAIL11:26
mthaddonwell there's definitely something it doesn't like: > merge http://bazaar.launchpad.net/~vila/bzr/609186-shortcuts http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev11:27
mthaddon> Command failed!11:27
vilamthaddon: right, that's why it doesn't get merged, but this doesn't tell me why. I briefly see ~36 failures in the summary on the pqm web page but no details11:29
vilamthaddon: I received mails for other failures for other mps though: Conflicts during merge: Text conflict in NEWS11:30
vilamthaddon: I *can* address these ones, but the one I ask your help about seem to be related to *test* failures, that's why I need the pqm email which is supposed to include pqm-stdout.gz and pqm-stderr.gz11:31
mthaddonI don't have access to that11:32
* vila bangs head on desk11:32
mthaddonif you can fix your SMTP server, you can resubmit and they'll get sent through11:32
vilamthaddon: my ISP smtp server ? I can't fix that. I'm searching the right way to get in touch with them about their spam filter going mad11:33
mthaddonor you could submit from an email that doesn't have a broken spam filter11:33
vilahmmm, pqm authenticates on the gpg signature not the originating email right ?11:35
vilanah, the gpg sig *is* for a given email11:35
=== frakturfreak is now known as enaritud
=== enaritud is now known as frakturfreak
vilamthaddon: by the way, isn't there a RT ticket about configuring the news_merge plugin on pqm (which would have let 3 of my proposals goes through instead of failing) ?11:37
mthaddonthere may be - we've been a little busy with the release recently... :)11:38
vilamthaddon: I'm not complaining, just checking that it has been reported correctly11:38
vilamthaddon: I fully realize the help you're providing11:39
vilagah, no irony intended in this :-(11:39
mthaddonnone taken :)11:39
vilamthaddon: it's just that I'm patch pilot this week and as such the main pqm user so I try to sync on what is needed :-/11:42
vilawell, I'm also the RM so even more pqm uses...11:42
vilastarting with 5 submissions and getting 5 failures including 2 with no clue about what failed made me a bit... you know... surprised :)11:43
mthaddonvila: I do see three pqm log files on the server with "Conflicts during merge: Text conflict in NEWS" in them about 45 mins ago11:51
mthaddondunno why PQM is running the test suite if there's a merge conflict though...11:51
mthaddonthat seems sub-optimal11:51
vilaI've got mails for ~nmb/bzr/311518-apache-doc-rewrite , 551391-log-memory-usage and ~nmb/bzr/484101-default-format11:52
vilabut they all say: Ran 0 tests in 0.000s11:52
vilaso I'm pretty sure the test aren't run if the merge fails11:52
mthaddonhmm11:52
vilaI'm after thw two other (really the same submitted twice) where tests have failed (to the best of my understanding)11:53
vila(the fact that I got mails for failures doesn't make the spam report easier to understand either :-/ But that's clearly another topic :)11:53
mthaddonwhat time would they have been sent?11:55
mthaddonand does this look possible - http://paste.ubuntu.com/510805/11:56
vilajust before the others... 2hours before at most11:56
mthaddonthat paste is the previous one to the merge failures11:57
vilaargh, the traceback is not supposed to lead to a failure :-(11:58
vilait's a transient issue11:59
vilaerr11:59
vilasporadic issue11:59
vilamthaddon: I suspect this traceback escaped the redirections, is still not leading to a failure and that we just need the redirected files.... which may not be on pqm anymore having been sent by mail :-/12:10
vilamthaddon: I assume you didn't edit that pastebin of course (just checking the 1% unlikely event ;)12:11
mthaddonnope, didn't edit it12:11
=== jelmer_ is now known as jelmer
AmythangI did a push to a new location, I was expecting the source to go over but only the .bzr dir went, whats the best way to do this?12:15
Amythangmaybe I should start from beginning, I'm a lone developer, been using bazaar on my local machine. Now I have to move my stuff to the live server for the first time12:19
Amythangshould I install bazaar on the live server or am I ok with pushing the changes to server?12:20
zyga(disk wise)12:23
=== zyga is now known as zyga-lunch
vilaAmythang: the usual big question is: do you need the history on the server (the .bzr dir) or do you need the files themselves (the working tree)12:35
vilaAmythang: or both or some variant ? (Including: eerk, I certainly don't want the history to be readable by everybody on the internet, it's a web site ! I only want to publish the web site !)12:36
Amythangyes good point, I guess I will not need the history12:36
vilaAmythang: in that case, have a look at the bzr-upload plugin12:37
Amythangok thanks :)12:37
vilaAmythang: and start by removing the .bzr dir on the server12:37
=== zyga-lunch is now known as zyga
millunhi, wondering what i should use for Eclipse's /workspace/ dir. colocated repository, right?13:54
dOxxxmornin'13:54
viladOxxx: hey !14:08
vilamillun: sounds right14:09
millunthanks vila14:10
vilamillun: I assumed you mean using bzr-colo right ?14:10
milluni am using the GUI thingy. yes, prolly14:10
vilamillun: I know little about it :-/ But I suspect they use 'colocated' as implying that14:12
viladOxxx: Just read your mail, perfect14:12
viladOxxx: if you have any doubt about which plugin version you should use, the default answer should be: use trunk, we'll see with plugin authors about doing proper releases before 2.3.0final14:13
vilause tip from the trunk I meant14:13
vilajam: ping15:05
vilajam: can you try to feed-pqm https://code.edge.launchpad.net/~vila/bzr/609186-shortcuts/+merge/3809815:06
vilajam: pqm just hates me and I can't reproduce any error with that whatever I try (including using the hardy slave which should almost identical to pqm)15:06
vilajam: losa told me the mail is bounced by my ISP as being spam :-( So use my canonical address to forward it to me if you get one15:07
vilajam: pingeling ?15:24
vilamgz: ping15:39
jamvila: I'm off today (Columbus day) but since I'm around right now, do you still want me to propose it?16:34
vilajam: argh, damn, sorry :(16:34
jamWell, I am around right now16:34
vilajam: yes please, this drives me nuts16:34
jamsent16:35
jamI'll forward you whatever pqm tells me16:35
vilajam: I'm trying to contact my ISP about it, but it's.... non-trivial :-/16:35
vilajam: great !16:35
vilajam: got something ?17:30
=== beuno is now known as beuno-lunch
=== oubiwann is now known as oubiwann-away
=== oubiwann-away is now known as oubiwann
=== beuno-lunch is now known as beuno
jamvila: text conflict in NEWS18:47
GaryvdMHi all18:59
GaryvdMjam: poolie has given me access to the aws account, so I can start and stop instances :-)19:00
GaryvdMjam: last time I used it, I tried to create a new snapshot. But I don't have access to shutdown, which I believe is necessary to create a snapshot.19:02
GaryvdMStopping the instance does not work...19:03
GaryvdMjam: When the instance is up, please could you give me permission to do that.19:04
vilajam: pqm is *really* playing with my nerves, merged, conflict resolved, care to try again (I'm out but will pass around later) ?19:11
* GaryvdM waves to villa19:11
vilaGaryvdM: _o/19:12
vilajam: Of course this NEWS conflict is *not* the problem I'm after, just a fallout of *other* mps I've landed19:12
dOxxxbzr 2.3b2 mac os x 10.6 installer uploading19:31
dOxxxvila: config changes for 2.3b2 mac os x installer have been pushed. you can pull and build the 10.5 installers anytime.19:32
viladOxxx: fetch-externals.py -p -u ?19:50
* jelmer waves to vila, d0xxx, GaryvdM, jam19:58
dOxxxvila: yes20:05
dOxxxhey jelmer20:06
viladOxxx: cool, uploading then :)20:06
vilahey jelmer !20:06
vilajelmer: you can upload 2.3b2 to debian ;-)20:07
maxbvila: he already has20:09
vilameh, why isn'y it showing on http://packages.debian.org/search?keywords=bzr then ?20:09
vilanot complaining, just trying to understand !20:09
maxbsid (unstable) (vcs): easy to use distributed version control system20:10
maxb2.3.0~beta2-1: alpha amd64 hppa i386 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe sparc sparc6420:10
vilasid ? shouldn't that be experimental ?20:11
vilamaxb: and where did you get that ? I learned about 'rmadison -u debian bzr' last week but it's still a different output20:12
vilamaxb: will you update the beta ppa ?20:12
maxbvila: What I pasted into the channel, I copied from the link you provided20:12
jelmervila: I've already uploaded it yesterday evening :-) it should turn up at some point today.20:12
maxbAs to why sid, well, jelmer's preference, I suppose? :-)20:13
vilajelmer: cool :)20:13
vilamaxb: interesting, it's not showing in my firefox... cache issue ?20:13
dOxxxvila: At some point, I would like to clean up the mac installer scripts to move some of those functions out of config,.py and into build.py, and improve fetch-externals.py to be a bit smarter about what and when it updates and downloads. If you have any suggestions, feel free to make merge proposals.20:14
maxbI suppose20:14
viladOxxx: I did :) I'd like config.py to be turned into a isntaller.conf as some point :) I thought you were in the CC: or even in the To: of the email I wrote about that...20:15
GaryvdMvila: Must be cache - I see 2.3.0~beta2-120:15
GaryvdMctrl+F520:16
dOxxxvila: oh yeah, I saw that. I actually kinda prefer it as a python source file since that gives it some flexibility while still being a syntax that everybody understands20:16
vilaright, it was cached20:16
dOxxxvila: I'm a great believer in python syntax as a config language, I even wrote a config language for my work that uses python syntax :)20:16
vilahehe20:16
viladOxxx: I don't think we would go as far for bzr, if only for security concerns20:17
dOxxxvila: as a remote downloaded config file?20:18
dOxxxI suppose yeah that could have security concerns20:18
viladOxxx: yes, think branch.conf and may be soon repo.conf and project.conf or company.conf20:19
dOxxxhmm20:19
dOxxxXML! ;)20:19
viladOxxx: you can't allow arbitrary code to be taken into account when you pull/merge/commit20:19
viladOxxx: I thought you said user-friendly ? :)20:20
dOxxx:)20:20
dOxxxwell, it's that or write something from scratch20:20
dOxxxI dislike ini files, they're very limited20:20
dOxxxare the windows installer config files using ini format?20:21
viladOxxx: well, we use configobj which is an ini-like syntax, but values can be strings or list, sections can be used for dicts, the variable names accept dots, so you can also use that to have dicts20:22
GaryvdMdOxxx: No - They python20:22
dOxxxGaryvdM: oh yes, I remember now, they use classes instead of just dicts and lists20:23
viladOxxx: no, but I'm talking about bzr config files and if they can't address the installer needs, that may be a sign we need to support more features (or think about how to use them better)20:23
GaryvdMhttp://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk/annotate/head%3A/bazaar_releases.py20:23
dOxxxvila: I see20:23
vilaGaryvdM: by the way, I found the bazaar releases calendar back (see 2.3b2 wiki page) but it seems I can't update it20:23
vilanote to self: ping poolie about it20:24
dOxxxvila: if we were to use the bzr config file format, then we'd have to agree on a common set of conventions on the layout on top of that, to be able to share it amongst windows and mac20:24
viladOxxx: that's exactly what I wanted us to discuss on the ml :)20:24
vilaGaryvdM: on the other hand, the fact that the calendar exists and that nobody use it (and even forgot about it) may be an indication that it's not the right tool ;)20:25
=== oubiwann is now known as oubiwann-away
=== oubiwann-away is now known as oubiwann
vilaGaryvdM: I tend to use launchpad for that, the https://edge.launchpad.net/bzr/+series page is a good summary for me20:26
GaryvdMvila:  I was thinking about it, and I think that launchpad should be able to output milestones and releases as a ical. I'm going to log a feature request...20:26
vilaGaryvdM: good idea20:26
dOxxxvila: I'm replying on the ML20:27
viladOxxx: great20:27
GaryvdMvila: I would like a ical so I can load into tb+lightning.20:27
vilatb.... tb ?20:27
GaryvdMthunderbird20:27
vilaha, of course20:28
vilaall I could think of was traceback :)20:28
vilaI should really go to sleep, tomorrow will be another long day :)20:29
vilahave fun !20:29
GaryvdMGood night.20:29
dOxxxvila: night!20:29
achiangis there a bzr way to do 'git rebase' ? google tells me of a plugin, but i'm not terribly excited about plugins. maybe there's an idiomatic bzr way to do it?21:51
dashthe idomatic way is to not rebase, generally21:51
dashwhat's your situation?21:52
dashwhat are you tryign to deal with>21:52
achiangi want to do some work based on a branch that has a merge proposal (in launchpad) but hasn't landed yet21:53
achiangcall the proposed branch "A" and the new work i want to start "B"21:53
dashsure. so you can merge the merge proposal into your branch and then do your work,21:54
achiangoh, but "A" and "B" both branched from master at the same time21:54
dashsure, that's fine.21:54
achiangi guess coming from a git world, i don't really want to introduce a merge commit into B21:54
dashwhy not?21:54
achiangit's technically correct, i understand this point. but it just looks strange to me when reading branch history21:55
dashoh?21:55
dashit indicates clearly what your history is21:56
achiangi guess i want my history to look more linear21:56
achiangi'm not describing my "issue" very well21:56
dashwell, it will21:56
dashyour trunk will show a merge from A then a merge from B21:56
dashs/trunk/master/, whatever :)21:57
achiangB requires code in A to work properly. thing is, i started B a while ago before i knew that i needed A21:57
achiangthat is, i started down the B path, got some stuff working, then realized that a cleaner way to accomplish B was to have some other code that was logically separate. so i refactored trunk to incorporate A21:58
dashachiang: sure. so merge A into B, no worries.21:58
mwhudsonachiang: the 'avoiding merge commits' thing is considered a non-goal in bzr21:58
dashthat won't affect your mainline log view.21:58
achianga normal person would have simply done A, and then done B. i want the history to resemble what a normal person would have done. :)21:59
dashachiang: why?21:59
achiangah, so if i merge A -> B now, and then A -> trunk and then B -> trunk, the A->B merge doesn't appear in trunk?22:00
dashachiang: like i said, your 'bzr log' output on master will contain the merge commit from A and the merge commit from B22:00
dashachiang: not at the top level. it's a nested commit of the merge into master.22:00
dashso the data is there if you look for it but it's not displayed by default.22:01
achiangmwhudson: i mean, git allows these merges too. it's just a workflow issue22:01
mwhudsonachiang: well yeah, but the tools and conventions are oriented around common workflows22:02
achiangdash: to answer your "why do you want that" question, it's mostly to satisfy my own quirks. i'm coming from a kernel workflow where we work hard to avoid merge commits if possible, mostly because that's the convention that the kernel community has settled on. one way that "leaf node" developers can avoid merge commits is by using a rebase command22:05
dashno comment on the mental health of kernel developers :)22:05
achiangof course, there are other workflows as well, and that's why i'm asking here to see what other folks do22:05
achiangso in bzr-land, merge commits are no big deal, i guess22:06
dashright22:06
achiangand i guess i could embrace that convention. it'll just take some personal readjustment. :)22:06
achiangmwhudson: dash: thank you for the advice.22:07
mwhudsonachiang: np22:07
Kamping_Kaiserand incase it wasn't mentioned, bzr has a rebase too :)22:12
GaryvdMKamping_Kaiser: Yes - achiang did say he read of the plugin22:13
Kamping_KaiserGaryvdM: thanks; i missed it in the scrollback22:14
* Kamping_Kaiser will lurk more22:14
GaryvdMKamping_Kaiser: Sorry - I did not mean for that to sound harsh.22:15
Kamping_KaiserGaryvdM: no problem, i didn't take it that way22:16
peitschiemornin all22:17
pooliehi jam?22:25
poolielifeless: if nothing is on fire would you be so kind as to reread https://code.edge.launchpad.net/~mbp/bzr/597791-http-tests/+merge/3794122:30
thumperpoolie: hi22:32
pooliehi there thumper22:34
thumperpoolie: got time for a call?22:35
thumperpoolie: I have a few questions22:35
jamhey poolie, today is a holiday, so I'm mostly off, but if it is something quick, I'm around right now22:43
pooliejam, not urgent, just saying hi22:46
pooliei forgot it was still your monday22:46
pooliehave a good day22:46
GaryvdMHi poolie, jam.22:47
GaryvdMpoolie: could you maybe help me with the thing I asked jam earlier?22:48
GaryvdMnot sure if it's in your scrollback?22:48
poolieprobably not, can you ask again?22:49
GaryvdMpoolie: last time I used the ec2 instance, I tried to create a new snapshot. But I don't have access to shutdown, which I believe is necessary to create a snapshot. Stopping the instance does not work...22:50
pooliewithin the vm, you don't have permission to shutdown?22:51
GaryvdMpoolie: no - and I think you xan give that to me without giving me full admin22:51
GaryvdM*can22:52
pooliejam, still here?22:52
jampoolie: yeah. You can do a snapshot from the ec2 console22:52
jamvs the commandline tools22:52
jamfor some reason the website is able to reliably shut it down, but the firefox extension and the command-line tools didn't seem able to22:53
jamanyway, heading out now22:53
GaryvdMjam: should I try ie?22:53
pooliei think i've seen it not take the snapshot until it shuts down22:53
pooliethumper: remote.py, _rpc_open_2_122:54
GaryvdMpoolie: yes, but I cant shutdown, only stop. Ill try see if I can shutdown using msie..22:55
peitschiewow... i'm impressed23:03
peitschiei've just branched our entire repo with the process taking a peak of 2Gb under linux23:03
peitschieavg around 500mb-1gb23:03
peitschie6500 revs.... with some largish individual files in it23:04
peitschiei couldn't do this in one sitting 3 months ago :O23:04
peitschie(this is bzr+svn btw as well)23:04
pooliepeitschie: that's great23:18
jelmer'morning peitschie, poolie23:19
pooliehi jelmer, gary23:19
pooliegary, you have your own local account on the machine and it's not allowed to run shutdown?23:19
peitschiemornin jelmer :)23:19
GaryvdMYes23:19
lifelesspoolie: reread23:20
pooliethanks23:30
pooliehi GaryvdM23:30
GaryvdMpoolie: Hi23:30
poolieit might be simplest if you get jam to give you that access tomorrow23:31
GaryvdMpoolie: Ok23:31
GaryvdMI'm busy trying to see if I can do et from msie.23:32
GaryvdM*it23:32
GaryvdMNope. I'll ask John to help tomorrow.23:40
maxbjelmer: You uploaded 2.3b2 to unstable, but didn't push to pkg-bazaar23:56
jelmermaxb: Woops23:57
jelmermaxb: Pushed, sorry.23:58
maxbjelmer: bzr mark-uploaded? :-)23:59

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