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

peitschieNET||abuse: you said you have a branch on your local machine... is that a branch or a checkout?00:27
NET||abusebranch00:27
peitschieNET||abuse: did you do a pull or merge on your local branch to try and get the changes from the server branch?00:34
NET||abusepull00:34
=== timchen119 is now known as nasloc__
spivvila: https://bugs.launchpad.net/bzr/+bug/67238203:23
ubot5Launchpad bug 672382 in Bazaar "bzr config output for list values is ugly (affected: 1, heat: 6)" [Medium,Confirmed]03:23
pooliehi all03:37
spivpoolie: hey, welcome back!03:43
pooliehi there03:43
poolieit's good to be back; those were not the smoothest flights i ever had03:44
spivI imagine Qantas is pretty chaotic atm.03:44
poolievery03:58
pooliethere were something like 10 staff deadheading on our flight03:58
pooliei guess they are moving a lot of people and equipment around to try to cope; the a380s probably carry nearly twice what the 747s do03:58
lifelesspoolie: lol - boeing considered a 650seat 74704:23
lifelesspoolie: the 400ER 3-class seats 416 according to  http://en.wikipedia.org/wiki/Boeing_74704:24
lifelesspoolie: and the A380 45004:25
lifeless(from adding the numbers in http://www.seatguru.com/airlines/Qantas_Airways/Qantas_Airways_Airbus_A380.php)04:25
poolieok, and the a380 is somewhere around 650?04:26
poolieah, so not such a big difference04:26
pooliei guess the qf a380s have a lot of business class seats04:26
lifeless72!04:26
lifelesshttp://www.qantas.com.au/travel/airlines/a380/global/en agrees with the figures04:27
poolieon my flight across they realocated some business seats to premium class, and some premium seats to economy04:28
lifelessyou were scheduled on an a380 flight ?04:28
poolieon the way back i was meant to be on an a380 from lax-syd04:29
lifelessnice04:29
pooliei eventually flew on a 747 because all their a380s are grounded04:29
poolieit was very chaotic04:30
pooliesome people had already been waiting around LA for three days04:30
lifelesshttp://www.nzherald.co.nz/business/news/article.cfm?c_id=3&objectid=1068610904:30
lifelessemirates seem to have an excellent deal there04:31
lifeless(if you're paying in that bracket)04:31
pooliei think this weekend is a great demonstration that you can pay 5 figures for a 1st class ticket and still be stuffed around for hours04:32
lifelessfor sure04:32
lifelessas far as I'm concerned its all about the sleeping04:33
poolieperhaps slightly more considerately, but they still have to stand around in the gate lounge wondering if they will ever leave04:33
poolieme too04:33
lifelesssleeping and power04:33
lifelessand air NZ have power in economy ;)04:33
pooliei used points to get premium to sfo on the way across, and ended up getting a business physical seat04:33
poolie(with premium-grade food etc)04:33
poolieand that was brilliant04:33
lifelesspoolie: -lol- nice04:33
lifelessI'm surprised they bothered splitting your menu our04:34
lifelessout04:34
spivpoolie: hurrah!04:34
lifelessok, afkish04:34
pooliei think they have semipermanently reallocated some rows to other classes04:34
pooliehugh got a premium seat without technically being upgraded04:34
poolieanyhow i'm just catching up on bills, mail stuff04:35
poolieping me if there's anything urgent04:35
spiv*nod*04:35
vilahi all !07:00
=== gthorslund_ is now known as gthorslund
=== vila changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: vila | Release Manager: vila | 2.3b3 has gone gold, time to build the installers ! | work on bzr: http://webapps.ubuntu.com/employment/canonical_BSE/
* KombuchaKip is unsure why his client randomly decided to log himself into #bzr07:02
gthorslundhi vila!07:03
vila_o/07:03
pooliehello vila07:46
vilapoolie: hey !07:46
pooliehow are things with you?07:50
vilafine ! A large plate for the week but I'm hungry :-P07:50
vilapp'ing, releasing 2.3b3, more conflict resolution, bzr config bugs, plenty of fun ahead :)07:51
pooliecool :)07:51
pooliei've seen some of this07:51
pooliethe conflict features sound good07:52
poolieit seesm like it's more in the way of user feedback than bugs as such?07:52
vilahmm, right, the implementation is incomplete so that first triggered a bug, but that's still incomplete. I think I can implement --prefer-this/--prefer-other/--take-both quite easily now (which is why I didn't implement --take-this/--take-other for text conflicts in the first place)07:53
viladeep down though, the bug is revealing a hole in the test coverage (big surprise :-)07:54
vilaoh, and I'd like to switch to sphinx for good too (bug I'm not sure I will be able to tackle this one *this* week ;)07:56
fullermdGetting lazy in your old age or somethin'?   :p07:57
vilahehe07:57
vilamy age always seem to inversely proportional to the fun I have, or something ;)07:58
fullermdWell, at least you spend less on bail money  ;)07:59
vilaoh, and I'd like to implement 'bzr gardener pull'  which should allow to mirror a set of branches with a single command08:01
pooliethat would be kind of nice08:01
poolieit'd be better if it could get unified with other things that deal with sets of branches, like colo08:02
pooliei may package that this week, if max and jelmer haven't already08:02
vilawell, there are a couple of long term ideas I'd like to implement there (colo and looms support included), so I'd prefer to keep it separated for now08:04
poolievila did john tell you anything much about uds?08:04
poolieit was a good trip08:05
poolie(well, the travel kinda sucked, but the meetings were good)08:05
vilapoolie: not that much, he seem pretty busy on other subjects these days...08:05
GaryvdMHi all08:05
pooliewhen i get my thoughts in order i'll send an update08:05
vilapoolie: and I couldn't find the time to track UDS08:05
vilapoolie: cool08:05
pooliei feel a bit more convinced we should focus together on a smaller set of topics08:06
vilaGaryvdM: hey !08:06
GaryvdMvila: I should be able to build windows installers tonight08:06
poolieand set them as goals for 2.308:06
pooliehi gary08:06
vilaGaryvdM: great !08:06
vilapoolie: my foci for 2.3 are conflict resolution, config, sphinx, automated installer build, nightlies, I'll stop there ;)08:08
jelmermwhudson: Did you manage to figure out what was wrong with the twisted branch?08:09
jelmer'morning vila, poolie, GaryvdM08:09
GaryvdMHi jelmer08:09
vilathere is certainly work to do on tree transform, in-memory trees for tests for which I may find simple steps to progress08:09
vilajelmer: _o/08:09
pooliehi there jelmer08:10
vilapoolie: in-memory trees is something I may start playing with in bzr-gardener where it will be easy to measure performance gains08:10
poolievila, i think those are all good things (and they're pretty much what i thought you were doing)08:11
vilapoolie: better ancestry graphs handling is a bit more work but again bzr-gardener would be a good sand box08:11
pooliebut i wonder if we should either get more people onto them too, or set specific targets for 2.308:11
vilapoolie: I agree with the feeling but I haven't yet found the right means :-}08:12
pooliegenerally speaking i'm not a big fan of putting time into estimation when you could just spend it doing things, but...08:12
vilapoolie: I have a bunch of notes about the next generation config I should submit (noted in my TODO) but it's still too much brain dump so far08:12
vilapoolie: yeah, it's even harder if you try to do time estimates if you don't do the work yourself08:13
vilameh08:13
vilait's even harder to do reliable time estimates for things you don't do yourself08:14
fullermdThat's never stopped my clients from telling me how long things should take...08:21
vilahehe, funny, I explained that recently: first you estimate how long it will take, then the sales guy decides how much it will sell it and when the whole price is decided, a new schedule is deduced08:23
vilasomehow the sales guy always shorten the delay instead of the unit price, go figure why most projects are behind schedule after that...08:24
spivfullermd: perhaps the deal should be "you can tell me how long it will take if I can then tell you what the 'per-hour' rate will be"08:25
vilaspiv: oh, you *can* say that before the price is fixed, everybody always agree at this point :)08:25
fullermdI was talking with this guy I work with the other week about our respective current projects, both of which are wildly beyond their original conceptions in every way.08:26
fullermdHim: After this, I'm going to feel no shame at all about turning in astronomical estimates in the future.08:26
fullermdMe: I said that the last 6 projects.  I've learned that I suck at astronomy.08:26
vilafullermd: trivial details we don't want to hear about, what we care is: is is still the same price and the same delay, that's what you signed08:27
fullermdOh sure.  It's just not the same project anymore   :)08:28
vilaMe: but you said you wanted 'X' not half of the alphabet ! Them: don't start with the details again :)08:28
vilapoolie: do you have any pending mail for contributor agreements ?08:51
pooliemeaning new submissions?08:52
vilayup08:52
pooliefrom tzeentch?08:53
vilaexactly08:53
vilaping losa, any news or feedback about rt #41340 ?08:55
vilaDoes anyone know the IRC nick for nmb ?08:58
vilaaka Neil Martinsen-Burrell08:58
vilapoolie, nmb: Am I nitpicking too much if I prefer check_output=True over blank_output_matches_anything=False in  https://code.edge.launchpad.net/~nmb/bzr/662509-ignore-blanks/+merge/38889 ?09:02
vilathere is a slight ambiguity there that I fear will come back haunt us later...09:02
poolievila, i don't seem to have a mail about that from tzeentch09:02
pooliei should go soon09:02
GaryvdMvila: it seems he does use 'nmb' - see http://irclogs.ubuntu.com/2008/08/26/%23bzr.html09:02
vilapoolie: ok, I'll ping him via the review again then09:03
vilaGaryvdM: great, thanks09:03
poolieto me 'check_output' doesn't make it so clear that this is specifically about the handling of blank output09:04
pooliealso i think generally if there's a varargs option that defaults to off, it's better to have the non-default state be thing=True09:04
vilaok, then how about *empty*_output_matches_anything instead of blank_output_matches_anything09:05
vilawhich is really the itching part09:06
vilaI still need to implement it for the test-script command anyway so I'm not asking nmb to do it09:07
poolieso the difference between 'empty' and 'blank' is key?09:14
vilapoolie: well, 'key' may be a bit strong, but 'blank' in my mind means that a blank line is allowed which isn't true09:22
poolietrue09:25
poolieok, so s/blank/empty/ would be fine with me09:25
poolieor even s//null09:25
vilak09:26
vilaso I'll make a submission with this tweak and implement it for test-script in a superseding submission09:27
poolieok09:32
poolieso it's good night from me...09:32
jbowtieJust released bzr-tfs 0.3.0, with TFS 2010 and tfs.codeplex.com support09:36
jelmerjbowtie: \o/09:38
GaryvdMBla - no python2.4/2.5 in lucid/mavrick09:47
* GaryvdM starts building karmic vm...09:48
vilaGaryvdM: err, I thought you can still install 2.4/2.5 in lucid no ?09:48
GaryvdMvila: you can build from source, but you can't apt-get install09:49
GaryvdMhttps://launchpad.net/ubuntu/+source/python2.5 - no lucid/maverick09:50
vilaGaryvdM: my bad, you're right09:50
vilaGaryvdM: I knew I had a VM for that, just misremember lucid instead of karmic ;)09:51
fullermdAll those adjectives sound alike to me  ;p10:09
maxbGaryvdM: https://launchpad.net/~maxb/+archive/preserved may help for 2.5/lucid10:14
mgzjbowtie: you should make a post in that IronPython vcs thread10:22
mgzright, I'm off out.10:31
GaryvdMmaxb: Thanks.10:32
* GaryvdM waves to mgz10:32
vilaping losa, any news or feedback about rt #41340 ?10:52
vilamgz: rats, I missed you, ping me when you're back11:03
vilaping LOSA13:01
vilaping losa14:21
Chexvila: good morning there14:22
vilaChex: good morning !14:23
vilaChex:  any news or feedback about rt #41340 ?14:23
Chexvila: I am working on clearing a backlog of LOSA requests, give me a bit and  I will get back to you14:30
vilaChex: sure14:31
elmohey, how do I get a specific branch using bzr-git?15:39
jelmerelmo: hi15:39
elmobzr: ERROR: The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'.15:39
jelmerelmo: there's no way to do that at the moment (bzr lacks the UI to specify non-head branches), although you can import all branches using "bzr git-import"15:39
elmoalso, ^-- what?15:40
elmojelmer: ok15:40
elmoI don't think i want to import all branches, that'd probably be rude15:40
jelmerelmo: your repository contains git submodules, which can not be mapped to anything in bzr yet15:40
elmoI guess I'll just have to face the music^Wgit15:40
jelmerelmo: "git clone" will fetch all branches too, so I don't think it would too rude to fetch all branches15:40
jelmerelmo: but yeah, for the moment you don't really have an alternative to using git if there are submodules.15:41
=== beuno is now known as beuno-lunch
=== deryck is now known as deryck[lunch]
quicksilvervila: are you an ediff expert?16:42
vilaquicksilver: ask your question, we'll see ;)16:45
quicksilvervila: I had a conflict which had more 'regions' that it should have16:45
quicksilvervila: two entirely different changes, coincidentally, shared a common line in the middle.16:45
vilaweird but better than the opposite no ?16:45
=== beuno-lunch is now known as beuno
quicksilvervila: I wanted to tell ediff "treat these two differences as one big difference"16:46
quicksilverso that I could then press the button which means 'keep both'16:46
vilawhy don't just you do it twice ?16:46
vilaquicksilver: you know you can edit the regions too and then ask ediff to keep whatever you want16:47
vilaha no, you mean they shouldn't overlap the way they are displayed ?16:48
quicksilvervila: takes a moment to explain.16:51
quicksilvervila: tree A has "{preA}{common}{postA}"; tree B has "{preB}{common}{postB}"16:51
quicksilvervila: correct resolution is "{preA}{common}{postA} {preB}{common}{postB}"16:51
quicksilvervila: if I press "keep both" twice, I will get lines all interleave16:52
quicksilver"{preA}{preB}{common}{postA}{postB}"16:52
quicksilvervila: see?16:52
vilayeah, so you need to edit manually then16:52
quicksilverif I could say "treat this as one difference"16:52
quicksilverthen "keep both" would be the right thing.16:52
* vila nods16:52
viladoes it occur frequently ?16:53
quicksilverin fact {common} was "my $self=shift;" which is a very common line in perl.16:53
quicksilverlikely to occur at the beginning of many functions.16:53
vilayeah, as do '{' and such :-/16:53
quicksilveryes, that would be another obvious example16:53
quicksilver(although I've never had it happen with '{' I don't think)16:53
vilaweak point in the diff algorithm...16:53
* quicksilver nods16:53
LeoNerdI've often wanted with diff to "pin" two lines, to say that a specific line on each side was the "same" line16:54
quicksilverthis is the first time I remember it happening exactly like this.16:54
vilapretty rare given the few feedback we get on such cases16:54
quicksilvervila: funnily enough I switched from emacs to Apple's Filemerge.app to resolve this one.16:54
quicksilverand Filemerge did the right thing anyway.16:54
quicksilverno idea why. It must have some heuristics for combining nearby regions.16:55
vilabut the conflicts were generated by bzr right ?16:55
quicksilveryes.16:55
quicksilverI gave filemerge all four files file{,.BASE,.OTHER,.THIS}16:55
quicksilverand it worked it out.16:55
vilaso patiencediff, the algo we use, is *generally* better, partly because it found this common line :-/16:55
quicksilver;)16:56
vilaso Filemerge certainly use a different algorithm and recalculate the conflicts from scratch ignoring bzr proposals16:56
vilaI don't think we have an easy way to change the diff algo used by merge16:56
vilathere are discussions about that though16:57
* quicksilver nods16:57
quicksilverI don't often get conflicts which annoy me16:57
quicksilverbut then again, we don't often let branches diverge all that far16:57
quicksilverthis was a particularly long-lived, far-diverged branch.16:57
vilayou can try 'bzr remerge <file>' with various options (but keep a copy of your file with your conflict resolution, remerge will destroy them)16:58
mgzvila ping, but I'm only in for an hour.17:04
vilamgz: ok, I wanted to ask about your connection hook mp17:04
mgzgoforit.17:05
vilamgz: I think you should put it back in NeedsReview state so we can ping spiv :)17:05
mgzthat sounds reasonable.17:06
vilaI thought about it a bit more and I'm pretty sure we never reconnect because most of the time bzr+ssh is used and ssh never drops connections (or at least *I* never experimented that nor have I heard about such cases)17:07
vilaso until reconnect is implemented for smart mediums, we can have two hooks, one for smart medium and one for the other transports17:08
vilathey don't have to have the same signature at least to start with17:08
mgzsounds like it would work.17:08
mgzhow much are we worried about burdening our future selves with interfaces we don't want any more?17:08
vilaeven if not perfect, that would allow progress in the right direction17:09
vilawell, I don't know, but most probably at connection time you want to know the url and whatever info you can can gather about the client which is not much17:10
quicksilvervila: hmm, right.17:10
quicksilvervila: "weave" does a better job, for my needs, for this specific case17:10
quicksilvervila: what I mean is that 'weave' treats it as one big difference region17:11
quicksilverso 'keep both' is the right thing17:11
vilaquicksilver: honestly no idea, but that the one I would try first17:11
* quicksilver nods17:11
quicksilverthanks17:11
quicksilverah no, it did something odd17:11
quicksilverit took into account my local changes already17:11
quicksilverhmm17:11
quicksilverI think I needed to back out my changes before remerging.17:11
vilaquicksilver: it is supposed to do a better job for highly diverged branches17:12
vilaquicksilver: err, what ? remerge redo the merge, it's not supposed to do that on top of your modifications17:13
quicksilvervila: I had already resolved the conflict17:14
quicksilverit appeared to take advante of my current file17:14
quicksilverthe stuff in "TREE" contained the lines that, in fact, were never in "TREE"17:15
quicksilver(they were only present in OTHER, but they were present in my locally resolved copy of course)17:15
* vila scratches head17:17
vilaquicksilver: make a backup, then 'bzr revert <file>' 'bzr remerge --merge-type weave <file'17:19
vila>17:19
quicksilvervila: OK, expected result now.17:21
quicksilvervila: amusingly, smerge-ediff then "undoes" that improvment by automatically refining the diff when you enter ediff ;P17:26
=== deryck[lunch] is now known as deryck
vila:)17:26
=== zyga is now known as zyga-afk
abentleyjam, james_w: recipe builds of lp:qtwebkit are causing problems because branching lp:qtwebit is taking lots of memory during the fetch.  My machine is up to 1G so far.18:52
james_wabentley, is this what was the immediate cause of the rollback of lp-buildd during UDS?18:53
abentleyjames_w: it seems likely.18:54
abentleyjames_w: Our logging isn't very good, so I can't be sure about the precise cause.18:54
james_wok18:55
abentleybigjools believes that the large memory consumption is causing excessive swapping, which reduces responsiveness, which breaks other builders because we're doing synchronous polling.18:55
james_wabentley, I don't think it's a bzr-builder problem exactly? Just fetching with bzr shows the high memory usage?18:55
jamjames_w: my direct test showed about 1gb for a "bzr branch"18:55
jamit is just a huge branch18:55
jamwide and deep18:56
jam(lots of files, lots of history)18:56
abentleyjames_w: yes, but maybe we can avoid the problem in bzr-builder.18:56
jamabentley: we killed the build earlier, not sure what to do right now18:56
abentleyjam: VmPeak: 1487216 kB here.18:57
jamabentley: 64bit machine?18:57
jam(I was testing on 32)18:57
abentleyjam, no, 32.18:57
abentleyjam, AIUI 1G is the max physical memory we can hope for.18:57
jamabentley: anyway it is arguably a bzrlib problem, but we don't have any quick-and-fast answers there18:58
jamI cut it in half for bzr 2.2, but large branches still take a lot of memory18:58
jamit is mostly the CHK stuff that is the problem18:58
abentleyjam, Okay, I wasn't sure what the status was.  Thanks.18:58
abentleyjames_w: would it be reasonable to do lightweight checkouts instead of copying the branch?18:59
=== Meths_ is now known as Meths
=== yailuj24 is now known as nailuj24
james_wabentley, we could if we analyze the recipe to check if we will do a commit as we build it19:02
abentleyjames_w: How do we determine whether we'll do a commit?19:03
james_wabentley, I think commits are just done after merges currently, but I can't remember for sure19:04
abentleyjames_w: they are done so that subsequent merges can use the correct parent information?19:05
james_wabentley, yes19:06
james_wnest-part as well now19:06
james_wso pretty much every recipe will commit19:06
abentleyjames_w: Okay, maybe stacked branches instead of lightweight checkouts?19:07
james_wyes, that would work19:07
james_wwill that cut down memory usage in this case?19:07
abentleyjames_w: Okay, I'll see if that actually cuts down memory usage.19:07
james_wheh :-)19:08
jamjames_w, abentley: Except for the current bug that we refuse to commit in a stacked branch because of issues with stacking and basis inventories19:08
james_wah19:08
abentleyjam, doh.19:09
abentleyjames_w: btw, nest-part is a partial merge, so its parent information should not be recorded.19:09
james_wabentley, I assume that is taken care of19:10
abentleyjames_w: Sorry, what do you mean by "nest-part as well now"?19:11
james_wabentley, nest-part does a commit after doing the work19:20
abentleyjames_w: I can understand that merge would do a commit after doing the work in order to allow subsequent merges to use the correct parent information.  Since nest-part cannot introduce parent information, why does it do a commit?19:21
james_wabentley, I don't know19:22
=== lifeless_ is now known as lifeless
mwhudsonjelmer: nothing more than was discussed here19:51
=== zyga-afk is now known as khr
=== khr is now known as zyga
BasicOSXbzr branch remote only gives me the .bzr directory, drawing a blank on how to get the actual files to work on. Anyone help me?21:06
lifelessyou've got a local notrees shared repo21:09
lifeless'bzr checkout .' will populate a tree on a branch21:09
jammwhudson: sorry about the email spam. I normally don't re-use branches, does it send 1 email per mainline rev?21:10
mwhudsonjam: it's ok, i can ignore email pretty effectively :)21:13
mwhudsonand yeah, one mail per rev21:13
=== Ursinha is now known as Ursinha-afk
jammwhudson: do you know if there is a decent way to check if a daemon has exited? (Namely, something that is not a child so you can't waitpid() on it)21:22
mwhudsonjam: not really, you can send the "signal" 0 to it if you had the pid and interpret the result21:23
jammwhudson: this is for the test suite. the mthaddon21:24
jamnoted that we needed a pid file21:24
jamso that indicated I should be daemonizing21:24
jamand I wanted to start and stop such a thing cleanly21:24
jamand have the test suite wait for it to exit21:24
jambut... not very easy to get right, from what I can tell21:24
exarkunIf you rely on PIDs, then there's race conditions21:25
jamexarkun: there is, but I'm not worried about spawning 32k processes in the meantime21:25
exarkunIf the daemon is listening on a unix socket, then connect attempts to that socket will begin to fail after it exits21:25
exarkunjam: It's not just processes.21:26
exarkunMaybe it's just as unlikely to have a TID collision, but I don't know how TIDs are allocated.21:26
jammwhudson: I don't remember if you're a vim or emacs guy. Any chance you know about pyflakes + vim?21:40
mwhudsonjam: i've been using emacs for ~one third of my life now :-)21:41
mwhudsonjam: for the daemons, there is some hair in the launchpad code base for this already21:41
mwhudsonjam: lifeless has been working on it recently, i think there is a librarianfixture somewhere you could maybe crib from21:42
jammwhudson: I'm not sure if that is a long time or not :)21:42
mwhudsonalthough that might be oriented around twisted daemons, come to think of it21:42
jammwhudson: I went with a simple loop around os.kill(..., 0) and trapping ESRCH21:43
jammwhudson: mind if I nominate you to review the updated patch?21:57
=== zyga is now known as zyga-afk
mwhudsonjam: no22:00
jammwhudson: https://code.edge.launchpad.net/~jameinel/launchpad/lp-service/+merge/4038622:01
jamI don't know the specific urgency22:01
jamI can't deploy to qastaging until that is fixed22:01
jambut the l-o-s-22:01
jamare out-of-town this week22:01
jamso I may not be able to anyway,22:02
mwhudsoni really hope there's some library code somewhere you could have used rather than writing all that from scratch :/22:04
mwhudsonlifeless: hi22:04
lifelesshi22:05
mwhudsonlifeless: i know you've been working on external process stuff for tests recently, can you look at https://code.edge.launchpad.net/~jameinel/launchpad/lp-service/+merge/40386 ?22:05
peitschiemornin everybody :)22:05
mwhudsonlifeless: and see if you know if there is library code for any of this?22:06
lifelessthere is in twistd22:06
mwhudsonyeah22:08
mwhudsoni guess that's a "no" then really22:08
jammwhudson: well the fork-a-daemon code was taken from a "python daemon" search and tweaked for my use case22:09
jamso I didn't have to write it completely manually22:10
lifelessmwhudson: that glue isn't what I've been working on; though I'd certainly want a Fixture wrapping it.22:10
lifelessit would be nice to have bin/run know about it too22:10
mwhudsonbin/run runs the service already, but not as a daemon22:11
jamlifeless: yeah, bin/run and runlaunchpad.py know how to do it, but that isn't how they run things in production22:12
jamjust one of the pain points for this experiment.22:13
mwhudsonjam: might it be better to wait for the daemon to respond to hello than to write its pid file?22:17
jammwhudson: I'm not sure i understand22:17
mwhudsonjam: in TestCaseWithLPForkingServiceDaemon._start_subprocess22:18
jamare you saying the service shouldn't write its own pid file until it gets a request?22:18
mwhudsonjam: no, i'm saying the test helper should wait until a request gets a response22:18
jammwhudson: fair point, anything else?22:20
millunhi guys22:20
milluncan i ask something?22:20
milluni've pushed a branch up on an FTP account22:20
millunwhat do i do now? (in bzr explorer)22:21
jammwhudson: I need the pid for other reasons, but I could wait for hello and then check the file22:21
millunwhen i try to checkout - bzr explorer asks me like 3 times about the password22:21
mwhudsonjam: it just seems that there is a tiny possibility of a race22:21
mwhudsonwith the current code22:21
jammillun: I believe the recommendation is to use a full branch and not to use a lightweight checkout for a remote branch22:22
jammwhudson: where?22:22
jamI don't doubt it22:22
jamyou can't use the normal "waitpid()" sort of tools22:22
mwhudsonjam: just the thing we were talking about already22:22
mwhudsonthe daemon writes this pid before it listens on the socket22:22
millunjam,22:23
millunjam i thought at first that i need to checkout becAuse branching offered me shared repository while i need colocated22:24
millunright?22:24
spiv'write pid file' and 'service is ready' aren't quite the same thing.22:24
jammillun: if you need collocated, you still want a local branch to checkout22:24
pooliehi mwhudson, jam22:25
pooliespiv22:25
jamspiv: well, it could be, it depends how I write the code :)22:25
millunis collocated already a property of the branch? or it matters from user to user22:25
jammillun: layout is a property of the user22:25
jamwell, location22:26
millunBind new branch to parent location? (should i check this?22:27
milluni am using colocated branches in /Var/www/projectname22:27
GaryvdMmillun: A work arround to the password problem is to put the password in authentication.conf (Settings -> Credentials in bzr explorer) http://doc.bazaar.canonical.com/latest/en/user-reference/configuration-help.html#the-authentication-configuration-file-authentication-conf22:28
GaryvdMmillun: I'm working on making bzr explorer/qbzr keep it connections open, so that it does not have to ask for the password so often, but this is going to take a while...22:30
pooliehi there GaryvdM22:32
GaryvdMHi poolie22:32
mwhudsonjam: i asked for a couple of small changes22:32
jammwhudson: I was pretty sure that you need setsid() to guarantee you'll disconnect from the terminal22:34
mwhudsonjam: ok22:35
jammwhudson: http://www.itp.uzh.ch/~dpotter/howto/daemonize22:35
milluncool GaryvdM22:35
millunjam: so i need to create a shared repo in /var/www/ and branch to /var/www/projectname. instead of /var/www/projectname/trunk22:38
jambtw, hi poolie, nice to you have you back around and online22:38
pooliethanks, it's good to be back22:39
pooliewe should send some news from uds while it's relatviely fresh22:39
glyphHello!22:40
millundoes it make any sense?22:40
glyphI have recently discovered that the twistedmatrix.com bzr mirror has some old revisions that were generated with an earlier version of bzr-svn ("v3" in revids, I don't know what version that corresponds to)22:41
glyphand this causes problems22:41
glyphI am wondering how I should go about fixing this22:41
glyphor rather, what the suggested 'best practice' (if there is such a thing) for dealing with data which is similarly not-quite-corrupt-but-still-problematic22:41
jammillun: I personally don't know the 'colocated' style that bzr-explorer mentions very well.22:42
spivglyph: mwhudson looked at this yesterday22:42
GaryvdMglyph: Hello. I saw in my logs that you were looking at the fonts in qbzr. I've landed a patch in qbzr trunk to have the mono space font defined in one place.22:42
jamand I'm not sure whether you are saying it is your personal need for where it goes, or whether you are asking if it is how bzr-explorer wants it22:42
glyphGaryvdM: Yay.  Is it a place where I can customize it? :)22:43
spivglyph: it appears to be more that the svn repo itself contains some revisions stamped with v3 revids (on trunk even)22:43
glyphspiv: oh, crap :(22:43
glyphwait a second22:44
glyphis that actually a problem?22:44
GaryvdMglyph: It now also tries to use "Monospace" before "Courier New"22:44
spivglyph: well!22:44
glyphif they're stamped as such, presumably everyone will agree on the revid and there won't be an issue.22:44
spivglyph: so bzr-svn presumably is helpfully preserving the v3-ness of revs before the latest rev stamped that22:44
glyphGaryvdM: even better22:44
glyphspiv: except sometimes when it isn't?22:44
spivAnd assuming the better v4 format for later revs22:44
jammwhudson: due to layering, I went with "wait for the socket to exist" rather than "wait for a message on the socket". Is that sufficient for you?22:44
jamat that point you can try to connect at least.22:45
jelmerglyph: I'm trying to reproduce the issue here, but it's taking a very long time to pull all revisions down22:45
mwhudsonjam: yeah22:45
spivglyph: but if you have an old branch from before that point it'll be v3.  Or something.22:45
glyphjelmer: well, that's the bug, innit ;)22:45
glyphspiv: Oh.  If I have an old branch from before that point it will pull it down *as v4*, because since there are new stamped revs it will just assume that branch should be the newest, goodest thing.22:46
jelmerglyph: not necessarily, I'm not sure if there's a good reason one branch is a different mapping than the other22:46
glyphahem22:46
spivglyph: jelmer is about 100x more of an authority on this than me of course22:46
glyph_no_ stamped revs22:46
jammwhudson: k, pushed, and ready for your re-review22:46
glyphin that branch's history.22:46
spivglyph: btw, r23001 in svn trunk22:46
GaryvdMglyph: No customization yet   - I would like to have code to get your desktop setting. I cant find a way to do this, so I may end up coding a version for gnone, kde, mac.22:46
jammwhudson: my EOD. but I'll respond to anything tonight/tomorrow if you have any more feedback22:46
GaryvdM* I cant find a way to do this with qt...22:47
jamI get to take my son to "soccer" practice (for 3yr old) should be a lot of fun22:47
mwhudsonjam: ok, i guess i'll throw it at ec2 land :-)22:47
spivglyph: I'm honestly not sure at all22:47
glyphspiv: That's the behavior I'm seeing.22:48
glyphLooking at the local bzr log of these branches I've got.22:48
glyphSo, probably the best thing to do practically speaking for this branch would be to destructively rebase the branch using svn ('merge forward') and then just start over22:48
spivglyph: my wild guess is... probably?22:49
glyphit's only got one revision in it anyway, and desperately needs to be updated to be more current with trunk, so there's not a lot to lose :)22:49
glyphspiv: so, thanks for the explanation of the preserving-the-v3-ness based on revision order in SVN, that was a key clue :)22:50
glyphexarkun: you may be interested in that discussion in case you do some old twisted branches with bzr22:50
exarkunI'm less interested in discussion and more interested in tools that work22:50
spivglyph: well, thank mwhudson more than me :)22:51
spivexarkun: here's the short form, as I understand:22:51
spivexarkun: land your branches faster and there'd be no problem :P22:51
glyphexarkun: oh.  #git, in that case, I guess? :P22:51
exarkunglyph: oh man.  you said it, not me.22:51
spivI'm sure jelmer will figure out how to make it work better, though.22:51
glyphexarkun: "If you're working with a very old branch, merge it forward in SVN first, to avoid this problem."22:51
glyphI can be more specific than that, with a precise revision number, but that's a good rule of thumb.  Maybe that's what spiv meant by 'r23001'?22:52
mwhudsonradix committed something to trunk with bzr22:53
radixwhat22:54
radixwhat22:54
exarkunradix: why do you always break everything22:54
radixwhat22:54
glyphradix: yeah man what the hell is your problem22:54
radixdid I break something like three years ago22:54
radixis that what this is about22:54
glyphradix: don't worry, dash would have broken it if you hadn't.22:54
mwhudsonand yeah, svn 23001 was it22:55
* jelmer wonders if he should phase out file property-based bzr-svn metadata22:55
GaryvdMGood night all zzzzzz23:25

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