maxbigc: Hi. When you have a moment, could you take a peek at my fastimport MP?  https://code.edge.launchpad.net/~maxb/bzr-fastimport/branch-mapper-stuff/+merge/1459400:00
igchi maxb: shall do.00:12
igcjames_w: what's the timeframe for changes landing into bzr-builder's trunk? Are you back home now or still travelling?00:14
lifelessigc: hes on leave for a week00:14
lifelessigc: and there is a backlog :P - I have a month old patch now :(00:15
igcjames_w, lifeless: I've got some doc and minor code changes ready to go in. I'm asking because if that backlog :-)00:15
james_wthings will be leapfrogging rob's change as I have time to merge them00:15
igclifeless: maybe I should submit them over a non-trunk branch?00:16
james_wI reviewed some on the plane yesterday, but as LP doesn't send you a merge proposal I couldn't merge them00:16
igchi james_w00:16
james_whi igc00:16
igcjames_w: https://code.edge.launchpad.net/~spiv/bzr-builder/merge-subdirs-479705 looks like it builds on Rob's patch00:17
james_wI'll make it ~bzr-core owned or something one day00:17
lifelessigc: it does00:17
igcjames_w: is that still to be reviewed?00:17
lifelessigc: that builds on one of my patches. the really old one is more complex and not relevant for the lp daily builds project00:17
james_wI'd just like to play gatekeeper for a while so that we can learn what the project is00:17
james_wit is still to be reviewed00:18
james_wI have some comments that will make it resubmit, but I asked for the merge proposal early anyway, so we could discuss whether merging subdirs is something that should be supported00:18
igcjames_w: my doc tweaks can go over trunk easily00:18
igcjames_w: my code changes are pretty trivial so I'll submit those over trunk as well00:19
james_wplease do00:19
igcjames_w: I just wanted to minimise merge pain for both of us if you were about to release a new trunk00:19
igcgiven six branches are more recent than trunk, I thought it was worth asking. Anyhow, enjoy your break james_w!00:21
james_woh, this new prerequisite branches feature is confusing00:21
james_wit's cool and all00:22
james_wbut I reviewed this diff I was sent, the mail said nothing about prerequisite branches, and then the diff I got when I merged was a lot larger than I reviewed00:22
* james_w goes the other way00:22
lifelessjames_w: start at the branch with no prerequisite00:24
james_wwell, yeah00:24
james_wwhen was permit_dir added?00:29
lifelessoh, the test suite?00:30
lifelessa few months back now00:30
james_wtime to make dinner anyway00:31
thumperjames_w: please file a bug about the prerequisite info missing the email00:43
idnarhow do I figure out what merge algorithm bzr merge is using?00:48
lifelessidnar: default is 3-way, anything else is what you told it00:55
idnarah, okay00:55
idnarthe help should probably mention that00:55
AfCI have http://paste.pocoo.org/show/152361/ in my .vimrc; on Gentoo it used to work that when `bzr commit`ing it would [among other things] set tw=70.01:06
AfCFor some reason having switched to Ubuntu this doesn't work anymore, though other things in .vimrc are being picked up.01:06
AfCAnyone have even the vaguest notion of why this might not be working, and what I might try doing to re-enable it?01:06
lifelessyou might need set nocompat at the top o the .vimrc01:08
AfClifeless: Hm. Well, /etc/vim/vimrc seems to suggest that Debian has compatible on. I'll try your suggestion right now, though01:12
idnarI think by default, "vi" will run vim in vi-compat mode, whereas "vim" won't01:12
idnarbut I could be confused01:13
AfCidnar: really? oh, that could be the problem01:14
lifelessI've found that I need set nocompat at the top for things to consistently work right01:15
AfCaside: vim.basic, vim.tiny... is there a third I should have installed, vim.kitchen_sink? :)01:16
spmAfC: that's vim.scripts I think you mean... ;-)01:17
AfCspm: just extrapolating from what `update-alternatives --display vi` had to say :)01:18
lifelessspiv: note that stuff submitted on the 20th is still on your watch ;)01:20
AfCOk. Well,01:20
AfC$ export EDITOR=/usr/bin/vim01:20
AfCcaused things to behave, but prefacing ~/.vimrc with "set nocompatible" does not seem to have had any effect01:20
idnarmaybe .vimrc isn't even parsed when it's invoked as "vi"01:21
AfCso idnar seems to be on the right track, but I'd like `vi` to work properly, not to assume I have some nostalgia for the 1980s vi that we all loved to hate.01:21
AfCIs there a Debian way to make `vi` be Vim as Vim? I thought that was the whole point of the alternatives system01:22
lifelessvim is special01:22
lifelessbecause the vi/vim behaviour is not separate packages, its 'how was I invoked'01:23
spmAfC: "set nocompatible" in your vimrc - I believe should do the trick01:23
spmalternately; just alias vi=vim for a Q&D override01:24
AfCspm: as I just said above, that had no effect01:24
spmgah. soory - missed that. bummer!01:24
AfCspm: yeah, I'm trying to do this "right" (in Debian terms) rather than fighting the system01:24
AfCspm: [I would have _hoped_ compatible / nocompatible would have done the trick, seeing as how that was originally [&upstream] the way to take vim and ask it to dumb itself down to classic behaviour]01:25
* AfC digs some more01:25
spmAfC: strace it on startup? it may be trying an old style vi rc file. name eludes me atm. ??01:25
AfCI guess I could set EDITOR01:25
AfC[better than alias, but still somewhat dirty unless done persistently system wide]01:26
lifelessyou should set EDITOR01:26
idnarsetting EDITOR seems reasonable to me01:26
idnarI'm not sure why it would need to be system-wide, it's just a user setting01:27
idnarI mean, setting EDITOR=vim isn't much different to, say, EDITOR=emacs01:27
AfCidnar: why don't you just pretend for a minute that all the other users on the system want it to be the same01:27
AfC[notably, that root fellow]01:28
AfClifeless: if that's what you recommend, that's what I will do01:28
* AfC goes off to learn about how Debian is handling /etc/profile these days01:28
lifelessI set EDITOR so that I get the editor I want01:28
phcoderHello all. How can one prevent replacement of one branch by another on the server?01:42
AfClifeless, spm, idnar: thanks for your help01:45
lifelessphcoder: do you mean 'make push prevent push --overwrite' or do you mean 'stop rm -rf' ?02:03
phcoderlifeless: both in preference however I suppose for the second one would need bzr+ssh02:04
phcoder(bzr+ssh only server I mena)02:06
lifelessso filesystem permissions are the answer there02:08
phcoderlifeless: but how exactly? We still want people to be able to do a non --overwrite push02:09
lifelessso you can set append_revisions_only in branch.conf - see bzr help configuration02:09
phcoderlifeless: thanks02:11
PengOf course, people can do anything if they *really* want to.02:12
mwhudsonwhere's that no-vfs smart server02:12
phcoderPeng: they can send a missile on server, sure ;)02:13
Pengphcoder: Well yeah, but firing up hitchhiker or bzrlib and turning off append_revisions_only or outright manipulating files through the VFS is trivial.02:15
=== lamont` is now known as lamont
phcoderPeng: if one has only bzr+ssh access can't one instruct daemon to ignore such activity and send a notification e-mail?02:17
Pengphcoder: The VFS is necessary for some normal operations.02:19
phcoderPeng: like? Couldn't one adjust bzr+ssh to handle it as well?02:20
Pengphcoder: Examples? ...I don't know.02:20
Pengphcoder: Of course it's possible (and ideal) to make everything use smart methods, but the work hasn't been done yet.02:21
lifelesseven if everything is smart02:23
lifelessappend_revisions_only is settable through the smart API02:23
spivThough presumably it'd be easy to add a hookpoint that could restrict changes to branch config objects.02:24
PengWhen you run with -Dhpss, can you grep for VFS operations?02:24
spivNot trivially.02:24
spivBasically, they are the verbs without '.' in them.02:24
PengAh. Yeah, that's bad.02:25
spivSo something like "hpss call.*?'[^.]*?' I guess.02:25
PengLooks like 2 of the 3 VFS operations on one push I did were getting .bzr/branch-format and .bzr/checkout/format.02:26
PengAh, then getting .bzr/bzr-search/format at the end.02:26
spivWell, that one would be bzr-search's fault ;)02:27
PengThe others could've been the fault of plugins, too.02:27
spivProbably not :(02:27
spivYou could try -Dhpssvfs if you're really keen.02:28
PengI'm kind of keen. Is that enough?02:28
spivPeng: try it and find out :)02:29
PengI just tried it on a different push. There was only the bzr-search one. :\02:30
PengNo underscore.02:31
Peng(I don't care enough to reproduce the conditions of the original push. It's a bit complicated.)02:33
Peng(Although I'll probably change my mind in a minute.)02:33
PengJust did it. push_branch tries open_workingtree calls has_workingtree calls _ensure_real.02:42
PengDunno about the other one.02:42
PengI bet it didn't happen in my other test because the destination branch didn't exist.02:43
spivPeng: Hmm, I thought I fixed the open_workingtree/has_workingtree case.  Ah well.02:43
lifelessspiv: with my fix you can see it ;)02:45
lifelessspiv: different trigger I think, but yeh still bust02:45
lifelessspiv: you're still piloting the things filed on friday, right?02:46
Pengspiv: I still can't reproduce it with a test branch, though.02:46
* igc lunch02:47
* Peng unhappily munches on Cheerios02:47
spivlifeless: I guess so, although I'm not sure what a good way to track that is02:49
spivlifeless: possibly we should keep that info on the PatchPilot wiki page?02:49
lifelessspiv: I'd say 'I'm piloting this' in a merge proposal you're piloting02:51
spivHmm, yeah.02:52
phcoderThanks guys. Good night02:52
=== spiv changed the topic of #bzr to: Bazaar version control system | 2.0.2 and 2.1.0b3 have gone gold! time to build those installers | try https://answers.launchpad.net/bzr for more help | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | Current pilot: lifeless
=== timchen119 is now known as nasloc__
pooliehi spiv04:17
pooliethanks for the report04:17
spivNo problem.04:18
pooliei think we should mention it, at a broader level, on the blog too04:21
poolieOldAl: hi, still here?04:26
OldAlpoolie: Yes, apparently :)04:27
OldAl(Actually, I was away - shame on me for not telling.)04:28
OldAlmenesis: Labas, bičiuli (Koks gražus žodis - "bičiulis", nieko panašaus nežinau kitose kalbose).04:31
OldAlpoolie: I am off to an afternoon nap - good for my. and all mine, health!  Be back in an hour or so.04:34
poolieOldAl: i was just going to say04:34
poolieyou made a page about yourself called /wiki04:34
pooliei'm just going to rename that to OldAl04:34
pooliejust so you know04:34
OldAlpoolie: That's b. disgraceful... Thanks for telling me. It was meant to be called "OldAl". Thanks for telling me.  The name probably can not be changed, can it?  If it is a problem to "move" it, just delete it, please.  I will need to read up on how to name a page.04:36
poolieit's no problem04:36
poolieit's now here04:36
poolieedit away04:36
pooliepossibly we should move all of them into /People/ though04:36
OldAlpoolie: That sounds a good idea. I probably can do that - just make a link to it and then copy via clipboard the contents of them; start with my own.04:38
OldAlpoolie: In about an hours time, please...04:38
DarkwingDuckI have a question...04:46
DarkwingDuckI'm getting an error when I try to branch a project.04:47
DarkwingDuckPermission denied (publickey).04:47
DarkwingDuckbzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist.04:47
DarkwingDuckThis is only on my desktop. when I try it with my netbook it works just fine.04:47
poolieDarkwingDuck: there's probably an error from ssh further up?04:47
DarkwingDuckSo, redo my ssh?04:48
spivDarkwingDuck: the "Permission denied (publickey)." is from ssh, saying that it couldn't log in04:50
DarkwingDuckahh. Okay.04:50
spivAre you trying to branch from Launchpad?04:51
DarkwingDuckI had it working a couple days ago and now it wont work on my desktop04:52
DarkwingDuckHowever, my netbook connects just fine04:52
spivIn that case, you can either configure your desktop's SSH so that it can connect to Launchpad (possibly by generating a public key and adding it to your account on https://launchpad.net/), or you can reconfigure bzr to connect to Launchpad anonymously (assuming read-only access is fine)04:54
DarkwingDuckOkay, thanks04:55
OldAligc: I looked and qrun with regard to "too verbose explanation".  I can not reproduce anything like what you quote.  Would it be too much to ask you for more detail?05:25
OldAligc: not "and qrun" bat at "qrun and pull"05:27
OldAligc: A really serious flaw - bug - the GUI quits quietly if it encounters and error, viz. pull from a directory that is not a branch and the like.  It tells nothing to the user, nothing at all - just quits...05:30
OldAligc: You seem to be absent, so I will leave it at that and go to try to do something else.05:33
OldAlpoolie: Thanks for moving my "wiki" page to OldAl.  It is a flat file system, no?  Do you want me to create a "People" page and link to it my own CV page?05:35
poolieoldal, it is possible to create a People page and move yours to People/OldAl05:36
poolieyou can do that if you want05:36
OldAlpoolie: There is always a chance with an old timer that he will make a mess of it... So I do ask!05:37
OldAlpoolie: Thanks for the advice - I will go away and give it a go.05:37
OldAlpoolie: "go away" as in next desktop...05:38
igchi OldAl05:45
OldAligc: Hi, igc!05:46
igcOldAl: try "bzr qpull --ui-mode" to keep the dialog open when a problem is encountered05:46
OldAligc: I will do that and see what happens.05:46
OldAligc: I just could not reproduce any kind of advice how to use the qpull or pull. Nothing like what you quote.05:47
igcOldAl: to reproduce my bug, grab a simple branch from lp, cd to the created directory and run "bzr qpull --ui-mode"05:48
igcOldAl: you can try it in a branch of qbzr say :-)05:48
OldAligc: OK: so it seems that --ui-mode is the magic command?05:49
OldAligc: So why would anybody want to use it in general?05:50
igcOldAl: nearly all q* commands take a --ui-mode parameter05:50
igcexplorer, TortoiseBzr and qbzr-eclipse all call the q* command that way05:51
igci.e. with that option turned on05:51
OldAligc: What turns the ui-mode on?05:51
igcOldAl: sending error messages to the console isn't helpful to most users (unless they run every q* command from the console)05:51
igcOldAl: I don't get the question. Using the --ui-mode option turns that mode on05:52
OldAligc: So if I call from CLI "bzr qpull"  that will be in ui-mode?  Or does one give this with every command to get feedback?05:54
OldAligc: I will go to the next desktop to try - be back RSN05:55
OldAligc:   p, li { white-space: pre-wrap; }  Run command: bzr "pull --ui-mode" bzr: ERROR: unknown command "pull --ui-mode"  I see where the *Run command* comes from. It is not really helpful with "pull", however.  "qpull" maybe?05:58
igcOldAl: yep, --ui-mode is onyl for q* commands06:00
OldAligc: Well, with wrong data (no reference to where mirror is) the gui gives "unknown command".06:02
spivOldAl: the quotes in  'bzr "06:02
igcOldAl: let's try again ...06:02
OldAligc: I still fail to reproduce your "too verbose" reply.06:03
igc1) bzr branch lp:qbzr qbzr06:03
igc2) cd qbzr06:03
igc3) bzr qpull --ui-mode06:04
spivOldAl: the double-quotes in  'bzr "pull --ui-mode"'  are odd, I'm not sure why you put them in.  Generally you want to do 'bzr cmd --option', with no quotes.  Quotes change the meaning quite dramatically.06:04
OldAligc: All from CLI, right?06:04
igcOldAl: if you already have a qbzr branch, skip 106:05
OldAligc: I only use the "xxx" here to show it is an item that was put into GUI.06:05
OldAligc: No, I don't mind the branch bit - not at all.  Good stuff.06:06
OldAligc: It (the PC) is pulling the qbzr - step 1.06:11
OldAligc:   p, li { white-space: pre-wrap; }  Run command: bzr pull bzr+ssh://bazaar.launchpad.net/~qbzr-dev/qbzr/trunk2a/ --directory /dat/work/dummy/qbzr No revisions to pull.  Sort of success...06:13
igcOldAl: yep -that's success06:15
igcin reproducing the bug06:15
OldAligc: It is a naughty message, I must say.  OK, so I better go and try to get a fix on that.  The freshly made branch would be useful.06:15
OldAligc`Has anybody told you that you are a born teacher?06:16
igcOldAl: I write lots of documentation so I don't need to answer questions so .... no06:17
OldAligc: (I come from a family of teachers, or persons engaged in some form of teaching.)06:17
OldAligc: Thanks for your patience with an old man - me!06:18
OldAligc:  Hope to repay you in some small way!06:18
igcOldAl: no problem. In return, I expect you to find every retired people who and program and get them submitting patches to Ubuntu using bzr and launchpad. :-) :-)06:19
igcand -> can06:19
OldAligc: I confess that I was not looking at the CLI interface with qpull.06:19
poolie1spiv, i am about 50% of the way to automatically marking reviews that need to be signed06:21
poolie1s//need the contributor agreement to be/06:21
OldAligc: Typical misunderstanding - I was really interested and looking at [bzr qrun], which has a potential to compete with ... bzr-explorer. At least in some areas. I will now switch to looking at qpull - thanks again.06:22
spivpoolie1: nice.  Marking them in what way?06:22
igcOldAl: I'm happy for you to work on qrun. qpull is a gentle introduction to the qbzr code06:23
poolie1i think i'm going to make it post into the review thread06:23
poolie1assuming there's an api for that06:23
spivThere's always email ;)06:23
igcOldAl: qrun will help explorer 10x more than compete with it IMO06:23
igcOldAl: if it's good enough for a class of users, great06:24
OldAligc: I could not agree more.  You need several GUI implementations.06:24
OldAligc: Preferably different from each other more than a skin.06:25
OldAligc: All the best. Buy for now.06:26
igcOldAl: bye06:26
OldAligc buy -> bye  :-D :'(06:27
maxbIs there a better way to write:    graph.heads((a, b)) == set((a,))  ?07:30
maxbit doesn't feel very nice07:30
lifelessin a test ?07:30
maxbin rebase's actual code07:31
lifelessb not in graph.heads((a,b))07:31
lifelessI guess07:31
maxbOh, excellent point :-)07:31
maxbI was so tied up in checking that it had length 1 as well07:32
maxbbut no, because sometimes a and b are equal07:34
igclifeless: maybe you could add your thoughts on how to do what james is after in https://code.edge.launchpad.net/~ian-clatworthy/bzr-builder/fix-find-branches/+merge/1513707:49
lifelessigc: I've discussed it with vila already07:51
lifelesswe need a change to the plugin path infrastructure07:51
igclifeless: cool. Thanks.07:52
poolie1spiv, if you're still here, can you add people who signed the agreement for you to that team?07:56
* igc dinner07:59
poolie1also spiv, i blogged about it08:08
poolie1corrections welcome08:08
MvGHi! For trac-bzr, does anyone here have an opinion about what a revid without a branch name should mean? I'd like feedback on https://bugs.launchpad.net/trac-bzr/+bug/486795 for this, or directly here on IRC.08:13
ubottuLaunchpad bug 486795 in trac-bzr "Clarify semantics for revid without branch" [Undecided,New]08:13
chxMvG: hi08:14
chxMvG: I am just a user , nothing more08:14
chxMvG: but how can a changeset exist without a branch?08:15
lifelessMvG: you could synthesis a branch for it, with it as the tip08:17
chxlifeless: following up on a discussion yesterday, I would believe that http://freshmeat.net/projects/fl-cow this can be of interest to bzr users.08:26
chxlifeless: this makes the --hardlink option much more useful08:27
lifelesschx: it makes it safer ;)08:28
lifelesstheres another thing like that around somewhere.08:28
chxI am rather curious08:28
lifelessI don't recall the other projects name offhand08:28
chxsee, our svn checkouts eat more than 100MB each (wowsie)08:28
chxso when we migrate to bzr, I would like to see this stop.08:29
poolie1chx: how about using one tree and switching between branches?08:30
poolie1i guess if you wanted that, you'd do it in svn too08:30
chxpoolie1: ?08:31
chxpoolie1: we typically do one checkout per ticket08:31
poolie1my point is08:31
chxpoolie1: so that the QA people can independently check the results08:31
poolie1i guess my point is08:32
chxif you know a better workflow , i am listening08:32
poolie1you can remove the checkout and then people can recreate it from the branch when they need it08:32
poolie1for example just bzr remove-tree and bzr checkout08:32
lifelesschx: so 50% of that 100MB is the svn cache08:33
lifelesschx: which bzr doesn't have.08:33
chxlifeless: i presume08:33
lifelesschx: do your QA people have their own machines?08:34
chxlifeless: no08:34
chxlifeless: this is a web project so they just browse to the developers address , easy (?)08:34
lifelessI see08:34
lifelessyes, for that you'll want separate checkouts08:35
chxalso allows for designers , project managers other assorted riff-raff ;) to see etc08:35
lifelessbut as long as you have a shared repo it will be only your files that show up in terms of space.08:35
chxa shared repo?08:35
lifelessbzr init-repo myrepo08:35
chxI was thinking we will use a bzr branch -- local commits -- gatekeeper merges in flow08:35
lifelessthen do your branching/checkouts within myrepo08:35
lifelessits a storage optimisation tool, it doesn't affect merge/push etc08:36
* chx reads bzr help repositories08:36
chxoh i see08:40
chxi created a repo, checked in Drupal HEAD, branched it and now i see that the repo .bzr is 5MB but the branches .bzr are only 440 and 500kb respectively08:41
chxthat's a good trick indeed08:41
MvGSorry, didn't realize I got replies here...08:48
MvGchx: while revisions without a branch are possible, e.g. when you remove the branch from which they originated, the issue at hand is a different one: trac-bzr is a bzr plugin for trac, and offers several ways for trac to name revisions. One is "branch,revno", one is "branch,revid" and one is simply "revid".08:48
MvGchx: so the question is, if you don't know the branch a revid is supposed to belong to, how to you treat this in trac.08:48
bialixhello all08:56
bialixhello MvG08:56
poolie1hello bialix08:56
MvGHi there, bialix!08:56
bialixhello poolie108:56
poolie1and good night...08:56
MvG10am here...08:57
bialixpoolie1: just yesterday read about five whys: http://www.startuplessonslearned.com/2008/11/five-whys.html08:57
bialixmaybe it could be interested for pilot improvements08:57
bialixand good night08:58
bialixMvG: this channel dancing arounf the world. aussies going to sleep08:59
MvGSo I guessed...08:59
MvGJust have to resist the temptation to join in just yet...08:59
doctormoHey again, I'm re-looking for a way to express the progress of branching and checkout options to a GUI, so far I can either popen the bzr command with a thread and hack together the progress from the stderr output, I'd prefer to use bzrlib, is there any way to do this?09:19
poolie1bialix: yes i think that would be relevant09:21
poolie1we shouldn't just do stuff to work around the current problems, we should dig in to them09:21
bialixagreed, and spiv report make me think this way09:22
bialixglad it maybe useful for you09:22
lifelessdoctormo: sure, you can see what bzr-gtk does (uses the API), or qbzr does (wrapps the command line) or bzr-eclipse does (uses the bzr-xmloutput plugin to control it)09:39
doctormolifeless: Looking at all of those, bzr-gtk doesn't seem to do anything, it's magic.09:40
bialixdoctormo: look at qbzr09:40
doctormobialix: Is wrapping the command line to prefered way of getting progress status?09:41
lifelessdoctormo: I'm not sure why you'd say its magic :)09:41
doctormolifeless: magic == I don't understand it09:41
lifelessdoctormo: Not to me; install a ui_factory is what I think is preferred.09:41
lifelessdoctormo: but opinions about 'preferred' are, by definition, subjective.09:42
bialixdoctormo: no, the point not about wrapping09:42
doctormolifeless: yes I can tell the ui_factory is involved, it creates by default a TextProgress class09:42
bialixdoctormo: there is good example of how to install your ui_factory and how to tie it with GUI09:42
lifelessbialix: oh cool, I'll remember that09:43
doctormobialix: In qbzr? thanks09:43
bialixlifeless: is it irony?09:43
bialixor sarcasm perhaps09:43
lifelessbialix: neither.09:44
bialixok, nm09:44
doctormobialix: lifeless believed that qbzr wrapped the command line output, if I understand, so your correction about it using the ui_factory is interesting.09:45
bialixdoctormo: actullay we do both09:45
bialixbut for you is relevant ui_factory part09:45
bialixit's just very closer to wrapping command-line09:45
bialixyou can omit the latter and use the former as example09:46
doctormothanks bialix09:47
bialixdoctormo: it's in qbzr/lib/subprocess.py09:48
doctormobialix: I'm going tomake a simple QUIFactory copy, I assume that's involved too09:48
bialixyes, that's correct09:49
doctormoui.ui_factory = QUIFactory() <- this part I think09:56
doctormobrilliant, got a simple thing up and running.09:58
maxbDoes bzr-explorer "Advanced Commands" work on Windows? It does nothing when I click it.10:44
lifelessdoes anything? :P10:45
bialixmaxb: yes10:45
bialixuntil recently it invoked console shell10:46
bialixnow it launch qrun dialog from qbzr10:46
bialixmaxb: if you have black console window behind -- look there10:46
maxboh, there it is10:46
bialixI suggest to use latest bzr-explorer version from trunk to get qrun instead10:47
bialixthis console thing is a bit buggy10:47
maxbGladly, for my own use on Linux. But I'm briefly evaluating it on Windows for my less technical colleagues10:51
bialixthat's why I'm suggesting using version with qrun10:52
RenatoSilvaIs there a way to customize annotation colors? I want to distinguish clearly with colors the lines below and the lines above a certain revision.11:23
hsndo i have to uninstall old bzr in windows before installing a new one?11:49
bialixhsn: as usual Start -> Settings -> Control Panel -> Add/Remove Programs11:52
ryanhaighhi all im having a problem with the bzr add command13:20
ryanhaighfor some reason when i run bzr add without any arguments it doesn't add one of my subdirectories13:20
RenatoSilvacheck bzr log13:21
RenatoSilvaclean it, then add13:21
ryanhaighif i try to add the directory or any file in it explicity, it is also not added13:21
ryanhaighclean it?13:21
bialixryanhaigh: is this directory ignored?13:22
bialixcheck output of bzr ignored13:22
ryanhaighi have done that the output is blank13:22
bialixdoes this directory holds another branch inside?13:22
RenatoSilvaryanhaigh: if you try to add that specific directory you don't get any error, but the directory is not added?13:23
bialixcan you check this with `bzr info /path/to/dir/which/refuse/to/add` ?13:24
ryanhaighthats right, it remains unkown13:24
bialixthis cannot be true13:24
bialixeither you discover very interesting bug (but I doubt) or you have something unusual with your directory13:25
RenatoSilvaryanhaigh: open the bazaar log and delete the content, then run bzr add dir and check what's outputed there, it may tell you what's happening13:26
ryanhaighhow do i open the bzr log to delete the content?13:27
bialixin your favorite editor13:27
bialixcheck output of bzr version to see where the log located13:27
ryanhaighahh ok, sorr13:27
bialixI bet you have another branch there13:28
RenatoSilvaif so bzr should say something anyway13:28
ryanhaighbialix: you are correct there is another branch13:28
bialixI'm WON! hoorah!13:28
* fullermd stabbies LP13:37
fullermdEvery damn week, it comes up with some new way to send mail I have to filter out, usually into oblivion...13:38
bialixhello fullermd :-)13:47
=== abentley1 is now known as abentley
MvGIf someone is interested in reviewing a bit of trac-bzr code: https://code.launchpad.net/~gagern/trac-bzr/bug274609/+merge/15148 removes some unreachable code, as described in the corresponding bug report. Comments?14:41
MvGbialix, https://code.launchpad.net/~gagern/trac-bzr/bug177683/+merge/15149 might be of special interest to you, as you first merged the original patch regarding bug 177683. Now I've added some str conversions and proper parsing for revids without a branch name. Will you have a look?14:47
ubottuLaunchpad bug 177683 in trac-bzr "All revisions and changesets starts with a comma sign" [Low,Triaged] https://launchpad.net/bugs/17768314:47
=== chx_ is now known as chx
bialixMvG: I need some time to recall what I've doing in the past14:52
bialixMvG: thanks, I'm really interested in trac-bzr stuff, I'll look into your code tonight14:52
MvGbialix: That's great!14:53
MvGThanks a lot.14:53
bialixthank *you* a lot!14:53
MvGcd wo14:53
MvG(wrong window...)14:54
bialixcd wrong window - lol14:57
bialixMvG: ping15:55
MvGbialix: pong15:55
bialixMvG: from time to time I'm thinking about speed up of trac-bzr operations15:55
bialixdo you have any plans on this front?15:56
MvGNot yet.15:56
bialixI'm mulling idea of some sort of cache15:56
MvGThere are already some caches in place.15:56
MvGAnd I believe bzrlib itself does some caching as well.15:56
bialixfor me is the worst case is to get Timeline with "Repository checkins" selected15:56
bialixfor my server it takes several minutes15:57
bialixMvG: I'm not sure bzrlib cache help here15:58
MvGOK, that's a thing that should be fixable.15:58
bialixthat will be nice15:59
bialixMvG: do you have any hints re debugging trac-bzr plugin?15:59
bialixhow you do development actually?16:00
MvGDebugging performance?16:00
bialixbugs in first place16:00
bialixperformance is second16:00
MvGAs of last friday, I've got a dedicated apache for this, running as my user on a non-privileged port, so I don't have to worry about matching IDs.16:01
MvGOn the python part I've discovered virtualenv, so I've set up two different python environments, one for trac 0.10 and one for 0.11.16:02
bialixno, I'm asking how you get info about what's going on inside plugin?16:02
MvGSo far performance hasn't been of interest, so I'm running trac as cgi, which ensures I'm always running the latest code.16:02
bialixin bzrlib there is .bzr.log where one can print debug info16:02
MvGThere is a similar log for trac.16:02
MvGEvery trac component has self.log which provides this.16:02
MvGOnly trac-bzr doesn't use it for the most part.16:02
bialixok, I'll try to use it16:02
bialixis there special reason for this?16:03
bialixreasons for not using logs?16:03
MvGOh yes, and BzrRepository.sync even overwrites this log with None. No clue why that's the case, doesn't seem related to the rest of the commit that introduced it.16:03
bialixMvG: another question: do you think running Trac with built-in server tracd is bad idea?16:04
MvGShould fix this in trunk soon. Do you want to review such a fix?16:04
MvGDepends on the environment.16:04
bialixMvG: I'd like to review, but I need to dive deep enough into the code first16:05
bialixI'm not good hacker re trac-bzr16:05
MvGApache has some nice features for cleaning up malicious requests, which tracd might miss.16:05
bialixtracd is much easier for me, as dev environmenbt16:06
bialixtracd is much easier for me, as dev environment16:06
MvGOther than that, I always want to embed trac inside a larger page, so I wouldn't use it as a production env.16:06
bialixok, understand16:06
MvGFor development it certainly has benefits, and shouldn't hurt in most cases, unless you want to explicitely test something depending on the frontend.16:06
=== deryck is now known as deryck[lunch]
bialixbtw, currently I'm using trac+bzr trunk revno.34 with custom patch applied16:07
MvGWhat custom patch? SOmething suitable for trunk?16:07
bialixI hope so16:08
* bialix pastebins16:08
bialixMvG: http://pastebin.com/d29e24ad116:08
bialixI'm not sure, maybe it already in trunk16:08
bialixI'm stuck with revno 34 and bzrlib 1.5 because later versions does not work well for my case16:09
bialixI have many shared repo and branches on my server16:09
MvGIn a modified version: authors = ";".join(self.revision.get_apparent_authors())16:09
bialixyep, modified version is more correct for newer bzrlib16:10
MvGMultiple shared repos for the same trac env cause trouble.16:10
bialixwhat kind of trouble?16:10
MvGWell, locking for instance. There seems to be code that only locks the whole repo once.16:10
MvGExistence of revid checks in some places.16:11
bialixlocks locks locks16:11
MvGBoth of these I encountered in code that was broken in some other way as well, and which I plan to remove,16:11
MvGSo it might coincidentially work with multiple repos as well, but I wouldn't rely on it yet.16:11
MvGThere is a whishlist for it, iirc.16:11
bialixFor me multiple shared repo is critical feature16:11
bialixwe have many components in our project16:12
bialixkeep all components in one big shared repo proved to be a *bad* idea16:12
eydaimonis it possible to just merge only the changes of a particular revision, and not changes of some previous revisions? let's say repo A has revision 100, and repo B has revision 98. I want to merge in only changes in revision 100 to B, not 99. Can I merge in, and then at a later time merge the changes for 99? Does that require a special syntax?16:12
bialix(performance) of smart server16:12
bialixeydaimon: bzr merge -c10016:12
eydaimonbialix: and then next time I do bzr merge, then c99 will get merged automatically?16:13
bialixalways happy to help16:13
chxMvG: so you are the trac+bzr developer?16:14
MvGchx: I'm the newest member of the trac-bzr-team, i.e. recently got commit permissions on the trac-bzr trunk.16:15
MvGOther than that, I'm mostly busy writing bug fixes for issues I encountered myself, and pushing these for review. Haven't made a single commit to trunk yet.16:15
bialixMvG: re splitting support for 0.10 and 0.11: I'd create new series (say "0.10") and use it for 0.10-specific branch16:16
eydaimonis it possible to merge several changes using -c? I tried range, but it said it's not possible16:17
MvGbialix: Dunno... series are usually for feature-stable releases of the component itself, and I'd wish to include as many new features into the 0.10 branch as possible.16:17
eydaimonwould I have to merge twice?  (I actually want to merge 386 and 387)16:17
bialixMvG: hm? I think they can be used more flexible16:18
eydaimonor do I have to merge 386 first, commit, then merge 387?16:18
bialixeydaimon: if youo want merge from X to Y you need to use: bzr merge -r (X-1)..Y16:19
MvGeydaimon: bzr merge -r 386..38716:19
bialix-r386..387 is equal to -c38716:19
eydaimonoh, so now the -r syntax as opposed to -c?16:19
eydaimonok, thanks16:19
bialixeydaimon: -c is syntax sugar16:19
bialix-cN means -r (N-1)..N16:19
NfNitLoopwhoah.  didn't reailze 'bzr init' in a svn directory would comlplain that it's already a (svn) branch. :p16:20
bialixNfNitLoop: --no-plugins :-)16:20
eydaimonok thanks much guys :) appriciate it16:21
chxMvG: sounds awesome16:24
chxMvG: i am about to use trac+bzr :)16:24
* bialix using trac and trac+bzr 2+ years now and found it very nice tool16:25
MvGchx: Don't hesitate to file any bug you encounter with latest trac-bzr.16:25
chxbialix: really.16:26
bialixTrac has very rich plugins system16:26
bialixon this front it outperform even Redmine16:26
* bialix heavily using IncludeWiki macros16:26
MvGI find the current state of trac-bzr to be somewhat lacking - which is the reason I'm filing that many bug reports, and writing that many fixes... :-)16:29
bialixgiven in mind there is not much activity around trac-bzr development...16:30
bialixMvG: today is only barely usable16:30
bialixMvG: what version of Apache do you recommend?16:32
MvGabentley: http://bazaar.launchpad.net/~trac-bzr-team/trac-bzr/trunk/revision/28.1.146 indicates that you committed the line which sets self.log = None for trac-bzr. Can you recall your reason for this? I know, it has been 3 years ago, but still worth asking, I guess.16:33
MvGbialix: Using 2.2 myself, and would suggest that to others as well.16:34
bialixMvG: thanks16:34
MvGBut my main reason for 2.2 is content negotioation fo static content, so the choice isn't that important for trac.16:34
abentleyMvG: Sorry, I don't remember.16:35
MvGabentley: Understandable. Thanks for looking. Will simply remove that line, as it doesn't seem to make sense in current code.16:35
matt_piHi. I have a terminology problem. REVISION is a name for the currently commited data, or a name for all the data commited before a certain commit (including this commit).16:36
abentleymatt_pi: revision refers to the current state at commit time.  This includes files that were not modified in this commit, but doesn't include old data for files that were modified in this commit.16:39
MvGI just realized that I can't seem to have a lightweight checkout tree of a heavyweight checkout without a tree. Would be useful, though: the lightweight checkout would be my working tree, which i switch from branch to branch as need arises. The heavyweight checkout would be simply a bound branch to ensure that commit and push become atomic, that my trunk will never diverge from upstream trunk unless I explicitely ommit locally.16:39
jelmermvg: in general you can't have checkouts of checkouts16:40
MvGIs there a good reason for this?16:41
matt_piabentley: I think I understand. So in a revision are also included other files that werent changed in a commit. In other words: revision is a status of the whole branch, not only a few files.16:42
abentleymatt_pi: Yes, but I would say "whole tree", not "whole branch", because the branch includes all of the past revisions.  "Snapshot" vs "changeset" is a common distinction.16:44
matt_piabentley: OK, many thanks.16:45
abentleymatt_pi: np16:45
=== beuno is now known as beuno-lunch
=== deryck[lunch] is now known as deryck
=== beuno-lunch is now known as beuno
=== abentley is now known as abentley-lunch
stuartpbHow do I set up bzr-git on Windows?18:31
stuartpbHow do I set up bzr-git on Windows?18:50
stuartpbHow do I set up bzr-git on Windows?19:03
LarstiQehm, same as usual?19:09
* LarstiQ uses neither bzr-git or Windows19:09
LarstiQstuartpb: are you hitting a snag?19:10
stuartpbwell yeah19:12
stuartpbi can't figure out how to install Dulwich for it19:12
* LarstiQ wonders if there is any C code in Dulwich19:13
* LarstiQ acquires a copy19:14
LarstiQstuartpb: yeah, there is C code in there19:15
LarstiQstuartpb: so if there isn't a binary for Dulwich, you'll need to have a functioning Python-extensions-compilation toolchain19:15
chxi just set up my first bzr server. that was not particularly hard. if i want permissions the easiest is to use bzr+ssh and ssh keys isnt it?19:16
LarstiQchx: yes19:17
LarstiQchx: and posix acls19:17
chx(however, the inetd instructions are outdated , seemingly most distributions use xinetd (?). standalone is easy.)19:17
RenatoSilvaverterok: hi19:42
=== abentley-lunch is now known as abentley
Pengbeuno: Copyright assignments for Loggerhead? That's new.20:12
mwhudsonnot really20:12
beunoPeng, it hasn't been as public as it should have been  :)20:12
Peng"(Last modified 14 May 2009)" I guess it isn't new... Huh.20:13
PengI didn't see it on the list last time I looked at that page.20:13
PengMost of Loggerhead's code is copyrighted by specific people.20:13
beunoPeng, does this create a problem for you?20:13
PengOr at least...some large portion.20:13
Pengbeuno: I dislike copyright assignments, but I'd rather do that than stop contributing.20:14
PengOr...it's not a copyright assignment? I don't remember. Anyway.20:14
beunoPeng, unfortunetly, laws are complicated20:15
beunoso we've been asked to do this for all Canonical projects20:15
PengOh yes, it is a copyright assignment.20:15
LarstiQcan't Canonical invest some money in simplifying laws the world over?20:15
beunothe FSF strongly suggests this approach20:15
beunoLarstiQ, if it was feasible, it would probably be money well spent  ;)20:16
beuno(and hi!)20:16
LarstiQbeuno: yes :)20:16
LarstiQheya! :)20:16
LarstiQthere are also jurisdictions where you can't sign (all of) your copyright away20:16
LarstiQah well20:16
PengLarstiQ: The agreement covers that.20:16
LarstiQPeng: ok20:16
PengI already signed it for Bazaar; should I do it for Loggerhead too?20:17
beunoPeng, I think it's the same20:17
PengHmm. The contributor agreement says "The term 'Software' refers to all computer programs created as part of a Canonical programme listed at http://canonical.com/contributors ...", so I guess I unintentionally signed it over for everything, not just Bazaar.20:19
RenatoSilvaPeng: you'd rather assign copyright than stop contributing. How about the company stoping asking contributors to do that?20:20
PengRenatoSilva: Oh. Yes, that would be better.20:21
RenatoSilvabeuno: FSF suggests what approach, the assignment? For a trustable organization afaik (like themselves)20:22
beunoRenatoSilva, yes. I may be very naive, but I expect Canonical to be trustable20:22
beunoyou know, considering they are trusted with basically root access to all Ubuntu users' computers20:23
PengHaha, that's a good point.20:23
* Peng is scared of Canonical now20:23
beunoif you don't trust Canonical, you probably have bigger problems than the Copyright assignement20:23
luksbeuno: well, I think FSF and Canonical have different reasons for it20:23
luksI'm not sure which reason is better though :)20:23
RenatoSilvabeuno: I'm afraid FSF doesn't consider any commercial organization trustable20:24
LarstiQI'm reasonably sure the FSF has a nuanced stance on that20:24
PengI suppose I trust Canonical to behave well with their control of my computer, but I do not necessarily believe they'll do what I want with source code.20:24
PengI already feel funny about how they can and do make it available under other license terms.20:25
PengIt's _probably_ all for a good cause, but _I_ don't know that.20:25
Peng(Well, not necessarily "and do". I don't know that.)20:25
RenatoSilvaI think the assignment to FSF or related organizations is like "GPLv2 or later". You trust FSF is compromized with certain principles and that they won't leave it. So you trust that any later version of GPL is better according to what you believe regarding FOSS. The same way, I think when you disclaim copyright to FSF, you believe that if e.g. they decide switch from GPL to LGPL, that's because they have a good reason.20:28
PengRenatoSilva: Not everybody does the "or later". :D20:28
LarstiQsame thing with Canonical20:29
lifelessPeng: there is only one now; we used to have many seperate ones but consolidated20:30
RenatoSilvaPeng: many do afaik. I think the best reason to not assign copyright to a commercial organization is that because of its nature, there's no guarantee that the company will only use the source code for community benefit rather than its own20:30
Penglifeless: OK. :)20:30
lifelessRenatoSilva: thats like saying 'there are no guarantees'20:31
LarstiQRenatoSilva: there are no guarantees with FSF either.20:32
LarstiQRenatoSilva: it comes down to trust, and I trust Canonical with the Bazaar source.20:32
PengI'm kind of an untrusting person. :\20:32
LarstiQwhether someone else trusts them with the same thing is up to them.20:32
luksLarstiQ: I've seen many posts on the ML lists that suggested that you can talk to Canonical to get a difference license conditions20:32
luksI haven't seen such posts from FSF on FSF software20:32
LarstiQluks: so there is a level of trust etc.20:33
RenatoSilvaPeng: another good reason is to ask the company a good reason for doing that. That is, why do you want to TAKE my code from me? What's bad about the source code belonging to "all people in the earth". It makes difficult to change license? Well, that's reasonable to accept if we're talking about FSF or any non-profit organization, but not for a commercial company.20:34
=== abentley1 is now known as abentley
lifelessRenatoSilva: No one takes the code from you. And updating to newer licences that work better in court as the law changes is a pretty important thing to be able to do.20:35
lifelessor even just to add compatibility with another open source project - like the openssl exception that GPL projects using openssl need.20:36
RenatoSilvaLarstiQ: FSF and Canonical have different natures. I trust FSF much more than Canonical. Actually, I would not trust any commercial company that much, or at all.20:36
LarstiQRenatoSilva: that's your choice, and that's fine.20:37
luksnote that I care about the Bazaar agreement much, but this why I'd have trouble signing it20:37
luksI signed a similar agreement for Qt/Nokia, but they were pretty open that they want it because they want to provide a commercial version20:37
beunoluks, do you feel Canonical is not open about it?20:37
LarstiQluks: right20:37
luksbeuno: everybody here is claiminig that it's because they want to keep the code free20:38
LarstiQbeuno: about wanting to offer a commercial version of bzr?20:38
beunothey *will* use it in other scenarios if the situation comes up20:38
luksbeuno: but tell me that Canonical doesn't offer a non-GPL version of Bazaar20:38
beunoluks, I am not aware that they do20:38
RenatoSilvalifeless: ok, so why not Canonical disclaims copyright to FSF or some non-profit organization? Because they like to have control and be free to do whatever they want in the future, regardless of that meaning that the actual code authors can't do anything about it20:38
lifelessluks: Canonical does not offer a non-GPL version of Bazaar20:39
lifelessluks: have a look at our website; we offer support and training.20:39
lukslifeless: well, I've seen posts on the bzr ML telling people to talk to Canonical about such posibilities20:39
lifelessluks: http://www.canonical.com/projects/bazaar20:40
PengThe Bazaar website *used* to mention it before the redesign.20:40
luks(posts by Canonical employees)20:40
lifelessPeng: perhaps; nevertheless we've never done it, and its not suggested now AFAIK20:41
Penglifeless: Interesting.20:42
lifelessRenatoSilva: I don't really follow your logic there. This has been discussed on the mailing list very recently too.20:43
Penghttp://web.archive.org/web/20080527233931/http://bazaar-vcs.org/: "If you want to embed Bazaar into your products under a different license, please contact us."20:43
PengThat's what it said.20:44
RenatoSilvaluks: withy that single copyright, they can embed Bazaar into commercial software at any time, for own benefit or any other reason (and without notifying the community -- I'm afraid the agreement doesn't even cover this). I don't like this idea, and others don't either (hg users seem to not like this aspect of bazaar)20:44
lifelessPeng: yup.20:44
lifelessPeng: To the best of my knowledge it never happened.20:44
luksRenatoSilva: I know why are they doing it :)20:44
lifelessRenatoSilva: I think you mean 'proprietary' rather than 'commercial'20:45
PengI think this was the third time i started a copyright argument in this channel. :D20:49
RenatoSilvalifeless: yes, as commercial software anre usually proprietary. But what I strictly mean is any derived work that the author would not agree with. For example, I think Bazaar contributors would not like to see their code being distributed as BSD for some customer.20:51
lifelessdo you really think we'd do that?20:52
luksRenatoSilva: Bazaar contributors always had to assign the copyright to Canonical, even if without a signed agreement, I think they would be fine with it20:52
RenatoSilvathe commercial nature is a negative point in that matter. It's the same as saying that you don't trust Chrome binaries, then one says you shouldn't trust FF's either. However, Mozilla foundation is far different from Google, and that makes a big difference in which you trust more (or suspect less)20:56
bialixwhat's the point?20:57
RenatoSilvaluks: I would not be fine. I would not like to see my free time spent for the benefif of all people in a work that now I have no control, and that now is delivered as BSD which may become easily a proprietary software making them (not me) gaining money with my work whose initial intention was to benefit everybody, not someone (and worse, someone *else*).21:01
lifelessRenatoSilva: Even if Canonical went evil and did something like that, the current GPL code would stay GPL, everyone would still be getting the benefit from it.21:02
lifelessbut we're not evil - as stewards of Bazaar I think we do pretty well21:03
RenatoSilvalifeless: ok but as we said, we have no control behind the scenes, unless Canonical includes a compromise in the agreement of informing teh world of anything different they do with the contributions, which would make things less interesting commercially, which makes me wonder if they would do such a thing.21:04
RenatoSilvalifeless: I don't know if you are evil :) But just like we say here in my country, we stay with one feet behind :)21:05
lifelessyou have no control with any assignment anywhere (even FSF).21:06
luksbut the chances of FSF selling your code are pretty thin :)21:06
lukswell, "your"21:07
RenatoSilvalifeless: but FSF is not Canonical, they're different natures.21:07
RenatoSilvayes, can anyone imagine Stallman in some TV commercial selling "hey GNU/Hurd for only $99"21:07
LarstiQRenatoSilva: yeah, for one thing, Canonical employees actually wrote the vast majority of bzr21:08
LarstiQand RMS certainly has nothing to do with the Hurd21:08
RenatoSilvamaybe Bazaar should be maintained by a non-profit organization with legal commitment to public interests21:10
RenatoSilvaabout selling the code, that's much more easy to imagine with a commercial company than with that crazzy man21:10
chxI have a technical question. For trac+bzr i would like to point to one place but if that's one branch then it's not possible to check out / commit parts . I would like to get something like an svn repo (and bzr init-repo is not a branch either)21:11
chxhow do people use trac+bzr to support multiple branches?21:11
mwhudsonlifeless: btw i would be interested what a test for https://code.edge.launchpad.net/~mwhudson/bzr/bytestring-environment-variables/+merge/15113 would look like21:12
mwhudsonlifeless: or more particularly i guess, where it would go21:13
mwhudsonhm, i guess TestTestCaseWithMemoryTransport21:14
bialixchx: I'm not quite understand your question21:16
chxbialix: nevermind21:17
lifelessmwhudson: seems relevant21:17
lifelessmwhudson: perhaps higher up21:17
bialixchx: ?21:17
lifelesschx: this is one of the problems with trac; its got a _very_ svn specific model.21:17
chxbialix: I now read the trac-bzr README and it says "Allows a collection of branches to be treated as a "trac repository", regardless of whether they are related or in the same bzr repository."21:17
bialixluks: evening21:17
bialixchx: yes21:17
mwhudsonlifeless: overrideEnvironmentForTesting, the method i'm patching is on TestCaseWithMemoryTransport21:18
lifelessmwhudson: then ttwmt is right21:18
lukshi bialix21:18
chxI am fine, i am fine, sorry for asking and not RTFMing21:18
bialixluksL how are you?21:18
bialixluks: I have question about lazy_register in qbzr21:18
luksis there a problem with it?21:19
bialixluks: register_lazy_command deliberately don't use plugin_cmds.register_lazy21:20
bialixluks: no, not the problem, I just trying to figure out how to slightly change it21:20
luksI think it should only use plugin_cmds.registry_lazy now21:20
bialixluks: that's my guess as well21:21
luksthere was the problem with overwriting commands21:21
luksbut I see that's now commented how, so it no longer overwrites merge21:21
luksthe custom function was mainly necessary to provide lazy registration before bzrlib supported that21:21
bialixluks: I want to put all lazy commands definitions into big tuple and iterate over it inside one function instead of calling it again and again21:22
luksthat seems good21:22
luksI think bzrtools does something like that, right?21:22
bialixluks: yes, we have conflicts with pipeline plugin about overriding merge21:22
* bialix looks into bzrtools21:23
bialixluks: yes, bzrtools using dict as map between cmd names and aliases21:24
bialixI'd prefer keep them as tuples (as it looks now)21:24
bialixok, thx :-)21:25
luksdidn't help much :)21:25
bialixwell, you said yes two times where I need21:26
bialixthis helps21:26
bialixluks: if you still want to get notifications about new revisions in qbzr trunk you may want to subscribe to trunk2a branch21:26
mwhudsonlifeless: https://code.edge.launchpad.net/~mwhudson/bzr/bytestring-environment-variables/+merge/15136 has a test now, who can we hassle into being the second reviewer?21:27
luksheh, I've been busy enough last weeks that I didn't even notice :)21:27
* bialix hopes it was not too much shameless21:28
luksheh, I see jelmer is also working on bzr-hg21:36
luksI wonder in what state it is21:37
mwhudsonluks: it'll probably a code import option on lp in a couple of months21:38
mwhudsonmaybe even in december i guess21:38
luksdo you think dpush works/will work soon?21:39
mwhudsoni don't know, but would guess on "soon" if it doesn't work yet21:40
luksI need to try it out21:40
luksI really don't get what people like about hg21:41
luksI've tried hard to work with it, but I find my way around it21:41
luksspeaking of the devil :)21:42
lukshi jelmer21:42
meoblast001i set up a bzr repository on my system, how can i make it public?21:42
meoblast001it uses SSH21:42
lifelessmwhudson: Do you have commit access yet?21:42
bialixluks: I don't know why, but I can't force myself to use hg longer then 15 minutes21:42
mwhudsonlifeless: no21:43
luksbialix: I have hard time understanding how they work with multiple branches21:43
lifelesspoolie: ^ mwhudson for commit access?21:43
luksbialix: it seems multiple clones is the way to go, which is just weird21:43
jelmerhey luks21:43
bialixmeoblast001: serve it via http perhaps?21:44
luksjelmer: I was wondering, does dpush work in bzr-hg?21:44
meoblast001hm :/21:44
jelmerluks, no, not yet21:44
meoblast001so just put the repository in /var/www?21:44
meoblast001or make a symlink to the directory? (is that possible)21:44
jelmerluks: well, it might sortof work if you don;t add any new files21:44
bialixluks: multiple branches is not worse, multiple unnamed heads is nightmare21:44
luksjelmer: ok, no problem, I just noticed that you were working on it21:45
luks(on bzr-hg)21:46
bialixwhat's the cool tool to check python sources for unused imports? pyflakes?21:46
* bialix don't remember21:46
bialixhmm, it seems what I'm looking for: https://code.launchpad.net/~mwhudson/pyflakes/support-lazy-imports21:48
bialixmwhudson: your branch still not merged to upstream? hm?21:48
chxoh btw. thanks for using python. i am not python coder. but , that does not stop me from coding in python when there is a need.21:49
mwhudsonbialix: i haven't proposed it, it seems a bit bzrlib specific21:49
chx(I wrote a two way skype-konversation gateway in less than 40 min when i first tried .py coding earlier this year. easy...)21:49
bialixmwhudson: um, ok21:50
bialixchx: it's strange but I've chose bzr mostly because it was written in python (initially)21:52
meoblast001i want to make my repository accessible via HTTP, but i don't want to have to type bzr push bzr+ssh://blah.com/var/www/bzr21:52
meoblast001the /var/www shouldn't be necessary21:52
chxbialix: I picked bzr when meld began to support it (yes. that was very very long ago)21:53
* bialix not using meld unfortunately21:54
chxbialix: now I am migrating my team to it four years later because a) yes, python. we are php guys but I know we won't stuck in a corner because of python b) it's atomic. and it means it. really. one dir , one commit. no messing with less c) easy to learn.21:54
bialixd) it has good GUI21:55
chxsvn and git with its staging area fails b) and after i needed to abandon an svn branch because it got so messed up with subdir commits -- I do not want to be there any more21:56
bialixmwhudson: anyway your branch is cool: `commands.py:22: import of 'sys' could be lazy` -- cool21:56
mwhudsonbialix: yeah, it's ok21:56
bialixthanks mwhudson21:56
lifelessmeoblast001: You can use a bookmark to make 'myserver:' mean 'bzr+ssh://blah.com/var/www/bzr', then you could do 'myserver:foo'21:56
lifelessmeoblast001: (install bzr-bookmarks)21:56
mwhudsonbialix: though it's a bit trigger happy -- not much reason to import sys lazily...21:56
meoblast001lifeless: better question.. how does Launchpad do it?21:57
meoblast001i want a familiar design21:57
lifelessmeoblast001: custom ssh implementation21:57
bialixmwhudson: I'm mostly happy about it's overall behavior21:57
meoblast001lifeless: where can i get this custom ssh implementation?21:57
lifelessmeoblast001: in the launchpad source code21:57
meoblast001and can i run it and a normal ssh at the same time?21:57
lifelessnot on the same port21:58
meoblast001on different ports21:58
lifelessyou'll have to do some development, or run a pretty big subset of launchpad itself21:58
bialixmwhudson: just one nitpick: `pyflakes -h` don't want show me even smallest help21:58
luksdoes it really matter if you type /var/www or not, it's only once21:58
meoblast001lifeless: can you symlink directories?21:59
meoblast001perhaps that is an option21:59
mwhudsonbialix: that's a pyflakes thing, it doesn't do any option processing at all21:59
mwhudsonbialix: and it sucks, yes21:59
bialixmwhudson: bzr teached me to use -h all the time :-/21:59
bialixso now all other utilities that does not react on -h just look sweird22:00
lifelessmeoblast001: yes you can22:00
meoblast001lifeless: that would work perfectly22:00
* bialix loves pyflakes22:06
pooliehello bialix22:16
poolielifeless: mwhudson++22:17
bialixhello poolie :-)22:17
poolielifeless: also, remember, you can use your discretion as to whether a second review is needed22:17
lifelesspoolie: yes, I am.22:17
lifelesspoolie: I've made too many mistakes myself on equally small things to be inclined to short circuit review trivially.22:19
pooliefairy nuff22:19
poolieiwbni launchpad made it more clear which reviews i could vs should do22:19
meoblast001bzr: ERROR: Server sent an unexpected error: ('error', "Unknown repository format: 'Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\\n'")22:20
meoblast001that's 1.9.. shouldn't the Jaunty version of Bazaar work with that?22:20
meoblast001or wait.. i think i have hardy on my server >.<22:20
pooliemeoblast001: there's a hardy 2.0 in the ppa22:20
meoblast001ah, ok22:20
=== cody-somerville_ is now known as cody-somerville
mwhudsonspiv: hello22:28
lifelesspoolie: code.launchpad.net/bazaar/+activereviews is a useful page.22:29
poolieit's a great page22:29
pooliei wouldn't say it's optimal though22:29
bialix2.0.2 and 2.1.0b3 is not annonced yet? where is jam?22:30
mwhudsonb3 got announced, i thought?22:31
bialixmayb channel topic needs tuning then?22:32
mwhudsonspiv: nm22:32
* bialix waves and disappear22:33
lifelessspiv: have you pushed your pqm-submit fixes to trunk?22:33
meoblast001lifeless: another question.. how does Launchpad manage permisions?22:51
meoblast001SSH works using the UNIX filesystem, and permisions are done with groups22:52
mwhudsonlifeless: how does commit access relate to "not having to get two reviews" ?22:53
lifelessmwhudson: as a committer you count ass one of the two reviews.22:54
lifelessand also get to land your own things. I'm bored of ferrying things for you :)22:54
mwhudsonlifeless: ok22:54
Pengmeoblast001: Launchpad runs a custom SSH server.22:54
mwhudsonlifeless: i was aware the two were related, but not sure that they were precisely the same22:55
lifelessmwhudson: oh and it also means you can be the +1 on other peoples merges.23:14
mwhudsonlifeless: ah right23:14
mwhudsonlifeless: so, to be sure, you're ok with me landing that bytestring-environment branch?23:18
lifelessyes, with poolies concerns addressed.23:19
spmlifeless: I've only added him to bzr, not bazaar_releasemgr - that was the intent y/n?23:19
lifelessspm: yes, its fine23:19
lifelessjames_w: ever seen this:23:21
lifelessbzr merge-upstream ../lptools-0.0.1.tar.gz bzr+ssh://bazaar.launchpad.net/~dobey/lptools/trunk/ --version=0.0.123:21
lifelessUsing distribution karmic23:21
lifelessgzip: stdout: Broken pipe23:21
lifelesstar: Child returned status 123:21
lifelesstar: Exiting with failure status due to previous errors23:21
lifelessrunning tar xzf ...ptools_0.0.1.orig.tar.gz -C /tmp/tmphzmaq2 --strip-components 1 by hand works23:22
mwhudsonlifeless: oh, i hadn't seen his review yet23:25
james_wlifeless: please file a bug, I think I know the cause23:28
lamalexDoes anyone know about the bzr integration for monodevelop?23:33
spivlifeless: not yet, I still haven't gotten around to looking at the tests23:36
lifelessjames_w: if you can give me a hint I'd love to fix it - am a tad blocked.23:37
james_wlifeless: search for preexec_fn in the source23:37
james_wsomething like that anyway23:38
james_wsubprocess doesn't reset SIGCHILD23:38
james_wso you have to do it for it23:38
james_wit might be something else, but it looks sufficiently similar23:38
lifelessjames_w: tar is invoked using 'os.system'23:38
lifelessimport_dsc.py _extract_tarball_to_tempdir23:38
james_wwell, maybe that is affected too23:40
lifelessso, you change SIGCHILD in bzr builddeb ?23:40
james_wexcept to reset it when something else is execed23:40
lifelessdo you mean SIGPIPE ?23:41
james_wyeah, sorry23:41
lifelessI'll submit a branch shortly.23:44
mwhudsonperhaps dumping this comment into irc isn't super appropriate23:45
mwhudsonbut from launchpad's pov it would help to know at connection time whether bzr ever intended to write to the thing being opened23:46
lifelessmwhudson: it would help bzr too in some ways23:46
mwhudsoni guess it would be quite an upheaval23:47
lifelessjames_w: linked23:54
lifelessjames_w: so bzr-builder -> 2a. spm has a script that can upgrade everyones branches.23:55
spmI do?23:55
lifelessspm: jkakars thing23:56
spmdidn't work :-)23:56
lifelessspm: data problem, not script23:56
lifelessspm: remember the old bug with bzr branches not having enough data?23:57
spmheh; doesn't ring a bell....23:57
eric_fanyone have a script (that will work on OS X) to do a "bzr status" on multiple project's in a workspace? I had CD'ing into each folder and running bzr status!23:57
lifelesseric_f: for dir in `ls $1` ...23:57
lifelessspm: bug 364 something23:58
ubottuBug 364 on http://launchpad.net/bugs/364 is private23:58
spivBug 35403623:58
ubottuLaunchpad bug 354036 in bzr "ErrorFromSmartServer - AbsentContentFactory (unfixable by users) error when pulling a branch from the mirrored area" [Undecided,Confirmed] https://launchpad.net/bugs/35403623:58
eric_flifeless: just type that in the console?23:59
spmspiv: that scares me when you do that. ;-)23:59
spivspm: that bug number has been etched into my brain.23:59
lifelessjkakar: ^23:59
spivI actually checked the NEWS file just in case, but no, I remembered it all too clearly :)23:59

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