/srv/irclogs.ubuntu.com/2009/09/04/#bzr.txt

igcmoldy: where did the branches come from?00:01
igcmoldy: iiuic, no common ancestor implies they have no history in common00:02
moldyigc: they come from a converted svn repository00:07
igcmoldy: converted via bzr-svn or bzr-fastimport?00:08
moldyigc: bzr-svn00:08
igcmoldy: I don't know much about bzr-svn sorry00:09
igcjelmer: still around today?00:09
moldyigc: as a last resort, i could manually create another branch off of branch a, apply the differences to branch b, and use that one as the new branch b (i don't desperately need all the history), but i am wondering if there is a better way00:09
igcmoldy: see if jelmer or anyone else has a better idea first00:09
igcmoldy: if not, that sounds ok to me00:10
=== Noldorin_ is now known as Noldorin
lifelessmoldy: were the branches in the svn repo created by doing 'cp', or by separate imports?00:19
moldylifeless: i have no idea :)00:20
moldylifeless: hm, now that i thinj about it, probably by "cp", but i cannot vouch for it :)00:20
lifelessif they were, I would expect bzr-svn to have joined them00:21
lifelessuhm, I suggest filing a bug on bzr-svn, if they have common ancestry in svn00:21
moldyhm, they have common history in svn00:22
moldyi ran bzr-svn on the whole repository00:23
S11001001is it kosher to use 2a repo format for all new repos if you only care about 1.17+ support?00:24
moldybut i also changed the layout a bit, so i joined stuff into the branches that had their own svn modules before, maybe that was the problem00:24
lifelessS11001001: yes, thats fine.00:34
lifeless2a is usable [but not ideal] from 1.16 on00:34
lifelessS11001001: we will be strongly recommending 2.0 and above everywhere00:34
bob2probably silly question, but was the 2a upgrade issue fixed before trunk switched?00:40
=== thumper-afk is now known as thumper
poolieigc, hi01:08
igchi poolie01:08
poolieso if putting sphinx onto hardy is hard, um01:08
SamBdangit, bzr help needs some sort of close-match spell checking when the edit distance is just a few characters between the user entry and what they actually wanted help on ...01:09
poolieSamB: i don't think bzr-guess does this but it would be an easy extension01:09
SamBsay, "help revision-specs" instead of "help revisionspec"01:09
SamBpoolie: heck, I think this is important enough to be in core!01:09
poolieigc, did it turn out you can't run it from source01:09
igcpoolie: yet to try01:10
SamBespecially for the non-command topics01:10
SamBwhich have rather arbitrary names01:10
igcpoolie: I might get to it today01:10
pooliei just wondered01:10
igcpolie: need to upgrade to 2a first01:10
pooliethe issues lamont mentions may block it running from source too01:10
pooliein which case we might01:10
igcpoolie: maybe01:10
pooliehm, i guess we could ask for a karmic chroot there01:10
igcpoolie: let me try from source first01:11
igcpoolie: karmic may be out before they get to it either way :-(01:12
poolieigc, from recent mail it looks like karmic may not be LTS01:12
igcpoolie: I thought 10.4 was LTS01:13
poolieyou also get into the problem that slightly exotic server hardware may not be supported by newer kernels01:13
poolieat least i think i recall that happening in going to hardy01:13
poolieright but karmic is not 10.401:13
poolieit will be 9.1001:13
igcright01:13
SamBhmm ... my "bzr log" is silly and only looks in the current branch for revisions even when they're in the same repo, it seems :-(01:14
poolieso the earliest they'll probably want to upgrade the base os there is may 201001:14
lamontpoolie: it shouldn't be _hard_ to put sphinx in hardy01:19
lamontit just needs to not be self-build-depending...01:20
lamontfor a round01:20
pooliei'm not sure what that means01:20
poolieis it getting rid of the circular dependency?01:20
fullermdSamB: Well, if they're not in the current branch, it's tough to get the revno...01:20
SamBbah!01:21
lamontpoolie: I expect that the reason jinja2 build-depends sphinx is for its own docs?  is it possible to strip the sphinx-needs from jinja enough to build and have it work enough to build sphinx enough to build jinja-with-sphinx to build sphinx-with-full-jinja?01:21
SamBwhy can't it just skip that?01:21
fullermdI think the typical answer to things like that is "because your patch for it hasn't been merged'   :p01:21
poolielamont: i expect that's true too, and that it is possible01:21
SamBor at least give a less scary-looking error that explains what went wrong a bit better ...01:22
pooliebut i haven't looked at the source at all01:22
lamontpoolie: it has to be.. it's just a question of how far back in history one has to go01:22
fullermd(note that the error you get is a NoSuchRevision, but it doesn't come from looking up the rev, it comes from branch.revision_id_to_dotted_revno()01:22
poolieoh, because it was not circular at the time it originally went into debian or ubuntu?01:22
SamBof course, I'm on an old build atm because I was hoping to figure out how to look at the changelog ...01:22
poolieSamb, i agree, file or dupe a bug01:22
lamontI admit I haven't been watching, but I expect that the decision on next-LTS won't be made until at least the next UDS, so it'll either be 10.04 or 10.1001:22
igchi sidnei01:24
sidneiigc: oi01:25
igcsidnei: a questions fro you ...01:25
lifelesscircular deps are sadness01:25
sidneiigc: shoot01:25
igccan I use/test the buildout stuff on linux01:25
igcI'm thinking of getting the image right ...01:25
poolielifeless: did you see bialix's comments about 'apport's dependencies are so hard on windows'?01:25
igcthen worrying about how the installer does something with it01:26
lifelesspoolie: yes01:26
lamontpoolie: and the real issue is that it needs a file that isn't even delivered by python in hardy... :(01:26
lifelessjml: poolie: 12 for lunch?01:27
sidneiigc: uhm. if i recall correctly, you should be able to run bootstrap.py then bin/buildout on linux01:27
sidneiigc: but after that it invokes a batch file01:27
poolielifeless: sure, where?01:27
lifelessyou had two restaurants you wanted to revisit01:28
lifelessso lets hunt down the second01:28
pooliewfm, i think you'll like it01:28
sidneiigc: that won't give you much other than fetching the dependencies though01:28
=== thumper is now known as thumper-fud
igcsidnei: and do you know how it packages python, qt and pyqt?01:28
sidneiigc: pyqt needs to be installed manually using the .exe installer into your global python interpreter, and so does a few other dependencies.01:29
igcsidnei: my xp partition is only a few G so I want to do as much work as I can elsewhere01:29
sidneiigc: and finally it uses py2exe which is basically black magic to me to pull all the dlls and dependent libs into library.zip01:30
igcsidnei: ah - so the qt stuff ends up in there?01:30
sidneiigc: i'm pretty confident that it does. haven't paid close attention.01:31
sidneiigc: the final step is just packaging it up with innosetup01:31
igcsidnei: and that's the bit I had planned to improve but ...01:31
igcit seems that's about 10% of the job01:31
sidneiigc: correct01:32
igcvs gathering everything, compiling it, etc.01:32
SamBjelmer: how come bzr-rebase is so outdated?01:32
igcsidnei: so adding more plugins basically comes down to editing the buildout.cfg file and build-installer.bat.in file right?01:33
sidneiigc: yes01:33
igcsidnei: I don't want to install cygwin. I have make installed. Does that sound ok?01:35
sidneiigc: yup, that's how i have it here01:35
sidneiigc: i actually install cygwin but don't use bash. i only put c:\cygwin\bin in %PATH%01:35
sidneiigc: i believe that a different way of achieving what you wanted would be to not use py2exe, but instead build a custom python install01:37
sidneiigc: i have code for doing that which we could possibly borrow01:37
sidneiigc: in fact, i think that would make things a lot easier for everyone including people building plugins01:38
igcbbiab01:38
sidneime too. *wink*01:39
jelmerSamB: outdated in what sense?01:40
jelmerSamB_XP: outdated in what sense?01:46
lifelesspoolie: so where should I meet thou?01:50
AfClifeless: ping? [personal]01:50
lifelessspm: procedure change:01:54
lifelessnew pqm branches need:01:55
lifeless - bzr-core set as reviewer01:55
lifeless - bzr-core subscribed to the branch01:55
lifelessbecause *reviewers are not notified*01:55
spmlifeless: oki; will add to docco. I assume the new branch we did last night needs this asap?01:56
lifelessdone it01:56
spmawesome, ta.01:56
lifelessfor 2.0 and bzr.dev01:56
lifelessonly cause I'm in bzr-core and can thus do it01:56
spm:-)01:56
spmso..... what I'm hearing is you've got the tools to do this yourself; therefore our update needs are minimised? :-P01:57
* spm looks forward in great anticipation to the response to that unsubtle troll01:58
poolielifeless: i guess here02:01
lifelesspoolie: ok, I'll drift your way02:02
lifelessjml: ^02:02
jmllifeless, I just got off the phone :)02:18
jmlpoolie, I'll probably be a little later than 1202:18
poolienp02:22
=== thumper-fud is now known as thumper
=== sidnei is now known as sidnei-away
moldybzr does not work directly over ssh, without a bzr server?02:58
spivmoldy: you can use sftp02:59
spivmoldy: but having bzr installed on the remote side and using bzr+ssh will be faster.03:00
moldyspiv: is it enough to have bzr installed, or do i need to have a server running?03:00
spivIt simply needs to be installed.03:01
moldyhm, does not seem to work for me03:01
spiv(And on PATH)03:01
moldywhich bzr versions are compatible?03:02
spivDoes "ssh yourhost bzr --version" work?03:02
moldyyes03:02
spivBasically all of them.03:02
spivWhat specifically does "not seem to work" mean?03:02
moldywell, i have 1.15.1 against 0.11.003:02
spivOh, ok.03:02
moldyServer does not understand Bazaar network protocol 3, reconnecting.  (Upgrade the server to avoid this.)03:03
spiv0.11 is pretty ancient, probably 1.15.1 won't work with that.03:03
moldyServer does not understand Bazaar network protocol 2, reconnecting.  (Upgrade the server to avoid this.)03:03
moldybzr: ERROR: Generic bzr smart protocol error: Server is not a Bazaar server: Received bad protocol version marker: "error\x01Generic bzr smart protocol error: bad request u'bzr request 2'\03:03
spiv0.11 was the very first version to have any sort of "bzr serve" support.03:03
spivAnd it was basically just a glorified sftp, you may as well just use sftp :)03:03
moldyunfortunately, sftp doesn't work either :)03:03
spivOh?03:03
spivThat's pretty weird.03:04
spivThe error message is correct though, that upgrading the bzr on the server would fix your problem.03:04
moldyi think i will look for a backport of a more recent bzr version to debian etch03:04
spivIt's very unusual for sftp not to work.  Is that an intentional server configuration I wonder?03:05
spiv(0.11 is almost 3 years old, btw)03:06
moldymight be that my local bzr is broken, sftp itself works03:06
spivWhat error do you get?03:06
moldyah, it seems to be related to the svn plugin03:07
moldyi'm not sure why it uses that plugin when trying sftp, though03:07
spivAh.  You can try "bzr --no-plugins ..."03:07
pooliehello spiv03:10
poolieigc, did you file a bug or talk to someone about packaging explorer on ubuntu?03:11
poolieit'd be nice to have it03:11
moldyspm: thanks for your help. with a recent bzr on the remote side, it works03:12
spivmoldy: great!03:12
spivpoolie: good afternoon03:12
poolieoh so it is03:13
pooliehow's stuff?03:13
spivWell, my local repo passed "bzr check" so now it's in the throes of upgrade --2a.03:13
xnoxCan I unshelve a change from branch a/ onto branch b/03:14
xnoxif it was shelved inside branch a/03:14
spivxnox: unshelve in a/ and then do "bzr merge --uncommitted ../a/" in b/ is probably simplest.03:14
spivOtherwise all I can think of is copying the .bzr/checkout/shelf directory.03:15
pooliewould be nice if you could03:16
spivpoolie: and I'm wondering what happened to my merge request yesterday, and wondering what the most painless way to resend it is when I'm in the middle of an upgrade...03:17
xnoxspiv: thanks03:18
thumperwhoever came up with merge --uncommitted was a genius03:18
igcpoolie: it was with james_w I believe - I can't recall raising a bug, only emailing03:22
igcthumper: yes, I use it a lot (and no it wasn't me)03:22
xnoxOne more questions =) I've started to use bzr-svn to push to an svn repo. Is there a way to remember push login & password?04:10
pooliexnox: in auth.conf i think?04:47
xnoxpoolie: ok thanks I'll look into that04:48
SamB... is there a way to commit in the style of "darcs record", which has a slightly better interface than "bzr shelve" to select what to inclue in the patch?05:13
S11001001SamB: interactive plugin05:13
SamBwhy does searchiong for "bzr darcs commit" (sans quotes) not seem to help me find that?05:14
S11001001branch http://bazaar.launchpad.net/~asabil/bzr-interactive/trunk as interactive into your plugins directory05:14
SamBS11001001: I know how to install a plugin05:14
S11001001just in case :)05:14
SamBand if I was having trouble finding it now that you told me the name, I would have asked ;-)05:14
* igc lunch05:16
S11001001take care, because it doesn't work in dumb terminals (like emacs shell)05:16
SamBthat's fine05:17
SamBI wasn't really going to use it there05:17
SamBand I don't think darcs really likes that either ;-)05:17
S11001001I have used it for some time now with darcs just fine05:17
S11001001also, the hunk finder is more eager in bzr-interactive05:17
S11001001whereas I think if hunks are separated by 1 line of context in darcs they will be treated separately, this is not so in interactive05:18
SamBoh, really?05:18
SamBdoesn't the red highlighting confuse emacs?05:18
SamBS11001001: hmm, I don't remember darcs being that smart05:18
S11001001what highlighting?05:18
SamBwell, usually of either things that darcs didn't get (non-ascii bytes) or a $ to mark the end of a line with trailing whitespace05:19
SamB(instead of the actual byte, it prints a red escape sequence)05:19
S11001001hmm, possibly I've never recorded any such things05:20
SamB(really annoying when you're writing programs using UTF-8 operators!)05:20
SamBwell, I guess it would at worst look just slightly more horrible and less eyecatching than in a real terminal ;-)05:21
SamB... and of course you can always use the Emacs terminal *emulator*05:21
S11001001icky, I like moving around my shell history like a text buffer05:21
SamBit can't do that?05:21
SamBaww :-(05:21
SamBwell, I guess you'd have to switch modes first if it could05:22
SamBI mean, toggle something05:22
SamBto change the key bindings05:22
SamBso that they wouldn't go to the app05:22
spivLess than 500 revisions left to upgrade.  Oof.05:25
* SamB wonders how to get emacs to describe a keymap in an intelligable manner -- wishes it had more types :-(05:26
SamBS11001001: hmm, needs abit of work ...05:29
S11001001the developer is open to bundles :)05:30
SamBis it you?05:30
SamBanyway, was just pondering it ;-)05:30
S11001001not at all, I merely contributed -F support05:30
SamBah05:31
SamBwhat's that for?05:31
S11001001it's supported by built-in commit, just was broken in the wrapper commit that interactive provides05:32
SamBah05:32
SamBis that the one that takes the commit message from a file?05:32
S11001001I name my log files ++log in honor of arch05:32
SamByou ... honor ... arch ?!?  :-(05:33
S11001001I liked arch, kept using it until about the time bazaar-ng 1.5 was released05:34
spivS11001001: and you call temp files ,,foo? :)05:36
SamBI can't like arch05:36
S11001001just 1 , actually05:36
SamBit has too many damn pointless concepts!05:36
spivHeh.05:36
S11001001, is garbage that tla promises not to delete05:36
SamBor, at least, too many damn pointless components in a name05:36
spivS11001001: <gollum>my precioussss</gollum>05:37
S11001001well I don't name my log files ++log instead of ++log.myproject--mainline--0.1.scompall@nocandysw.com--2009-ddi for nothing05:37
SamBI guess the thing is that I never tried arch until I was already hooked on darcs for the time being05:41
SamBnow I'm not so much hooked on darcs, but still use it as one of my VCS yardsticks05:41
S11001001I don't think darcs existed back in 200405:42
SamBnot sure05:43
SamBI don't remember exactly when #haskell got me hooked05:43
S11001001hmm, actually it seems to have, but I didn't hear about it until 2007 anyway05:43
SamByeah, I was pretty sure it was older than that ;-)05:44
S11001001it was the community standard for common lisp projects until recently05:44
SamBdarcs?05:47
SamBor arch?05:47
S11001001darcs05:48
SamBdid they start using git too or something?05:49
SamBor git, bzr. & hg too?05:49
SamBoops, s/./,/05:49
S11001001git, hg, and svn have all insinuated themselves05:49
SamBwhat the?05:49
SamBwhy svn?05:49
SamB... is it because of google code?05:49
S11001001bknr.net svn is the new host for Edi Weitz's popular libraries, and clozure (an implementation increasing in popularity) also uses svn for source and binary distribution05:50
SamBoh, is clozure JVM-based?05:50
S11001001you're thinking of clojure :)05:50
SamBoh.05:50
SamBokay.05:50
SamBI was just trying to find an excuse for brain-deadedness05:51
SamBhmm ... how would I use emacs to search for a line that has $(HIDE) on it and isn't immediately preceded by one with $(SHOW) in it?05:51
S11001001Clozure was once OpenMCL, but MCL went and changed its license, and Clozure added GNU/Linux and Windows support, then x64 and x8605:52
S11001001surprisingly, porting to platforms other than OS X/PPC was a surefire way to increase popularity05:53
SamBno duh05:53
SamBespecially with the PPC macs being discontinued05:54
SamBhmm, so they ... added support for PPC Windows before support for x86 anything?05:54
SamBwas there even an MS Windows for PPC?05:55
S11001001it's a little weird, they added linux/x64, then windows/x64, then similarly for the x8605:55
S11001001IIRC, porting to the register-starved x86 was harder than amd64 support05:56
mneptokSamB: yes05:56
SamB... I mean, I know arty in #reactos was working on porting that to PPC, but I forgot about whether there was an MS predecessor ;-)05:56
mneptokSamB: NT 3.5 was released for PPC. there may have been others.05:56
mneptokanyhow, such discussions are not really on-topic for #bzr05:57
SamBmneptok: yeah, but, was anyone asking a bzr question?05:58
SamBoh, I've got one!05:58
mneptokSamB: that's not really the point.05:58
SamBdoes bzr work on NT 3.5 PPC?05:58
mneptokSamB: walk into a police station at 3am and do a striptease. when they tell you that it's not a strip club, ask "well, was anyone being arrested?!"05:59
SamBmneptok: that's a bit different05:59
SamBI think they'd be arresting you for indecent exposure05:59
mneptokSamB: so please don't risk the same here.06:00
SamBor because they didn't want to see your dick06:00
mneptokSamB: such language *definitely* is not welcome in #bzr06:01
SamBoh, sorry.06:01
SamBshould I have said "penis"?06:01
mneptokyou should probably keep your mouth shut and be thought a fool, rather than open it and remove all doubt.06:02
SamBfine, fine, #haskell-blah, here I come ...06:04
SamBI should be fine there as long as I remember not to talk about Haskell ;-)06:04
spivjml: regarding your comment about the puller from about 7:30pm yesterday: bug #42413606:24
ubottuLaunchpad bug 424136 in launchpad-code "Cannot upgrade stacked branches from 1.9 to 2a on Launchpad" [High,Confirmed] https://launchpad.net/bugs/42413606:24
jmloh yes?06:24
spivjml: the problem appears to be that the assumption that "Branch.open" succeeds in tha face of rich-root mismatch in stacked-on/stackee is wrong.06:25
* jml tries to parse that for the third time06:25
spivjml: stacked-on: just changed from 1.9->2a06:25
spivjml: my branch: just changed from 1.9->2a the hosted area, still 1.9 in the mirrored area06:26
spivjml: puller: tries Branch.open(mirrored-my-branch), fails because 1.9 can't stack on 2a because 1.9 and 2a have different rich-root support.06:27
spivjml: puller therefore gives an error rather than propagating the upgrade that would fix the error.06:27
jmlspiv, I see.06:27
jmlspiv, so we ought to catch those errors and upgrade as if we detected a format change?06:28
spivjml: or open in a way that doesn't fail if stacking won't work.06:28
jmlspiv, you're bringing back bad memories06:28
jmlspiv, is that even possible?06:28
spive.g. BzrDir.open(...).open_repository()06:28
jmlhmm06:28
spiv(because stacking is configured by the branch)06:29
spivOr perhaps BzrDir.open(...).open_branch(ignore_fallbacks=True).06:29
jmlperhaps.06:29
spivOr potentially just catch the relevant exception.06:29
jmlcatching the exception seems like the most robust to me.06:29
spivbzrlib.errors.IncompatibleRepositories I believe.06:30
spivWell, not making inspecting the format of object A dependent on details like "A's config says stack on B, but B is not compatible" seems more robust to me :)06:31
jmlspiv, yeah, fix bzr06:31
jmlspiv, in the meantime the integration team will integrate :)06:32
spivBut I can understand that having a separate "check formats" and "now open it for actual use" phases might be awkward in your code.06:32
jmlspiv, we already do something like that... icbw06:32
spivbzr is working fine: it's refusing to do Branch.open because it can't be opened.06:32
* jml actually dials up the code06:33
spivThe problem is your code says "give me a full branch object with fallbacks and everything" when (at this point) it just wants "give me the branch and repository formats"06:33
jmland what's the bzr API for that?06:34
mwhudsonpretty sure there isn't one, or at least wasn't back when we wrote this06:35
spivthe_bzrdir.find_branch_format() / RepositoryFormat.find_format(the_bzrdir)06:37
spivOr I suppose you could use BranchFormat.find_format(the_bzrdir) for consistency.06:38
mtaylorlifeless: I find the motu process/system quite frustrating06:49
mtaylorlifeless: not that you can do anything about it - I'm just complaining :)06:50
jmlspiv, how do they interact with RemoteRepository06:55
jmlet al06:55
spivjml: IIRC you'd probably get back a RemoteRepository, still.07:00
spivjml: anyway, catching IncompatibleRepositories would work fine for this case, and would probably be the most minimal change.07:01
spivI don't really mind what you do so long as it works ;)07:01
igcspiv: can I request a 30 second review ...07:08
igcspiv: https://code.edge.launchpad.net/~ian-clatworthy/bzr/422533/+merge/1097607:08
bialixhello igc07:09
vilahi all07:13
spivigc: heh07:13
spivigc: 30 seconds was perhaps pessimistic :)07:14
vilaigc: Can I request a 30 secs test for that one-liner since you obviously found a hole in the coverage ? :)07:14
vilaigc: at least don't close the bug until you had that test...07:15
igcvila: it's a formatting issue of very low priority - I don't feel a test is necessary sorry07:17
vilait's untested code for which you had the test almost written since you encounter it, anybody else will spend more time on it07:19
spivvila: I don't think a test is worth it.07:20
spivIt would be a test for the contents an error string; it's unlikely to regress, but adding a test would likely add needless friction if anyone *does* tweak the wording.07:22
spivIt's a different case I feel to what we test in test_errors (which are generally worthwhile tests).07:24
vilaA test about an invalid property value is not worth it ?07:30
vilaright, I'm still dreaming, let's reboot07:30
vilahi all, have a good day07:30
igcvila: w.r.t. bzr-upload, what version should I include in the Windows installer?07:30
igcvila: and in terms of help for it, all you need to do is ...07:30
igcadd whatever text makes sense to the module docstring07:31
igcand the plugin guide generator will find it07:31
vilaigc: thanks ! Time to move the README there07:31
igcvila: the Plugin Guide has one chapter per plugin07:31
igcthe first section for each is the plugin help, then one section per command provided by the plugin07:32
vilaigc: I intend to release 1.0 before bzr-2.0 so I'd like to have 1.0 there07:32
igcvila: if required, I guess plugins could have extra help topics, e.g. upload-tips07:33
igcvila: but if they do, I don't currently go looking for them ..,07:33
igcand I'm not sure how hard or otherwise it would be07:33
vilamodule doc string if perfect07:33
vilaat least to address the problem of giving more exposure to the doc :)07:34
igcso for now, it's in the plugin top-level help or it's in help on a plugin command (or it doesn't make it into the Plugin Guide)07:34
=== vila is now known as vila-dentist
=== abentley1 is now known as abentley
lifelessmtaylor: tell me more later :)08:20
mtaylorlifeless: I will :)08:21
jmlConflict: can't delete lib/lazr because it is not empty.  Not deleting.08:22
jml1 conflicts encountered.08:22
jmlrm -rf lib/lazr08:22
jmlbzr resolve lib/lazr08:22
jml(guess how many times I've had to do that this week!)08:22
lifelesspoolie: I've done the bug status tweak I was mentioning earlier :)08:25
* lifeless waves ciao08:25
jmllifeless, ciao08:25
=== vila-dentist is now known as vila
* quicksilver tries running bzr pull over GPRS. should be fun.08:43
* quicksilver reflects that bzr+ssh would have been a better choice for a high latency link.08:44
NET||abusehey guys, trying to use the upload command here,,08:58
NET||abusethe documentation is a little vague,08:58
NET||abusehowever i've done bzr help upload.08:58
vilaNET||abuse: did you read the README ?08:58
NET||abusenow what do i do to point it at a location?08:58
NET||abuseoh, it's in bzr by default on jaunty it looks like.08:58
NET||abusedidn't load the plugin files into my ~/.bazzar08:58
* igc dinner09:01
vilaNET||abuse: http://paste.ubuntu.com/264826/09:02
NET||abusevila, yeh, i pulled down the source into my projects folder, have a copy of it now and am reading the README09:03
NET||abusemuch appreciated,09:03
NET||abusejust trying to figure out,09:03
NET||abusehow do i upload a subdirectory of the main branch?09:03
NET||abusei have other configurations for local testing and things in directories here, so i was just going to upload parts09:04
NET||abuseand i have an extra directory layer that isn't on the live server09:04
vilaNET||abuse: You can't do that yet09:04
NET||abusemeans i should be able to just upload the src/server directory, it holds my www application system and etc directories.09:05
NET||abusearrg09:05
vilaYou can only upload a full branch working tree09:05
NET||abusethat's annoying.09:05
NET||abusethat's pretty much useless then.09:05
NET||abusejust have to do big scp transfers then09:05
vilathere are various ways to address it, none available yet09:05
NET||abuseoverwriting the whole site09:05
vilaone way is to create a dedicated branch as a fork of your trunk and delete all unwanted stuff there09:06
vilayou can then merge in that reduced branch and upload that09:06
vilaNET||abuse: filing a bug report explaining your use case can only help defining the feature09:08
vilaNET||abuse: or add your case description in bug #21267709:09
ubottuLaunchpad bug 212677 in bzr-upload "Should allow uploading specific files" [High,Confirmed] https://launchpad.net/bugs/21267709:09
NET||abusevila, ok, i'll add some description to that bug, bookmarked it.09:12
vilapoolie, lifeless, spiv, igc: data point: I upgradeb ~200 branches in a shared repo over NFS without trouble (~400MB of data processed there)09:20
vilaupgraded even09:20
vilafunnily enough, the first 'bzr info' after that whined about a NFS stale on a FoRmAt file, once and never again :)09:21
pooliehello vila09:29
poolievila, i wonder if they had a flaky network card or switch or something09:29
vilasomething weirder than that since the file disappear after several days, NFS is excluded as cause (IMHO)09:30
Lo-lan-doHi all10:05
Lo-lan-doIs anyone in particular linked to Loggerhead?10:06
Lo-lan-doI guess it's jelmer again :-)10:07
Lo-lan-dojelmer: Any plans on uploading a recent Loggerhead to Debian?10:09
poolieLo-lan-do: or mwh, but he's not a dd10:11
Lo-lan-doI'm going to need it for a client. I can do the required work (updating the packages and providing backports for Lenny) if needed, I'd just like to know in advance so it doesn't come as a surprise to them when I bill for my time.10:11
Lo-lan-doThis could be said to be an offer for help, but I don't want to step on anyone's toes.10:12
jelmerLo-lan-do: Hi!10:21
jelmerLo-lan-do: You're more than welcome to help out with the loggerhead packaging10:22
jmlg'night poolie10:22
poolienight!10:22
jelmerLo-lan-do: I was going to update your patch to fix the use of libyui-js, but have been away since debconf9 so haven't had much time for that10:22
poolienothing like a good night's sleep :)10:25
jelmer(-:10:25
james_wI put the latest loggerhead release in karmic the other day10:29
james_wit's on bzr.debian.org10:29
jelmerah, great10:33
AfCHas there been a 2.0-rc2 release as yet?10:35
* AfC is scared about the upgrade bug, and 2.0-rc1 is what Gentoo is shipping as ~arch right now10:35
vilaAfC: not yet10:38
lukswhy do they ship release candidates?10:53
AfCluks: they never used to package Bazaar's rc's, but I guess someone was listening to the fact that the lead up to 2.0 is a bit different.10:57
AfCAfter all, we want people testing.10:58
luksyeah, but making ever Gentoo user a tester is probably not such a good idea :)11:01
luks+y11:02
jelmerjames_w: did you manage to keep the yui stuff in loggerhead working?11:09
james_wwas the patch not complete?11:10
jelmerjames_w: it was complete but last time I attempted to merge a new upstream I had trouble keeping the yui-js patch applied and loggerhead working11:12
james_whmm11:15
james_wthere were no conflicts, but I don't understand why11:15
lifelessigc: something going south on this import :(11:38
lifeless10:10:27 64000/133780 commits processed at 263/minute (:64000)11:38
lifeless11:19:34 65000/133780 commits processed at 208/minute (:65000)11:38
lifelessstill working on the next 100011:38
lifeless 4847 robertc   20   0 6153m 4.8g 1208 D    0 83.8 375:11.54 python11:38
lifeless   PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND11:38
=== wgrant_ is now known as wgrant
vilabialix, bialix, where are you :-/12:05
vilanaoki: ping12:06
vilanaoki: You're the one I need ! revno 171 broke the test farm installer build12:06
vilanaoki: revno 171 of tortoisebzr I meant12:07
vilanaoki: http://paste.ubuntu.com/264900/12:07
Lo-lan-dojelmer: Okay, thanks.  I'll keep in touch however things work out.12:25
jelmerhmm, bzr-stats seems to think that lifeless, jam, igc and vila are the same person12:54
vilajelmer: hehe, I mentioned that some weeks ago :)12:56
vilaI don't know when it occured, I wonder if --authors may have tricked it but that should have occurred months ago when we landed bbc12:57
Lo-lan-doIt's all a cabal anyway.12:58
vilajelmer: Where did you run it ?12:58
jelmervila: bzr.dev13:02
vilawow, just ran it on an upgraded bzr.dev, snappy :)13:03
vilajelmer: so, that's really weird becase jam and vila survive but steal from each other anyway :D13:04
vilalifeless and igc disappear completely though, shame13:04
vilagiven only those four are involved, I'd say --author tricked bzr-stats, 90% sure :)13:05
jelmerI'll have a look at it when I find some time13:08
jelmerYeah, 2a is teh awesome13:08
jelmerI know I'm repeating myself, but I'm really looking forward to 2.0 !13:09
vila:)13:09
jelmerlifeless: how would a test have multiple statusses?13:18
bialixvila: are you summon me up?13:19
vilawow, magic bialix ! How did you know ? 8-)13:20
vilaI wanted to tell you to tell naoki about: http://paste.ubuntu.com/264900/, but I'm sure you already know that, did it, and I've just to pull tbzr again for the fix...13:21
mortehuI get this on commit: bzr: ERROR: Cannot commit to branch BzrBranch6('file:///me/app/'). It is bound to BzrBranch6('file:///other/app/'), which is bound to file:///other/app/.13:23
vilamortehu: no more than one level of binding13:23
mortehuI see.  I'll have to read up on how this works.13:24
bialixvila: ?13:24
vilabialix: yes ?13:25
vilabialix: I wanted to tell you to tell naoki about: http://paste.ubuntu.com/264900/, but I'm sure you already know that, did it, and I've just to pull tbzr again for the fix...13:25
bialixI don't understand13:25
bialixhttps://bugs.launchpad.net/tortoisebzr/13:25
bialixyou need this I guess13:25
vilak13:26
mortehuvila: You did notice that the last two paths in the error message were identical?13:27
vilamortehu: no13:27
vilathat;s weird13:27
=== cprov-afk is now known as cprov
bialixvila: naoki said something about removing some dependencies from tbzr build so he can build with other compiler or sdk13:30
bialixvila: so maybe there is difference in build environment between him and your slave13:30
vilaI filed a bug13:30
vilabu g#42430313:31
vilabug #42430313:31
ubottuLaunchpad bug 424303 in tortoisebzr "fix for #421890 broke the automated installer build" [Undecided,New] https://launchpad.net/bugs/42430313:31
bialixok13:33
vilamortehu: what is your setup ? Can you issue 'bzr info' in each branch involved /13:35
vila?13:35
mortehuCheckout (format: pack-0.92) Location: branch root13:36
vilamortehu: don't spam the channel, use a paste service instead and copy the whole output13:37
mortehuThat was the whole output.13:37
vila>-/13:38
vilabzr version13:38
mortehu1.513:38
vilaouch, what os are you using ?13:38
mortehuIt's some other dude's repository (I normally use something else).  He went to sleep. :)13:38
mortehuDebian13:39
vila1.5 is... more than year old... but I'm surprised we can't get more info... try 'bzr info -v' ?13:40
mortehuI'll just put the files in his working copy and have him commit in the morning.13:40
mortehuThanks for your time, by the way.13:41
vilammmm, branch6... did we even support that in 1.5 ?13:41
vilayes we did13:42
mthaddonnot sure if anyone's around who can help here, but I'm testing the upgrade of the bzr PQM instance and running into problems because the existing format is pack-0.92 but current lp:pqm is 1.14-rich-root or 1.9-rich-root - can I convert the current branch to the right format?14:51
jelmermthaddon: I think so14:54
jelmermthaddon: At least, can't think of any reason why that would be a bad idea14:54
mthaddonjelmer: so how would I do that? bzr upgrade --1.14-rich-root ?14:55
jelmermthaddon: yep14:55
* mthaddon gives it a go14:56
mthaddonjelmer: cool, worked a treat, thx14:56
jamjelmer: that would be a rather prolific person, then14:59
jamjelmer: Unittest doesn't declare that you can't call both addError and addSuccess from the same test15:00
jamI've seen it getting a successful run, and then an error during cleanup15:00
jamor even 2 errors :)15:00
jammorning vila15:00
vilamorning jam15:01
Kobazbzr: ERROR: Server sent an unexpected error: ('error', "An attempt to access a url outside the server jail was         made: 'chroot-163675084:///project/base/'.")15:26
Kobazi upgraded bzr on my server and now i get that15:26
Kobazi'm using bzr+https://15:26
Kobazwith the bzr-smart thingee15:26
jelmerdid the submit branch for bzr change recently?15:34
jamKobaz: known bug, I'll try to track it down for you15:34
jamjelmer: yes15:34
jamit is now on LP15:34
Kobazjam: yeah i found the bug, it poped up in 1.1615:35
jelmerShould I just be using lp:bzr?15:35
jamhttp://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev15:35
jelmerjam: thanks!15:35
Kobazsupposidly was fixed in 1.1715:35
Kobazbut it's still happening in 1.1715:35
Kobazhttps://bugs.launchpad.net/bzr/+bug/40053515:35
ubottuLaunchpad bug 400535 in bzr "ChrootServer/ChrootTransport not used by "bzr serve"" [Critical,Fix released]15:35
Kobazlooks like a regression15:35
jamKobaz: actually 34830815:35
jambug 34830815:35
ubottuLaunchpad bug 348308 in bzr "Smart server jail breaks bzr+http with shared repos" [High,Triaged] https://launchpad.net/bugs/34830815:35
jamthere is a workaround in that bug report15:35
Kobazhm15:37
Kobazis there anything obviously bad about using the workaround?15:38
Kobazor should i stick with what i've been using: 1.1315:38
jamKobaz: generally I would recommend newer bzr's for a variety of reasons15:39
jamI don't think the workaround is that bad15:39
jamwe really need to get something like that into a real fix15:39
Kobazwhat's major between 1.13 and 1.17?15:40
jamKobaz: significantly better streaming + stacking support, support for the 2a format repository which is the default in 2.0 (to be released in the next week or two)15:41
jamI can point you to NEWS if you want details15:41
Kobazk sure15:42
Kobazhmm15:42
jamKobaz: http://doc.bazaar-vcs.org/bzr.dev/en/release-notes/NEWS.html15:43
Kobazokay, the workaround appears to be working15:43
rockstarjam, hi15:44
jamhey rockstar15:44
rockstarjam, I seem to have a brokenness in my tarmac trunk that is preventing me from merging a branch.15:44
rockstar(I originally thought it was a tarmac bug, but bzr reports the same error, hiding the spectacular traceback)15:45
rockstarjam, pastebin -> https://pastebin.canonical.com/21836/15:46
rockstarShoot, that probably should have gone to p.u.c15:46
jamrockstar: we use p.c.c fairly often here15:46
* rockstar is still getting used to working on Free Software every day.15:47
jamrockstar: so I *think* that xml 5 is non-rich-root15:48
jamwhich means it shouldn't be existing in your rich-root format repo15:49
jamtrying to do 'bzr pull' I'm getting the same error15:49
rockstarjam, target branch for merge is 2a15:49
rockstarjam, also, it's possible that your branch is pre-upgrade, so pulling in gets the same error.15:50
jamthat isn't what I see here: https://code.edge.launchpad.net/~rockstar/tarmac/main15:50
rockstarjam, chk inventories == 2a, right?15:50
jamrockstar: yes15:50
rockstarabentley, ^^15:50
jamah...15:50
jamDevelopment repository format15:51
jamwhich would be... --dev6 or so15:51
jamcertainly something weird going on...15:51
jamI wonder if you merged a broken bundle but had it successfully merge15:51
rockstarHow do I find that out?15:52
abentleyrockstar: looking...15:52
jamrockstar: I'm trying to lftp mirror it to check15:52
rockstarabentley, for background, it looks like tarmac trunk is broken.15:52
jamalso, there should be 0 xml inventories in chk inventory land15:52
rockstarjam, I thought I remembered you talking about that at AllHands.15:53
jamrockstar: downloading now15:54
abentleyjam: if you need an exact mirror, you can use "hitchhiker mirror . $LOCAL_PATH"15:55
jamabentley: thanks15:56
jamso... once I did the mirror using lftp, it doesn't seem broken on this end... :(15:56
jamhm... I wonder about bzr 1.17 on lp versus bzr.dev locally15:56
jamah, or cross-format issues15:57
jamchecking a few things15:57
jamrockstar: so your trunk is in --dev6-rich-root and not --2a15:58
jamwhich might be a problm15:58
jamI'm guessing bzr 1.17 is trying to send the revisions using the generic streaming code15:58
jamwhich was broken until recently fixed (prob bzr 1.18 required)15:58
rockstarHm, how'd that happen?  I specified --2a on the upgrade.15:58
jamrockstar: bzr info sftp://bazaar.launchpad.net/~rockstar/tarmac/main/15:58
jamRepository branch (format: development6-rich-root)15:59
rockstar:/15:59
jamso 1.17 is probably trying to cross-format stream by casting to XML inventories, and newer bzr's don't like it15:59
jamand they shouldn't, because xml5 wasn't actually compatible with --dev6, we just didn't realize it in time15:59
jamrockstar: can you do a similar 'bzr info' check?16:00
jamI'm wondering about a problem between the hosted side16:00
jamand the mirrored side16:00
jamas I'm pretty sure *my* sftp access gives me the mirror16:00
rockstarrepository: Development repository format - rich roots, group compression and chk inventories16:00
jamrockstar: that would be --dev616:00
jamso my suggesstion...16:00
jam'bzr upgrade --2a'16:00
jampossibly prefixed with16:01
jamhitchhiker lp:tarmac rmtree backup.bzr16:01
rockstarAlso, if I upgrade my branch locally, and push, the pushed version won't get upgraded, so I need to rmtree .bzr as well, right?16:02
jamrockstar: when you push, we preserve16:02
jamI was actually meaning "bzr upgrade --2a lp:tarmac"16:03
jamso upgrade the remote16:03
jambut yeah, you could do it the other way as well16:03
jambzr push --use-existing, etc.16:03
rockstarOkay, great.16:03
nealmcbSometimes I clone an individual file in a project and then it evolves on its own.  is there any way to track that in bzr?16:05
nealmcbe.g. so I could go to the clone, ask for a history, and find out that earlier history was in the file it was cloned from?16:06
rockstarnealmcb, how are you cloning the individual file?16:08
awilkinsnealmcb: No, Bazaar has no model for copying files as yet16:08
nealmcbrockstar: now I 'clone it' with cp....16:08
nealmcbawilkins: do you know of others that do?16:08
nealmcbnot a big deal, but I like meta information :)16:09
awilkinsSubversion will let you do it. I don't know about Mercurial or git, but I suspect git might by dint of the way it works internally16:09
lukssvn does :)16:09
nealmcbthanks16:10
rockstarjam, I just did an upgrade and a fresh branch, and I still get: Development repository format - rich roots, group compression and chk inventories16:14
michaelforrestbzr: ERROR: exceptions.AttributeError: 'module' object has no attribute 'ProgressBarStack'16:14
rockstarjam, this is a new shared repo as well, created with bzr init-repo --2a16:15
vilajam: hurrah ! #412930 approved :-D16:15
vilamichaelforrest: out-of-date bzr-gtk plugin ?16:15
bialixvila: oho16:15
jamrockstar: unfortunately it looks like RepositoryFormat2a doesn't have its own get_format_string16:15
rockstarjam, but it merges this time...  O_o16:15
jamso it is re-using the old one16:16
rockstarjam, is that a bug?16:16
bialixvila: can you kick the build of tbzr as of revno.171?16:16
jamsorry, it is get_format_description( that we need16:16
jamanyway, yeah, I'm reporting it as a bug16:16
jamshould be easy to fix16:16
vilabialix: kicked16:16
bialixvila: I think revno.172 introduced that problem with build16:16
vilaha 171, no, I don't have that level of detail, I thought it wsa a new revision, sorry16:17
michaelforresthurray! thanks vila.16:17
vilaI used qlog and searched for the last revision that modified the file and got the revision I indicated16:18
bialixvila: in revno 172 naoki removed definition of ARGB typedef, I think this is root of problem16:19
vilabialix: ohh, I see what you mean,16:19
vilaI just run qlog again16:19
vilabialix: I think you're right but the way the build works today, I can only use the tip of the branch16:20
bialixwell, I'm not sure it will be good idea to commit there just to check this idea16:21
vilalet's wait for naoki input then16:21
bialixvila: oki16:23
bialixwhat is "square dancing"?16:24
bialixemmajane: ^16:24
vilabialix: not sure, I think it north american folk dance :)16:24
vilabialix: not sure, I think it's a north american folk dance :)16:25
emmajanevila, aye :)16:25
emmajanebialix, google for "square dance tutorials" :)16:25
vilaemmajane: clicking images for that search gives.... suprising results :)16:26
emmajanevila, lots of poofy skirts?16:26
vilanot exactly... nothing wrong either, just not really related16:28
emmajaneheh16:28
emmajanemaybe google.ca gives different results.16:28
bialixnot sure about google results.16:29
bialixit's a dancing on the streets?16:29
=== deryck is now known as deryck[lunch]
abentleybialix: The "square" means that people are arranged in a square, facing each other.  It doesn't refer to city squares.16:30
emmajanebialix, did you look at the slides?16:30
vilaargh, grrr, google.fr ! I hate that, how many times should I bang google on the head so that it understand I want google.com and nothing else *by default*. I can go to localized version when *I* want thank you very much16:30
emmajanebialix, there are actually pictures and links in the slides.16:30
bialixwhich slides?16:30
emmajanebialix, that I dented16:30
emmajanebialix, I assume that's what you're referring to?16:30
bialixI'm not sure16:31
awilkinsBah, being back at work sucks16:31
vilaawilkins: go back to vacations16:31
awilkinsJust got my reminder to do my pointless weekly blog16:31
bialixok, nm16:31
awilkinsMy manager wants me to set up 15 user profiles that take 10 minutes each and I'll also have to badger people for their passwords to do it. Which is silly.16:32
awilkinsAnd now i'll stop whining16:32
=== sdboyer_ is now known as sdboyer
* emmajane blinks.16:33
jamawilkins: script it :)16:38
jammake sure the script includes a poorly written email asking users for their passwords16:39
vilajam: ROTFL16:39
awilkinsjam: It's a fricking GUI :-(  I have the sources :-)  They are horrible :-(16:39
vilago directly to jail don't get the 20.000 FF :)16:39
awilkinsFreedom Fries? I'd be one FF if I ate 20,000 Freedom Fries :-p16:40
Lo-lan-doFusionForge!16:41
vilaawilkins: close but no cigar :) Very close: French Francs, I didn't play monopoly since more than... the time we switch to Euro :)16:41
Lo-lan-do(Note that FusionForge now supports Bazaar, although the pluginisn't quite complete yet)16:42
* awilkins knew it was French Francs, which is why the joke about Freedom Fries was funny. ish.16:42
Lo-lan-do(But it will be soonish, see above for my reasons)16:42
jelmerLo-lan-do: w00t!16:42
jelmerLo-lan-do: Any idea when that sort of stuff would end up on alioth?16:42
Lo-lan-dojelmer: It's *already* on alioth :-)16:43
vilaawilkins: I thought you were british and that the fries joke was north-american only :)16:43
Lo-lan-doBut the incompleteness shows: no commit stats and no Loggerhead.16:43
awilkinsI am British, but we hear enough of the American news to know the phrase "Cheese-eating Surrender Monkey"16:44
Lo-lan-doI recently completed/fixed the git plugin for another customer. bzr is next.16:44
vilaNever went to war myself, I can speak about the surrender part, but I like cheese and I'm a monkey :)16:45
* Lo-lan-do fills up the Channel Tunnel16:45
awilkinsThere's a bloke who wants to open a British restaurant in Italy... partly to show case our cheeses (which are different, but good too)16:45
vilabritish cheese ? I thought you eat only dutch cheese :D16:46
awilkinsvila: Edam is like plastic16:46
Lo-lan-doIf I ever go on a month-long tour of Europe, I'll be sure to taste stuff besides the typical.16:46
vilalet's start some european civil war to start the week-end :D16:46
awilkinsvila: We have some of the greats, like cheddar, stilton, stinking bishop16:47
awilkinsI do like Jarlsberg16:47
Lo-lan-doEnglish cheese, German wine, Greek beer, and so on.16:47
awilkinsI was shocked to find myself liking _Amercian_ beer16:48
awilkinsBut only the local stuff from microbreweries16:48
vila..and counting ? I went to visit some friend last week-end and he said: "See, we do some wine and some cheese here", to which I replied: "Funny, nearly every french can say that, whaterver region they are from, they do some local wine and cheese !" :-D16:48
Lo-lan-doThe only beer I managed to like is (kill me now) Kriek.16:48
vilaLo-lan-do: Belge une fois ?16:49
Lo-lan-doI am not!16:49
awilkinsI like kriek. And framboise16:50
vilaNo offence meant :)16:50
* Lo-lan-do is a garlic-stinking, pastis-drinking, smelly-cheese-eating Frenchman16:50
Lo-lan-doNo moustache though, sorry.  It itches.16:50
tbradshawhmmm16:57
tbradshawso I'm getting a bzr error on the creation of a fresh local repo?16:57
luksare you?16:57
tbradshawindeed, but it seems so unlikely. :/16:58
tbradshawhttp://pastebin.projects.quakecon.org/6716:58
luksyou are misunderstanding bzr concepts16:59
lukshttp://doc.bazaar-vcs.org/latest/en/user-guide/index.html#core-concepts16:59
tbradshawwhat am I misunderstanding?17:00
tbradshawis it just that "status" doesn't operate on a repostory?17:00
luksyes17:00
tbradshawwhich would make sense, of course, but I wouldn't expect an error in that case17:00
lukswhy not?17:00
luksit's like running "cat" on a directory17:01
tbradshawbecause a command with unfulfilled prerequisites shouldn't execute?17:01
luksit doesn't, and it tells you why17:01
tbradshawcat on a directory gives a very reasonable response. :)17:01
tbradshawbut, anyway, I don't mean to get into a critique on software behavior17:02
tbradshawI'm satisfied knowing that bzr doesn't work on repositories and I was just misusing it17:02
luksbzr st tells you that there is no working tree17:02
luksso it can't operate17:02
tbradshawindeed17:02
tbradshawthe curiousity was that it gives an error on an nonexistent directory17:03
tbradshawwhich lead me to believe an error during construction, rather than a simple misuse17:03
tbradshawbut, that's okay, it's still just a user error. :D17:03
luksthat's where it would expect the working tree to be defined17:03
luksI agree the error message should be nicer17:03
luksif you want to "work" with bzr, you need to create a branch17:04
tbradshawthanks for pointing out the difference, however.17:04
lukswhich is done using: bzr init17:04
luksbzr init-repo just creates a container for revisions17:04
tbradshawyes, my intention was to create a local repository, such that I could store some related branches17:04
tbradshawI had just been using bzr status liberally as a "sanity check"17:04
luksyep, then you need bzr init inside that directory17:04
luksyou can run bzr info as a sanity check17:05
tbradshawand so when my "sanity check" failed, I ran for help17:05
tbradshawah!17:05
luksit will tell you what is in the current directory17:05
luksbut status is strictly a working tree operation17:05
tbradshawso I should also bzr init?  Or would I go right to branching?17:05
tbradshawmy hope is to set up my local repository17:05
tbradshawsuch that I have ./trunk17:06
tbradshawand ./username/branches17:06
luksif you already have a branch somewhere, you can use bzr branch17:06
tbradshawif that sounds reasonable17:06
luksI thought you are creating a new project17:06
tbradshawno sir, launchpad stuff17:06
tbradshawI just haven't done the local repository before17:06
luksah, bzr branch is it then17:06
tbradshawis it necessary for additional branches to be directly in the local repository?17:07
tbradshawor can the local repository have some directory structure of it's own?17:07
tbradshawala, is it okay to mkdir branches, then branch other things from launchpad into that directory?17:08
luksno, you can have subdirectories there17:08
luksbzr will look for the repository in all parent directories until it finds one17:08
Lo-lan-doYou can have branches separately.  Read about "lightweight checkouts".17:08
Lo-lan-doHm.  Maybe I'm replying to the wrong question.  Ignore me please :-)17:08
tbradshaw:)17:09
tbradshawyeah, that looks exactly how I had hoped it when when done17:10
tbradshawthanks for setting me straight luks17:10
tbradshawI appreciate the time and instruction. :)17:10
lukssorry about the first reaction :)17:10
luksI thought you are a git user trying to use bzr as git :P17:10
lukswithuot reading the documentation17:10
tbradshawha ha!  Nope.  Just a longtime svn user, still trying to wrap my head around distributed version control.  I'm about 85% of the way there. :)17:11
tbradshawbut I make some poor assumptions sometimes, as you noticed.17:11
tbradshawanyway, thanks again. :)17:12
garyvdmHi igc17:14
igchi17:15
igcnight all17:17
=== thunderstruck is now known as gnomefreak
mthaddonabout to update PQM after the current run, if anyone's interested17:34
michaelforrestis bzr viz supposed to support viewing differences between multiple branches?17:34
michaelforrestI don't know how collaboration is supposed to work if I can't get a project overview like the github network graph..17:35
garyvdmmichaelforrest: It can do it if the first branch has all the revisions that are in the second branch17:35
michaelforrestyeah that doesn't really help me17:35
garyvdmmichaelforrest: If not, it fails silently.17:35
michaelforrestI want to see everything everyone's done17:35
garyvdmmichaelforrest: qlog is much better at that17:35
michaelforrestso I can see if there's anything worth taking17:35
michaelforrestwhat is qlog?17:35
michaelforresta plugin?17:36
garyvdmmichaelforrest: simialar to viz, but better, found in qbzr plugin.17:36
michaelforrestok17:36
michaelforrestI'll try that17:36
michaelforrestthanks17:36
michaelforrestoh, except... I'm on a Mac!17:36
=== deryck[lunch] is now known as deryck
garyvdm:-( - I believe that it is possible to run qbzr on a mac, but the installation is difficult.17:37
garyvdmmichaelforrest: specifically the pyqt install.17:38
michaelforrestI'll see if macports does the job17:38
luksit seems there is a py25-pyqt4 port17:39
luksso it should work, it will just take some time17:39
michaelforrestah ,thanks luks17:39
garyvdmHi luks17:39
lukshi garyvdm17:40
garyvdmluks: I'm working on: http://bazaar-vcs.org/qbzr/Blueprint/BrowseRedesign17:40
garyvdmbbl - Dinner17:40
luksthe mockup looks good17:41
luksbut implementing it will be harder, as it's not exactly standard UI17:41
=== kiko is now known as kiko-phone
naoki_I'm sorry. I fixed tbzr build error.18:49
naoki_I can't build trunk directly because I don't have VC++2008 Std.18:50
naoki_I don't know autobuild environment. Is it build another branch?18:52
jamnaoki_: we have buildbot running on a win2k3 machine18:52
jamhttp://babune.ladeuil.net:26862/waterfall18:53
vilanaoki_: still no good, but I'm not sure the bot got your last revision18:53
naoki_For example, (1) push to lp:tortoisebzr/pre-trunk, (2) autobuild (3) push to lp:tortoisebzr18:53
jamspecifically something like: http://babune.ladeuil.net:26862/builders/installer-dev-plugin-dev18:53
vilajam: it looks like my pqm submission go in a black hole... no feedback mail :-/18:53
jamvila: are you using the right submit branch?18:54
jamblackholes suck, though...18:54
jamit seems to happen often with pqm18:54
vilaI used bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev, should I use http instead ?18:54
vilatrying, will pass around later, dinner time18:55
jamvila: yes, http19:00
vilajam: even more obscure, I have mail in bazaar-commits for my submissions !19:37
vilajam: that is, the mails are accurate, but the revisions are nowhere to be seen, neither in the old trunk nor the new one...19:41
vilafinally, the submission to http came back as failure: nothing to merge19:43
=== kiko-phone is now known as kiko
BasicOSXGreat job on 2a, love it!20:15
jamvila: so... when you submit to pqm it does the merge and commit locally, and the pushes that to lp20:26
jamit is *possible* for that push to fail20:26
jamin the past we had problems with redundant packs after autopack, etc20:26
jamand that tends to kill pqm but give it 'nothing to do'20:26
jambecause its local branch has the revisions merged20:27
jamthanks BasicOSX20:27
jamyeah, I just branched 'bzr.dev' from scratch in about 3m30s20:27
jamdown from 12m+ last I used it20:27
BasicOSXyeah, same here. Amazing speed increase20:27
vilajam: yup, I came to the same conclusion, the merge went fine, the push failed, no idea how to track that further though without a LOSA :-/20:27
jamvila: Not possible, as far as I know20:28
jammthaddon ,or spm ?20:28
mthaddonvila: how can I help?20:28
vilaho !20:28
jammthaddon: it would seem that pqm successfully merged something but failed to push it to lp20:28
vilamthaddon: it seems that pqm can't push to lp20:28
jamcan you check pqm's logs?20:28
mthaddonjam: sure - when did this (not) happen20:29
jamvila knows for sure20:29
jammaybe 3 hours ago20:29
vilaI think I did the submission 2h30 ago20:29
jamvila: yeah, and the email is sent post push, not post commit20:30
jamso that also would fit the symptoms20:30
mthaddonjam, vila: https://pastebin.canonical.com/21854/20:30
jammthaddon, vila: looks like a direct bug in pqm20:30
jamsomething got a string pointing to a branch, and thought it was getting a Branch object20:31
jamperhaps aliasing of a variable?20:31
mthaddonjam: possibly not - https://pastebin.canonical.com/21856/20:31
jammthaddon: well, that could be a factor too, but certainly pqm shouldn't be treating a string as a Branch object :)20:32
viladamn it, can you check the authentication.conf file20:32
jamthe latter may have triggered the former, though20:32
vilamthaddon: if auth.conf exists in ~/.bazaar and user is not bzr-pqm... that will explain why spm called auth.conf with poetic names20:33
vilamthaddon, jam : that's in addition to the direct pqm bug of course20:33
mthaddonhttps://pastebin.canonical.com/21858/ is from .ssh/config and the public key seems to match https://edge.launchpad.net/~bzr-pqm/+sshkeys20:35
vilamthaddon: at worse, you should check with spm about auth.conf, my memory of the discussion is that you shouldn't use lp: on pqm only bzr+ssh urls20:35
mthaddonvila: I tried it again with bzr+ssh urls - got the same20:35
vilamthaddon: but what appear in ~/.bazaar/authentication.conf ?20:35
mthaddonalthough for some reason auth.conf has launchpad-pqm user :(20:35
vilamthaddon: if you don't specify a user in the url, auth.conf will provide it20:35
vilahere we are....20:36
nxvl_hi! i was wondering about the "--fixes" option, in the docs it says i can close multiple bugs, but it doesn't say how the parameters need to be passed20:36
mthaddonwas updated 2009-09-04 14:4720:36
vilaso,  the solution is to remove auth.conf20:36
nxvl_as in space separated, comma separated, a --fixes option for each20:36
vilabut we need to understand how and whem it came back20:36
mthaddonvila: why would that have been created?20:36
=== nxvl_ is now known as nxvl
vilamthaddon: *you* tell me :-D20:36
vilamy 8-ball can't read the logs there :)20:37
mthaddonvila: which logs?20:37
vilamthaddon: It was a joke, I have no idea where to look :-/20:37
vila.bzr.log certainly, but for what command ?20:37
mthaddonyeah, me neither :(20:37
vilaSome command that use lp: certainly since that is the one that trigger the creation of the [launchpad] section in auth.conf,20:38
mthaddonvila: should I just remove that file for the moment?20:38
vilabut I don't know precisely which... lp-login ? What did bazaar.conf says ?20:39
vilamthaddon: yes20:39
mthaddonvila: oh, hang on a sec...20:39
vilaerr20:39
vilahang on20:39
mthaddonso I did an upgrade of PQM earlier20:39
vilawhat hour ?20:39
mthaddonlet me confirm20:39
vilain pqm time so we can relate to 'was updated 2009-09-04 14:47'20:39
mthaddonabout three hours ago...20:40
mthaddonso this is sounding promising - if we just remove this file we should be good20:40
mthaddonwhich I've now done20:40
vilain bzr trunk you should now be able to try: 'bzr missing :push' and it should tell you about 2 missing revisions20:41
mthaddonI'm not really sure what directory that'd be from, locally - let me see if I can find anything20:42
vila,bzr.log should give you some hints20:42
mthaddonvila: https://pastebin.canonical.com/21859/ <-- gah!20:44
vilamthaddon: 'bzr info' ?20:45
* vila wonders what escudero maps to...20:45
mthaddonhttps://pastebin.canonical.com/21860/20:46
vilamthaddon: 8-( I'm lost20:47
vilalifeless, jam: wrong setup on escudero ?20:48
jamnxvl: --fixes A --fixes B --fixes C I believe20:49
nxvljam: thnk you!20:49
vilanxvl: I confirm, I used it last today (sry missed the question)20:50
jamvila: pqm shouldn't be pushing to escudero directly20:50
jamI believe it pushes based on the submit branch20:50
jamand its internal config20:50
mthaddonwell at least bzr ls bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev is working now20:50
jamwhatever maps http://bazaar.lp.net/... => bzr+ssh://...20:50
nxvlvila: :D20:50
mthaddonvila: I see two revnos diff between that dir locally and bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev - should I just push to there?20:51
jammthaddon: sure20:52
vilamthaddon: that's what I want yes, thanks :)20:52
mthaddonjam, vila: ok, done20:52
mthaddonnow up to revno 467420:52
vilamthaddon: what I hope though, is that you won't have to do it for every submission :)20:52
mthaddon:)20:52
vilamthaddon: thanks a ton !20:53
mthaddonsure - I'll keep my fingers crossed20:53
vilamthaddon: we should check with spm about that authentication.conf mess, there is a bug waiting to be fixed there :)20:55
vilamay be even some in pqm, no feedback is really bad in these circumstances20:57
* vila EODing SWEing :)20:57
* fullermd SBI NRZ's to vila.21:00
jamwell, I think someone like lifeless gets an email when pqm crashes like this21:01
jambut it doesn't help the submitter much21:01
jamuntil he wakes up and notices :)21:01
=== Xavura is now known as DrHax
=== DrHax is now known as Xavura
=== Xavura is now known as GravityCat
kfogelLarstiQ: https://code.edge.launchpad.net/~kfogel/bzr-hookless-email/byte-limit/+merge/11233  :-)21:21
lifelessjam: crashes how?21:39
lifelessjam: also, how to get a memory trace from a running bzr process?21:40
lifeless 4847 robertc   20   0 6284m 4.8g 1200 D    0 84.1 379:17.46 python21:40
jamlifeless: pqm was crashing by failing to push to lp:bzr21:40
jamit seems that ~/.bazaar/auth.conf  got set21:40
jamand so it was trying to login as someone like spm21:40
jamin doing so21:40
jamit failed to send a message to vila about his merge21:40
jamit would successfully merge, run the tests, commit, push would fail21:41
jamno email21:41
lifeless fixed in pqm trunk21:41
lifelessI think21:41
jamalso, there was a bug about "parent_branch" being a string21:41
lifelesstheres an RT ticket for deployment alreadyt21:41
jamwhen it thought it should be a Branch object21:41
jamfor memory trace21:41
jambzr branch lp:~jameinel/+junk/py_memory_dump21:41
jamsetup.py install (needs pyrex)21:41
jamthen21:41
jamSIQUIT21:42
jamfrom memory_dump import scanner21:42
jamscanner.dump_gc_objects('foo.json')21:42
jamthough right now I'm making decent use of21:42
jamtrace.debug_memory()21:42
jamwhich just uses /proc/PID/status21:42
=== ia__ is now known as iaz
=== iaz is now known as ia
lifelessthis is the netbeans import21:43
lifelessits now 6:4221:43
lifeless11:19:34 65000/133780 commits processed at 208/minute (:65000)21:43
lifelesswas the last output21:43
lifelessits been thrashing for 19 hours21:43
jamlifeless: well, IIRC from igc, if you just do 'bzr fast-import foo.fi' the fast-import code caches all texts in memory21:47
jamthere was something about doing a 2-pass system21:47
jamwhich allows the code to know what texts will be referenced again21:47
jamwhich has been implemented, I believe21:47
lifelessjam: I think it caches refs to them; its a 129G .fi file:21:47
jambut igc knows better21:47
jamlifeless: no, it caches the texts21:47
jamsee igc's recent comments about how fast-import isn't ready to scale to really-big-imports21:48
jamat least, that is what I understood from various threads21:48
lifelesshes being doing kernel and openoffice21:48
jamlifeless: with 2 passes21:48
jamI would assume21:48
jam1 pass generates a map21:48
jamused in the second pass21:48
lifelessanyhow, I'm going to get a trace, file a bug, and zerg it :P21:48
=== GravityCat is now known as Xavura
RenatoSilvahey what's this? http://pastie.org/60633421:54
XavuraIt's a URI.21:55
Xavura:x21:55
RenatoSilvahow to solve that error? is it a bzr bug?21:59
jamso lifeless on my networking issues22:01
jamI came back late at night from my slower Linux server, and branched all of bzr.dev in 3.5min22:01
jamwhich was great22:01
jamthough my last time on the Windows box was 14min22:01
jam(both post-pack)22:01
jamUnfortunately I didn't try again to see if it was time of day, versus windows/linux22:02
jamI did test right now, and I can get about 1.5MB/s (byte not bit) on my wireless network from a local server22:02
jamon windows (using rsync)22:02
jamI wonder if maybe our code that does some cpu processing while reading is causing problems on windows22:03
lifelessthat would show up with the window being full22:04
lifelesswe can tell the os we want it to be bigger22:05
lifelessuhm22:05
lifelessrephrase22:05
lifeless'it might be paramiko'22:05
lifelessI suggest trying paramiko on linux, from the same machine22:05
lifeless[as few variables changed as we can]22:05
fullermdRenatoSilva: It's some plugin being out of sync with your bzr.22:06
fullermdRenatoSilva: rebase, maybe?22:06
mthaddonlifeless: PQM upgrade seems to be busted22:11
mthaddonfor U1 at least22:11
mthaddonlifeless: https://pastebin.canonical.com/21864/22:12
lifelessmthaddon: did the new dep get installed?22:12
mthaddonlifeless: it did, yep22:12
lifelessoh fnar fnar that looks like a bug22:12
lifelessgimme a sec I'll check trunk22:12
mthaddonthx22:13
lifelessok just delete the parameter on that line22:14
lifelessit passed tests. Clearly that line isn't tested :(22:14
mthaddonlifeless: erm, which parameter on which line?22:15
statikmthaddon: the same patch I already pasted :)22:15
mthaddonah!22:15
lifelesspushing rev with it in it anyhow22:17
lifelessstatik: mthaddon: sorry about that22:17
statikno worries22:17
lifelessgimme a week with nothing else queued, I could really sort pqm out22:17
=== krisfree is now known as krisfremen
mthaddonlifeless: I think we can fit one of those in around about April 203522:18
lifelessthat soon? :)22:18
mthaddonyeah, I'm being optimistic22:19
lifelessjam: ok, dumping that json; whats the easiest tool to use to answer 'where did 6G of ram go' ?22:20
RenatoSilvafullermd: what's rebase and out of sync with bzr?22:20
jamlifeless: cat foo.json | sort | uniq | sort [something to sort on the size column] > sorted.json22:21
jamthere is also22:21
jammemory_dump.loader22:21
jamom = memory_dump.loader.load('dumpfile.json')22:22
jams = om.summarize()22:22
jamprint s22:22
jamprint s.summaries[0]22:22
jamthe introspection stuff could certainly use more work22:22
jambut it may be a start22:22
jamI also have a branch of runsnakerun that can load them an compute square maps, etc22:23
jambut at 6GB, rsr is pretty useless22:23
jamthere are probably enough objects that just loading the dump is going to be a couple G22:23
fullermdRenatoSilva: Well, it's on your list of plugins.  The erroring function sounds like something I think is in rebase.22:27
RenatoSilvawhat's rebase?22:27
fullermdThe plugin.22:27
RenatoSilvabzr pull -----> not a branch22:28
RenatoSilvahow to solve this22:28
RenatoSilvaI just want to make it work22:28
fullermdWell, presumably it's installed from a release, so it would need one in sync with your bzr.  I don't really know details; I don't use rebase.22:29
fullermd(I don't know for sure rebase is what's causing your problem either, but I know I've heard that error before related to plugins, and rebase seems the most likely suspect)22:29
bialixI've got error in tests in my plugin:   File "bzrlib\commands.pyo", line 212, in get_cmd_object --> BzrCommandError: unknown command "init"22:30
RenatoSilvaI don't use rebase either, I did not even know that thing ever exist22:30
bialixwhat I should do?22:30
jamRenatoSilva: the error is a known bug in bzr's 1.17 win32 installer because it bundled a version of bzr-rebase that caused 'bzr help commands' to fail.22:30
jamuse a different installer22:30
jam1.18rc122:30
jametc.22:30
bialixinvoke install_bzr_command_hooks for those tests?22:30
jamRenatoSilva: note that there are no known real problems with 1.17, just that 'bzr help commands' is unhappy22:31
bialixdear core devs, can you give me advice?22:31
RenatoSilvajam: official release is still 1.17? Ok at least I know the cause, I guess I'll wait for the fix in official release or so22:31
jamRenatoSilva: 'bzr pull ==> not a branch' probably means you don't have a branch... either the source or the target22:31
RenatoSilvajam: rebase is not a branch22:31
RenatoSilvabtw, I'd run bzr help commands to know how to see/change my user name that go into commits22:32
RenatoSilvasince I won't install RCs, I ask here, how? :)22:32
bialixlifeless: should I run install_bzr_command_hooks for my tests if I need get_cmd_object to work?22:33
jamRenatoSilva: bzr help commands --no-plugnis22:33
jambzr help commands --no-plugins22:33
jambzr whoami22:33
lifelessbialix: the main one in bzrlib? no22:35
RenatoSilvayeah, whoami!!!!!22:35
RenatoSilvajam: thanks!22:35
bialixlifeless: so why my test failed on get_cmd_object then?22:36
lifelessbialix: I'm not here today - if jam can't give you a hand perhaps post to the  list?22:36
bialixok22:36
bialixjam: can you give me advice about get_cmd_object?22:36
RenatoSilvathe whoami is stored for each OS user in his profile right?22:36
lifelessbialix: I would guess though that you've overridden setUp()22:38
lifelessand not called the base class setUp22:38
lifelessor something like that22:38
bialixlifeless: no22:38
jamRenatoSilva: yes22:39
jambialix: I don't know much about it, without having a bit more background of how the test is failing22:39
jamhowever, I'm also done for the weekend...22:39
bialixok, thanks guys for making bzrlib api harder to use22:40
RenatoSilvaok tahnks22:40
lifelessbialix: that makes me sad, that you say that22:41
lifelessbialix: I'm sorry its giving you trouble; if you mail the list I'll be happy to help figure it out, but I can't today.22:41
bialixlifeless: I found that you invoke install_hook in the test_commands.py22:41
lifelessI'm doing breakfast then out finding stuff for my brothers birthday22:41
lifelessbialix: yes, but thats to test that the hooks work22:42
bialixit's not the part of TestCase setUp()22:42
lifelessall normal bzrlib tests have the commands registered by default22:42
bialixperhaps when I run selftest -s bp.scmproj it won't22:42
lifelessbialix: the hooks are setup by doing run_bzr_command22:44
bialixand I'm using run_bzr()22:45
lifelessbialix: if you don't call run_bzr_catch_errors or run_bzr_catch_user_errors at all, they won't be registered22:45
lifelessbialix: why?22:45
bialixbecause it works for my plugin22:46
lifelesswell, if you want to call it directly, yes then you will need to install the hooks manually.22:47
bialixyep, explicit call to install_hook helps22:47
bialixthanks22:47
lifelesscalling it directly will mean you don't get error formatting22:47
lifelessits better to call one of the run_bzr_catch variants22:47
bialixlifeless: no, I need only run_bzr()22:49
lifelessbialix: why?22:50
bialixbecause I run bzr commands as in-process22:51
lifelessin the test suite or your ui?22:51
bialixin my backend22:52
lifelesssounds like you have an implementation of run_bzr_catch_user_errors22:53
lifelesscan you not just use it directly?22:53
bialixlifeless: you said you're busy ;-) I'm just want to release my plugin and make its test suite pass again after 7 months of not running it22:54
bialixeven if it ugly inside22:55
lifelesskk22:55
bialixit working in the end22:56
bialixall tests passed, everybody happy22:59
RenatoSilvaHow to delete the latest revision from Launchpad branch?22:59
RenatoSilvaAnything better than branch+uncommit+revert+delete+push?23:01
bialixuncommit lp:xxx ?23:01
RenatoSilvabialix: it will uncommit directly in the lp copy?23:02
bialixit should23:02
RenatoSilvacool, but I won't get uncommited stuff when I branch it, or will I?23:03
bialixbut I'm not sure what is lp copy for you23:03
bialixno, you don't get23:03
RenatoSilvalaunchpad's copy of the branch, not local copy23:04
bialixI'd rather to not use term "copy"23:04
RenatoSilvawhy23:05
bialixbecause they are different branches23:06
bialixyou're working with dvcs in the end23:06
bialixRenatoSilva: those branches like twins: they seems similar but have different wives23:08
RenatoSilvabialix: ok got it, but with copy I meant same revisions, non-diverged23:16
bialixis the wall of white house still white when you to trun round the corner?23:17

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