/srv/irclogs.ubuntu.com/2010/05/19/#bzr.txt

igcmorning00:38
mgzmorning Ian.00:38
mgzrequest: could you look at https://code.launchpad.net/~simon-kersey/bzr-explorer/568728-fix/+merge/24306 at some point?00:38
mgzI did a drive-by comment on in a while back, and don't want the guy thinking I'm ignoring him (I just don't know if the code is right)00:39
=== davidstrauss_ is now known as davidstrauss
bignosemgz: it would be churlish of me to chime in on the subject of Launchpad as an OpenID consumer, wouldn't it? :-)00:41
bignoseanyway, I'm given to understand that wheels are in motion to get a proper OpenID consumer in Launchpad, so that makes me optimistic.00:42
igcmgz: I hope to get back to code reviews today00:43
bignoseigc: glad to see you back in the saddle00:44
igcthanks bignose!00:44
mgzgreat, thanks.00:44
rysiek|plhi guys01:10
rysiek|planybody care to help a bit?01:10
rysiek|plI just nuked my bzr repo01:11
rysiek|plbut I have a crapload of checkouts (not branches, checkouts) here and there - what would be the best way to get the newest revisions in the new repo?01:11
rysiek|pl1. restore a backup (40 revisions back), and in checouts do bzr up; resolve conflicts, bzr ci?01:12
rysiek|pl2. just ignore the backups and move a checkout as the new repo?01:12
rysiek|pl3. do bzr pull IN the backup-restored repo FROM the checkout?01:13
lifeless3 sounds plausible to me01:13
rysiek|pl4. bzr push the checkoput INTO the backup-restored repo01:13
lifelessas long as you hav heavyweight checkouts, not lightweight (the default is heavy)01:13
lifeless3 and 4 are equivalent01:13
rysiek|plheavy, heavy01:14
rysiek|plokay, great01:14
rysiek|plso, restore a backup, bzr push/pull01:14
rysiek|pltrying.01:14
=== spiv_ is now known as spiv
lifelessspiv: hi01:22
lifelessmwhudson: also ping01:22
mwhudsonlifeless: hello01:22
lifelessbzr smart server in lp01:22
lifelesswhat diagnostics can I get on that ?01:22
mwhudsonnot terribly much easily :/01:22
lifelessalso, is it still running as a subprocess; and what happens to its stdin/stdout - are they connected to twisted ?01:23
mwhudsoni think unhandled exceptions should go into oops reports01:23
mwhudsonyes and yes01:23
lifelesstrying to figure out why we only get 21KB/s from lp; gathering data as first step01:23
mwhudsonit's running bzr lp-serve user-id --inet01:23
lifelessshoving this under udd as 'slow checkouts hurt distro users'01:23
mwhudsonish ayway01:23
lifelessok01:26
lifelessdo we have statistics / info gathering on the twisted master01:26
lifelessI'm particularly interested in socket windows (raw and ssh wrapped), packet delays and so on01:26
spivlifeless: morning.01:26
lifelessspiv: python-dev, antoine's message 'Summing up' may be of interest to us and the smart server in standalone mode01:27
mwhudsonlifeless: not in any very structured way01:27
lifelessmwhudson: is that yes if I ask nicely? or 'no, but I didn't want to say that' ? :)01:27
spivlifeless: ta, will look01:28
mwhudsonlifeless: it's 'conch dumps some crap into a log file about this sort of thing, but i doubt it's of any use'01:28
* mwhudson sucks a 50 meg file off launchpad over bzr+ssh using hitchiker and watches the network in system monitor01:29
mwhudsonit's quite surprising01:29
lifelessdo tell01:30
mwhudsonlifeless: http://people.canonical.com/~mwh/sm.png01:30
lifelessyes01:31
lifelessthere is something wrong ;)01:31
mwhudsonit ramps up slowly to a decent rate, then drops right down and slowly ramps up again01:31
mwhudsonit's a bit odd01:32
lifelessI would expect this as a buffering interaction01:32
lifelessif a pipe somewhere fills01:33
lifelessprocess swaps/stops getting time slices01:33
lifelessthe tcp window may not open enough, and can take time to recover01:33
mwhudsonhttp grab of the same file is also behaving a bit strangely, but very differently01:34
mwhudsonhttp://people.canonical.com/~mwh/sm2.png01:36
rysiek|pllifeless: worked like a charm, thanks01:44
rysiek|plguys, maybe it would be a good idea to estimate, what's the average bandwidth in both situations?01:46
rysiek|plI mean, the graphs show completely different behaviour, true, but maybe the overall average bandwidth at the end of the downloading is more or less the same?01:47
lamalexHey, does anyone know if there's already a bzr equivalent of the git-version-gen autoconf script?01:47
lamalexI know I can adapt that to be for bzr, but I figured I'd see if someone had already done it01:48
rysiek|plif so, maybe it would be a good idea to try wgtetting or whatever with a fixed max rate, just below that average01:48
rysiek|plto see if anything strange happens, or not01:48
lifelesslamalex: not that I know of01:55
lifelesslamalex: I've done something similar for setup.py01:55
lifelesslamalex: and drizzle does something similar too01:55
lifelessmtaylor: ^ show lamalex the bzr version stuff for drizzle01:56
mtaylorlifeless: aroo?01:56
lifelessmtaylor: so http peaks at 1mb01:56
lifelessbah01:56
mtaylorlifeless: oh - gotcha01:56
lifelessmwhudson: so http peaks at 1MB01:56
lifelessand bzr+ssh at 512KB01:56
mtaylorlamalex: it's all in pandora-build ... (which you should use for your autoconf needs anyway) ... but specifically01:57
mwhudsonlifeless: yeah, after the initial fast burst though http followed a vaguely similar pattern to bzr+ssh01:58
mtaylorlamalex: http://bazaar.launchpad.net/~mordred/pandora-build/devel/annotate/head:/m4/pandora_vc_build.m401:58
mtaylorlamalex: I've got to run at the  moment - are you going to be around in 5 hours?01:58
lifelessspm: whats that darn tool you swear by01:58
mwhudsonless of a sawtooth i guess01:58
spmlifeless: 'find'01:58
lifelessspm: not swear at01:58
* mwhudson was going for 'awk'01:58
lamalexmtaylor, no probably not01:59
lamalexbut maybe01:59
spmlifeless: a hammer?01:59
spmcontext may help - what are you trying to do :-)01:59
lifelessspm: for network window / efficiency / analysis01:59
mtaylorlamalex: ok. well, I can certainly help you out on this if you still need it when I get back or tomorrow01:59
spmAHhhhhh! tcptrace + xplot01:59
lamalexmtaylor, thanks01:59
mtaylorlamalex: sure!01:59
bignoseyikes, m4.02:00
bignoseisn't there a better templating solution that's dependably installed?02:00
spmhttp://www.tcptrace.org/ and http://www.tcptrace.org/manual/node12_mn.html specifically. sheer gold.02:00
lifelessmwhudson: what file were you testing with02:01
mtaylorbignose: well, not that's integrated with autoconf, no02:01
bignoses/better/more human-maintainable/02:01
mwhudsonlifeless: http://bazaar.launchpad.net/~vcs-imports/linux/trunk/.bzr/repository/packs/7590053cc142a5cb7ca8d0e33022ce2a.pack02:01
mtaylorlamalex: that particular macro encodes YYYY.MM.BZR-REVNO into the version ... as we're the only user of that particular function, I haven't generalized it yet.02:03
mtaylorok. I'm off. have fun all02:03
joerg_hi02:17
joerg_how can I move everything in the root dir of my branch to a subdir?02:17
joerg_like:02:17
joerg_bzr mkdir src02:17
joerg_bzr mv . src/myproject02:18
joerg_which of couse does not work ;)02:18
lifelessbzr mv $(ls | grep -v src) src/myproject02:19
joerg_hmm....that will fail because of some files that aren't under version control02:19
lifelesswell, adjust appropriately02:19
lifelessperhaps bzr ls --versioned02:20
fullermdNeed a bzr pivot_root...02:21
lifelessfullermd: wouldn't address this case02:21
lifelessfullermd: (and we have it)02:21
joerg_lifeless, well, thx....that works ;)02:21
joerg_only .bzignore shouldn't be moved I guess ;)02:21
lifelessright02:21
joerg_but I will simply bzr revert it02:21
lifelessyou'll want to mv that back :)02:21
lifelessor that, sure02:21
fullermdWe do?  Where?02:23
lifelesstree transform02:24
lifelessit can handle a merge that moves the root02:24
lifelesswe don't have a userspace command for it, yet.02:24
fullermdYeah, but that's not much of a UI  ;)02:24
lifelessmwhudson: what ISP do you have?02:27
mwhudsonlifeless: vodafone02:30
mwhudsonbut my local connection is through a telecom 'cabinet'02:31
lifelessfor ADSL ?02:31
mwhudsonyar02:31
lifelessI'm peaking at ~ 128K02:31
lifelesswhich is, frankly, sucky.02:31
mwhudsonoof02:31
mwhudsonwhat does your modem think you're synced at?02:31
lifelessdunno, don't have the admin password for it02:32
mwhudsonare you still in the short term rental place?02:33
lifelessyes02:33
lifeless3 months 1 week to go02:33
fullermdNot that he's counting down or anything.02:34
mwhudsoni'm not too surprised that your internet sucks then02:34
lifelesshah02:34
lifelessits a private residence the owner is on sabbatical, as opposed to a serial rent environment02:34
mwhudsonah ok02:34
lifelesswe've taken over the phone account etc02:34
lifelessI suspect a call to telecom is in order02:34
mwhudsonmaybe the owner was on an old, capped plan?02:35
lifeless128K is 1Mbit02:35
mwhudsonnoone seems to bother with that any more though02:35
lifelessI changed the plan to the upsized one02:35
lifelessone possibility is an adsl1 modem02:35
lifelessanother is bad wiring02:35
mwhudsondistance to the exchange?02:36
lifelesswho knows02:36
lifelesstelecome knows02:36
lifelessthats who knows02:36
lifelessspm: is ParseOptions: packet 41290 TCPOPT_SACK option truncated, skipping other options02:39
lifelessspm: a meaningful worry - just use a longer snaplen and repeat?02:39
spmlifeless: not sure. I usually grab the entire snaplen - debugging http so you want to see the data.02:50
* igc lunch02:50
lifelessheh, in this case the data is just a pack so 'meh'02:50
lifelessor ssh, so equally02:51
lifelessthough02:51
lifelesswe may want to write a ssh analyzer02:51
lifelessif we can get the session key out of twisted ?02:51
lifelessmwhudson: ^02:51
lifelessmwhudson: would that be a lot of work, do you think?02:51
mwhudsonlifeless: no idea at all02:52
mwhudsonit would be at least a moderate amount of work02:52
spmmwhudson: try suggesting it's impossible perhaps?02:52
lifelessspm: -s doesn't seem to give me a graph02:52
spmlifeless: -S      create time sequence graph[s]02:53
spmwrong case.02:54
spmthe stock xplot via apt, *may* not be able to deal with the output generated tho. on just about every other system I've used, I've had to manually compile 'his' version to have it work.02:55
lifelessalso, for nuisance value, the microwave here is on the same freq as the ap02:55
spm\o/02:55
lifelessso dinner time is no-internets-time02:55
spmawesomely awesome!02:56
spmI know my wireless mouse used to get horribly laggy when the wireless was busy.02:56
lifelesshmm, it decided a2b was empty02:56
lifelessbut b2a has dome something02:56
spmthat sounds ... vaugely right. a2b would be likely just acks.03:00
spmtcptrace -l, to get a view?03:01
spmsummary text view as in.03:01
lifelessotp03:01
spmerr - not summary. whatever. :-)03:01
lifelessturns out to be wifi fail03:36
lifelesshowever, am now getting 800KB/s to melbourne03:36
spmsweet03:38
lifelessstill a bit bursty03:38
lifelessdrops down to 200 every now and then03:39
lifelessgoing to be interesting to debug on top of :P03:39
lifelessverra noisy03:42
lifelessI wonder if I'm going to need a local ping background measurement ;P03:43
lifeless700K to b.l.n03:53
lifeless\o/03:53
lifeless80003:54
lifeless850... you can do it03:54
lifeless100 :(03:54
lifelesssawtooth03:54
mwhudsonlifeless: i guess doing a regular bzr+ssh transfer off say devpad would be an interesting comparison03:56
lifelessdoes hitchhiker have a non interactive mode ?03:57
lifelessecho 'get /~vcs-imports/linux/trunk/.bzr/repository/packs/7590053cc142a5cb7ca8d0e33022ce2a.pack' | hitchhiker bzr+ssh://bazaar.launchpad.net :P03:58
lifelessboom03:59
lifelessI saw the same massive dropoff you did03:59
lifelessspm: take pity on me; give me a sample session with tcptrace + xplot04:05
lifelessI hav a trace04:05
lifelesstcptrace -l shows sensible things04:05
spm:-)04:05
spmsure.04:05
spmhave you the trace somewhere I can munge at the same data?04:06
lifelesssure04:06
lifelesslet me shove it on devpad04:06
spmta04:06
lifelessthe files ssh and http on devpad:~robertc - copying now04:07
lifelessdone04:09
lifelessor thereabouts04:09
spmta, grabbing04:10
spmYou don't have permission to access /~robertc on this server. haha04:10
lifelessI don't?04:11
lifelessI beg to differ04:11
spmoh wait. nm. I was using http access. lemme just scp it.04:11
lifelessyah, not in ~public_html04:11
spmrighto. so looking at http. tcptrace -l http ;; on a bigger more complex snarf, i'd start with -b (brief) to get an idea of which streams to look at, but here is easy.04:14
spmso no supriose that all the data is coming from crowberry; a is just acking.04:14
lifelessright, I tried to capture just one file04:15
lifelesswell, there is the initial request ;)04:15
spm:-)04:15
spmtcptrace -G http <== builds *all* the graphs04:15
spmxplot -x b2a_tsg.xpl a2b_tsg.xpl &04:16
spmthe -x and specifying both will allow you to zoom in on 1, and see the same zoom on the other at the same time. way cool.04:16
spmI find it useful to not touch the vertical adjust, but stretch the two graphs fully horizontally. ymmv.04:17
lifelessbad flag argument -x04:17
spmright. you need his version of xplot then.04:17
lifelessgrah04:17
lifelessok04:17
lifelesshas he considered getting his patches upstream ?04:17
spmno idea :-)04:17
spmgawd dammit. one day I will remember that right click exits.04:18
lifelessI wonder if tim sheppard even knows about this patchset04:19
spmpossibly not04:19
lifelessshep at xplot.org04:19
lifeless^ go, mail him.04:19
spmwill do04:19
spmbut first... :-)04:19
lifelesshmm, C code needs a little love04:20
* spm starts to play spot the yak ;-)04:20
lifelessok, much better04:20
lifelessit could use a window bitmap cache04:21
spmif you stretch horiz, you'll be able to better zoom. vert if really useful imho.04:21
lifelessso flat bits are stalls ?04:21
spmso here we're basically looking for 1 main thing; other maybes. is the tcp window full. which - apparently is sure as hell isn't.04:21
spmslowdowsn of some sort, yeah04:21
spmaroud 12:54:20 "something" happened04:22
lifelesshah! it does tmiezones04:22
spmoh wow. zoom on ~ 12:54:19 window full.04:23
spivAnd around 13:22, lunch happened.04:23
* spiv makes it so04:23
spm:-)04:23
lifeless14:54:19 you mean :P04:23
spmlifeless: whatever :-D04:23
spmbut note also the large numbers of '1's and '2's.04:23
lifelesschatty04:23
spmlooks like a fail for acks to be received04:23
lifelesshow do you you zoom out04:24
spmleft click04:24
spmzoom by selecting; then left click04:24
lifelessso whats a 1 and a 2 - or should I e reading at this point04:24
spmrtfm, resends, once, twice of the same packet istr.04:25
lifelessso you're thinking massive packet loss ?04:25
lifelessthe yellow band is the window size, right ?04:26
spmactually - 1/2 I think are duplictae acking.04:26
spmthe delta between the horizonatal lines is the window04:26
spmyellow and green04:26
lifeless53:24.5 has a similar region04:26
lifelesshah, is one green?!04:27
spmyeah. a couple of window fulls, imho, isn't bad. not great, but not bad. keeping in mind this is *your* window (aiui), not crowberrys.04:27
lifelesssorry, I'm unclar04:28
spmif you zoom in on the start, you can see the scaling take off.04:28
lifelessis the gap 'data in the window' or 'amount that can be in the window'04:28
spmamount that can be in the window.04:28
lifelessok04:28
lifelessand can we tell amount in flight/in the receiver buffer04:29
spmeach white cross, is in fact a line with 2 arrows, zoom right in on one. that's a data packet.04:29
lifelessI see black lines with arrows04:29
spmhttp://www.tcptrace.org/manual/node12_mn.html <== check the 2nd diagram by way of example04:30
spmbased on that - it *looks* to me like crowberry isn't hammering you as hard as it could; or your pipe is full. ??04:32
spmtho the backoff from ~ 3/5ths to end is... odd04:32
* spm checks throughput...04:33
spmhrm. ~ 500kps. not too shabby.04:34
lifelessavg04:34
lifelesspeaked at 880 or so04:34
lifelessso lots of room for improvement04:34
spmwhich, assuming default tcpwindow sizings on crowberry is about max for london to AU given latency.04:35
lifelessI'm in nz ;)04:35
spmso slightly closer eh? ;-)04:35
lifelessno, sadly, no04:35
lifelesscan/should we tweak the window settings up ?04:35
lifeless350ms 64 bytes from crowberry.canonical.com (91.189.90.11): icmp_seq=5 ttl=42 time=328 ms04:36
spmwe can, trivially. I'd advise yes. but would want to cross check 1. what they actually are.04:36
lifelessbah04:36
lifeless64 bytes from crowberry.canonical.com (91.189.90.11): icmp_seq=5 ttl=42 time=328 ms04:36
lifelessand ask why the defaults aren't large enough to handle the earth.04:36
spm2. watch carefully JIC of funkies (I doubt we'd see any)04:36
spmnfi. that's the default that linux kernels come with aiui.04:36
lifelessyeah04:36
lifelessthe aarnet mirror admin04:37
bignoseho, Bazaar folk. what is the preferred pastebin?04:37
lifelessswears that everyone should up their window settings04:37
spmyeah. that supersize macca's theirs04:37
spmthey*04:37
spmnod04:37
lifelessbignose: one that works. And not pastie.04:37
lifelessme, I use pastebinit04:37
lifelessspm: thanks for this; I think there is more to nut out here04:37
bignosemy favourite, <URL:http://paste.ca/>, has been responding 500 errors for weeks.04:37
lifelessspm: I need to do a couple of 'new country' chores before shops close.04:38
spmlifeless: np. i suspect there is, but it's all clues.04:38
bignoseI'll try that one, lifeless04:38
spmshoo04:38
lifelessspm: but I might grab a little more of your time to look at the ssh trace after, if thats ok with you04:38
spmsurely04:38
bignoselifeless: what URL?04:38
lifelessits been .... some time, since I did this sort of analysis myself04:38
lifelessbignose: apt-get install pastebinit04:38
spmeek. crowberry is the, small, default.04:38
lifelessspm: I can has RT ticket for 'we run servers please' ?04:39
bignoseooh! naughty Ubuntu worker, everyone knows ‘aptitude’ is the command to recommend :-)04:39
lifelessspm: I mean, should I file an RT saying all our servers facing the net might need stuff ?04:39
spmif you create said RT, I don't see why not ;-)04:39
spmlifeless: sure. it'll help us track it at least.04:39
spmfwiw. the *best* way to do these is get two sniffs at the same time. in this case, one on your machine, and one on crowberry. and display the sender from crowberry (b2a) and receiver at yours. you get a better view of the packet flows with times and whats missing etc.04:44
bignoseI've had a crash on ‘bzr shelve’, with a “MalformedTransform” exception <URL:http://pastebin.com/yk6ziW8V>04:50
bignosethere appear to be some bug reports with that same error, but different use cases04:50
bignoseLaunchpad is not displaying bug reports properly for me. can someone check whether the crash I'm getting is already reported, and/or submit that traceback to the report?04:51
bignoseit's reproducible (I've pasted the version where I used ‘--no-plugins’), and I can make the repository available if it would help diagnosis.04:52
lifelessspm: that would be awesome. I can has packet capture privs on crowberry ? :)04:55
spmhahaha. no. *I* wouldn't even ask for that. :-)04:55
lifelessmwhudson: how do I get that linux pack onto the staging bazaar.launchpad.net ?05:00
lifelessmwhudson: /win 6705:01
mwhudsonspm: um, no quick idea, i guess you can sftp it up...05:03
bignoseit seems to be because the shelve involves undoing a rename05:04
bignosebut meanwhile the original filename is occupied by a new file, that isn't versioned.05:04
bignoseso I'm not sure what I expect ‘shelve’ to do in that case. no crash, of course, but I don't know the right behaviour.05:04
lifelesswhat bzr version?05:05
lifelessalso is there a bug about the rendering for you ?05:06
bignose<URL:http://pastebin.com/yk6ziW8V>05:06
bignoseno, I don't have a Launchpad account and it's not working well for me in any case :-)05:06
bignoseBazaar version 2.1.105:06
lifelessbignose: ok, we'll need to open a bug for you for that05:31
lifelessbignose: you say there isn't a bug open about launchpad rendering badly?05:31
lifelessbignose: could you put an email together, to me, with screen shots and so on that shows lp behaving badly, and I'll make a bug report out of it05:32
PainBankany upload anything to sourceforge using bzr?06:01
PainBankshould I create a seperate trunk and branches directory (I am more familiar with doing this in svn) or just push it all up to SF?06:02
parthmPainBank: I haven't uses sf in a long time but bzr doesn't require specific directories like trunk and branches. You can probably push it all up as long as the project devs agree to treat dir x as trunk / mainline.06:14
* fullermd eep!'s at broken dirstate code :(06:16
parthmPainBank: this article seems to be doing what you want http://sina.salek.ws/content/migrating-subversion-bazaar-including-special-guide-sourceforge-projects06:20
lifelessfullermd: ?06:57
fullermdlifeless: https://bugs.launchpad.net/bugs/582656   :(06:59
ubot5Launchpad bug 582656 in Bazaar "Compiled _dirstate_helpers causes crash with specified file commands (affected: 1, heat: 6)" [Critical,Confirmed]06:59
bignoselifeless: shelve crash reported in Debian BTS now, <URL:http://bugs.debian.org/bug=582210>07:41
bignoselifeless: the Launchpad rendering problems seem to be a strange interaction between Iceweasel and my proxy; change either of those and it's alright.07:41
bignoselifeless: shelve crash reported in Debian BTS now, <URL:http://bugs.debian.org/582210>  (fixed the URL)07:42
lifelessbignose: what proxy are you using ?07:45
lifelesslaunchpad is on https generally, so I wouldn't expect anything in it except -perhaps- css files to hit your proxy07:45
lifelessnevertheless, there is a problem :)07:45
vila_hi all07:55
vilavila_: Sorry for using your nick, I'll leave07:55
=== vila_ is now known as vila
vilatsk tsk07:59
parthmvila: hi08:05
parthmvila: i noticed you have claimed the reivew https://code.launchpad.net/~parthm/bzr/538868-message-for-heavy-checkout/+merge/25336 ... i could land it if it looks ok it you08:07
vilaparthm: hi !08:07
parthmvila: or if i can get another reviewer :)08:07
vilaparthm: I didn't claim it, I suspect jam assigned me instead, I plan to review it soon08:08
fullermdMaybe vila_ claimed it for you.08:08
parthmvila: ah. ok :) .. no hurry. was just wondering.08:08
parthmfullermd: ha :)08:08
vilaannoying squatter this vila_ ...08:08
fullermdlifeless: I can't trivially run selftest, lacking testtools   :|08:10
fullermdlifeless: Won't have time the next few days to try and fudge it into place; got a week of stuff to do before I leave town Friday.08:10
vilafullermd, lifeless : babune has a freebsd8 slave, can I help ?08:14
fullermdMmm.  Building the bzr-2.1.1 tag in my 2.1 branch seems to die too, though the installed 2.1.1 doesn't08:14
fullermdIt was rebuilt since my last OS/python upgrade though, so it's not that...08:15
fullermdHoly crow it takes a long time to branch bzr.dev on local disk.08:15
viladie ? How ?08:18
lifelessgnight08:19
fullermdHm.  It seems to work on my server, which is fbsd8/i386/py2.6.4.  Failing on my workstation, fbsd-current/amd64/py2.6.5.  So, if everything's different, the result is different   :p08:19
fullermdOh, pyrex 0.9.8.6 vs 0.9.9 too.  Hm.08:19
fullermdMaybe I can test that switch quick-like...08:20
fullermdThat could explain why the system-wide 2.1.1 works, but hand-building it doesn't; the system-wide has the generated files from the tarball.08:20
fullermdIn fact...08:20
* vila holds his breath and hopes fullermd will finish his sentence soon enough08:21
fullermdYes, if I build from the 2.1.1 tarball, it works.  If I build from the bzr-2.1.1 tag it blows chunks.  diff shows only the generated .c/.h files as different between the trees.08:22
fullermdSo it sounds like pyrex 0.9.9.08:22
vilahmm, pyrex 0.9.9 here, but maybe the .c files has not been modified since I upgraded....08:24
vilaerr, the .pyx files of course08:24
vilaone more hole in babune setup....08:24
vilaa lucky one this time\08:24
fullermdOh, that should be quick to test with that repro script (or manually)08:25
fullermdActually, don't even need a modified file in the tree.08:25
fullermdSo just 'bzr stat bzrlib' in the bzr.dev tree should tell you.08:25
vilatell me what ? what repro script ?08:26
fullermdhttps://bugs.launchpad.net/bzr/+bug/58265608:26
ubot5Launchpad bug 582656 in Bazaar "Compiled _dirstate_helpers causes crash with specified file commands (affected: 1, heat: 6)" [Critical,Confirmed]08:26
fullermdOr just 'bzr stat bzrlib'; I get the crash (with 0.9.9-built stuff) there too.08:26
* vila branching (don't ouch the babune working one !!!)08:27
vilayeah, ouch, exactly, not a typo !08:27
fullermdPfft.  Wimp.08:27
vilaboom08:28
vilaKeyError: ''08:28
fullermdOh, good.  I've successfully ruined your day; now I can go sleep in peace   8-}08:28
vilafullermd: hehe, I'll check which pyrex version were used to generate my files and add a comment08:31
fullermd(which I'm about 3 hours overdue for at the moment, so  *bamf*)08:31
fullermdIt leaves a comment right on the first line.  Handy.08:31
vilaI thought so08:31
vilaGenerated by Pyrex 0.9.8.6 on Thu Apr  1 17:19:38 201008:32
vilahaha, so funny08:32
vilanot08:32
fullermdJust confirms my long-held suspicion that dirstate is a conspiracy against me.08:32
vila656 diffs...08:33
fullermdBetween the generated files?08:33
=== mrevell__ is now known as mrevell
fullermdYeah, I think the diffs are big even between runs of the same version.  Suckage   :|08:34
* vila searches the magic incantation to ignore the comment lines mentioning the source file08:34
fullermdWell, at least we could build with cython instead...  except [last time I tried] that yields stuff that doesn't work at ALL.08:35
fullermdBut that would fix THIS bug.  Sorta   ;)08:35
vilaurgh, you're right, bunch of moved around code or added "registers" .... go figure the problem :-/08:36
vilawow __Pyx_AddTraceback call added 8-{08:37
vilaerr, no, calls deleted in fact (/me switches the windows to a sane order)08:38
vilalucid is still using 0.9.8.5, yeah for responsible distro maintainers using well tested versions :-P08:39
fullermdFigures.  CD I ordered last week showed up in my mailbox today, so obviously something UNpleasant had to happen to counterbalance and leave the day centered.08:40
vilaok, got the failure in the test suite, that should narrow down the problem08:43
vilabah of course it's a blackbox test :-/08:44
vila7 failing tests already08:44
fullermdOh well.  I'll still have the CD after the bug is fixed.  Nya nya nya, Fate!08:44
vilalol08:45
* fullermd quickly hides.08:45
* vila setup a dedicated babune job :)08:47
vila32^W41^W53 failures so far, one of them ought to be easier to debug than the others08:48
fullermdActually, I'd WAG that tracking it would be easier by just dumping some debug printf's around where it crashes to see what unexpected structure (or lack thereof) the pyx is giving back, and dig down from that direction.08:49
* vila goes back to fixing its keyboard layout before turning insane08:49
fullermd... of course, just using the phrase "debugging printf" probably shows I'm not qualified to deal with python in the first place   :p08:50
vilafullermd: except a pdb.set_trace() with a simplified context may be even more handy, I'll look into it when the run finish08:50
vilafullermd: same concept, different tool )08:50
vila:)08:50
fullermdWell, I require_feature(zzz), so I'll leave it in your hands for the next fartoofew hours.08:51
vilaI would probably wait for jam to turn up anyway he knows pyrex far better than me08:51
vilafullermd: sleep well08:51
vilaand thanks for the heads-up !08:52
* fullermd <--- canary in the bzr-mines.08:52
vilahmm, I was about to joke about sending some gas and thought better :)08:52
bialixbonjour vila09:03
vilahello Sacha :)09:04
bialixmy patch for backslashes landed to 2.1 last night, thanks jam09:04
bialixI think I should provide a patch for bzr.dev to merge it cleanly now?09:05
bialixbecause that was for 2.1 only09:05
bialixand 2.2 has different command-line parser09:05
bialixor the person who will do merge simply ignore my changes?09:05
bialixvila: ^09:06
spivbialix: a patch to merge it cleanly would be good, I think09:06
bialixthat's my understanding as well09:06
vilabialix: it would be better if you merge 2.1 to trunk to ensure the conflicts are properly resolved09:06
bialixI'm just double checking09:07
bialixok, so maybe I can adapt some my new tests09:07
vilabut if you propose a patch including your 2.1 merge in its ancestry everything should be fine09:08
vilagrr damn xmodmap bug !09:09
mgzmorning all.09:24
mgzvila: just posted thingy about leak experiements, basically what I said yesterday evening09:25
vilamgz: Hi ! I haven't checked my mail yet :-/09:25
mgzam now going to try and do some actually-useful things.09:25
mgzI mean just, like, that second.09:26
bialixheya mgz10:13
gourigc: hello, is bug #541626 bzr or fastimport's stuff?11:58
ubot5Launchpad bug 541626 in Bazaar Fast Import "'BTreeBuilder' object has no attribute '_find_ancestors' (affected: 2, heat: 6)" [Undecided,Confirmed] https://launchpad.net/bugs/54162611:58
asabiljelmer: ping ?12:01
jelmerasabil: hi12:01
asabilhey jelmer, I just wanted to know if you would have an idea about this assertion error failing:12:02
asabilFile "/home/asabil/.local/lib/python2.6/site-packages/dulwich-0.5.1-py2.6-linux-i686.egg/dulwich/pack.py", line 926, in iterentries12:02
asabil     assert isinstance(offset, int)12:02
asabil AssertionError12:02
jelmerasabil: not without context...12:03
asabilI am trying to clone an internal git repo, and it fails with that error12:03
asabilI can paste the crash file somewhere12:03
jelmerwhat versions of bzr-git/dulwich ?12:04
asabilfrom source12:06
asabilfreshly installed12:06
asabilthe crash trace is here: http://pastebin.com/SkbAkPeE12:07
jelmerasabil: from the tarballs, from bzr ?12:09
asabilfrom bzr12:10
maxbIs there any good reason why bzrtools releases are strictly bound to bzr releases?12:16
jelmerasabil: can you check what the type of offset is ?12:20
asabilyep, give me few minutes please12:26
asabilit takes a lot of time to clone a 6Gb repo12:26
jelmeroh, if it's a 6gb repo I suspect the type might be a long12:26
jelmerI don't think we support repositories that big yet12:27
asabilis there a way I can help fixing this ?12:30
jammaxb: by request of the author12:31
maxb...?12:31
jamabentley prefers that the plugin aborts early rather than claims to work and fails late12:32
jelmerasabil: we'd need support for larger pack files in dulwich first I think12:32
jelmerasabil: do you have any pack files > 2Gb?12:32
asabillet me check12:32
jamvila: I'm awake, but not officially working yet12:33
asabiljelmer, yes I think there is a 6Gb pack file12:40
jelmerasabil: in that case, you'd really need to patch dulwich first12:41
jelmerat the moment it doesn't support index files for pack files larger than 2Gb12:41
asabilok, I will start there then12:42
jelmeryou might also want to check nobody else is working on that support yet, I think one of the Google folks was interested in it as well12:42
asabiljelmer, on the mailing list ?12:44
jelmerasabil: yep12:44
asabilok I will, thanks12:44
mok0I'd like to access the revno from inside a program running out of a bzr repo. Does anyone have a code snippet that can show me how to do that?13:13
mok0I've been browsing bzrlib for a function, but not been lucky13:13
bialixbranch.last_revision()13:16
mok0bialix, what's the path to "branch" ?13:18
bialixbranch is the instance of bzrlib.branch.Branch13:18
bialixe.g. br = bzrlib.branch.Branch.open('path')13:18
bialixprint br.last_revision()13:19
bialixor maybe br.last_revision_info()13:19
bialixcheck the API13:19
mok0bialix: got it working, thanks a bunch!13:20
bialixnp13:20
mok0Now I need to figure out how best to include that in my django site13:24
bialixhttp://wiki.bazaar.canonical.com/Integrating_with_Bazaar can be useful13:30
=== JFo-afk is now known as JFo
mok0bialix: indeed14:01
vilajam: ok, back from shopping (a *real* chair for my desk :)14:01
=== joerg_ is now known as joerg
=== CardinalFang_ is now known as CardinalFang
parthmjml: hi14:41
parthmjml: .. sorry. i meant to ping jam.14:43
parthmjam: hi14:54
ovnicrafthi folks, when i push in lp i give the message, pgrade the repositories to the same format for better performance.15:09
ovnicrafti found in the web this command: bzr upgrade --2a15:11
ovnicraftso i want confirm this before to do it15:11
ovnicraftits ok?15:11
jelmerovnicraft: yep15:11
ovnicraftjelmer, thx15:12
jelmerovnicraft: it might also be that the remote branch is out of date while the local one is newer15:12
jelmerovnicraft: in that case you might want to upgrade the branch on lp15:12
ovnicraftin lp has format 715:13
ovnicraftjelmer, i get that is 2a15:13
maxbformat 7 sounds like a branch format15:21
maxbBazaar formats can get confusing, because there's a repository, a branch, and a working tree, all with independent formats15:21
jelmerit is, but I think it's probably the branch format that's part of 2a15:21
jelmermaxb: yeah15:21
maxbbzr info -v tells all15:21
jelmerlaunchpad displays the long names15:21
ovnicraftsorry, branch format 7, repo format 2a15:35
jelmerovnicraft: did the upgrade help?15:36
ovnicraftthat info from lp, i am upgrading the repo15:36
=== radoe_ is now known as radoe
fullermdjam: Latest bug comment is as far as I can take it.16:50
jamfullermd: that's the "its a really big diff that is hard to understand" ? :)16:50
jamcan you email me the output?16:51
fullermdNo, just tracked to one line that's differing in whether it succeeds or not.16:51
jamah, didn't get that one yet16:51
fullermdHmph.  I just rm'd the dir   :p16:51
jamyou still have 0.9.9 pyrex installed, right?16:51
fullermdYah, regenning.16:52
jamthanks16:53
=== IslandUsurper is now known as IslandUsurperAFK
[1]reggiejam (or anyone else) -- how would I setup bazaar.conf to use sendmail to send mail?16:54
[1]reggieI'm on windows but have a sendmail binary16:55
[1]reggiejust setting the config line in bazaar.conf doesn't appear to do it16:55
jam[1]reggie: first off, "to send mail"16:55
jamUnder what circumstances?16:55
[1]reggiebzr commit16:55
fullermdMailed.16:55
jamfullermd: thx16:55
jam[1]reggie: I presume you are then using 'bzr-email' ?16:55
[1]reggielet me check16:55
=== beuno is now known as beuno-lunch
jamfullermd: I think you mentioned that cython doesn't work for you. Can you give a bit more detail? (I use it here)17:06
jamand I've at least reproduced the failure with your test script.17:08
jamInterestingly you do have to pass a path, which may be a decent hint17:08
[1]reggiejam, we have a emailer.py that is in our mysql_plugins folder.  if post_commit_mailer = smtplib then it tries to use that.  otherwise it uses whatever post_commit_mailed is set to17:08
[1]reggieI have mine set to my sendmail instance17:08
[1]reggieI just ran a test commit and got no error and no error in .bzr.log but also no email17:08
[1]reggievery frustrating that smtplib doesn't support SSL 46517:08
jam[1]reggie: k. I'd start by saying I don't have a copy of, nor access to the mysql plugin17:08
jamso there isn't a huge amount of support I can do on it17:09
[1]reggieI know17:09
jamI will point out that bzrlib.smtp_connection.SMTPConnection *can* take an optional "_smtp_factory" parameter (originally designed for the test framework). And you could pass SMTP_SSL in there instead.17:11
=== davidstrauss_ is now known as davidstrauss
jamIf mysql cribbed the email sending from bzr-email17:11
jamthat also has a "_smtplib_implementation" attribute, which instantiates an SMTPConnection17:12
jamwhich would be another way to inject your own SMTP_SSL object17:12
TresEquisjelmer: re https://bugs.launchpad.net/bzr/+bug/480102, the only thing odd about the last-imported revision for lp:karl3 is that it includes a change to an svn:eol-type property17:12
ubot5Launchpad bug 480102 in Launchpad Bazaar Integration "assert len(tview) == tview_len (affected: 5, heat: 48)" [High,Triaged]17:12
jam[1]reggie: another option is too look at how bzrlib/mail_client.py works17:14
jamwhich is where 'bzr send' hooks into sending notifications to your existing mail client17:14
jamso that you have an opportunity to write messages to it.17:14
jamprobably not exactly what you want for the mysql post-commit effect, though17:15
TresEquisthat change shows up here:  svn diff -c 5140 http://osi.agendaless.com/bfgsvn17:15
TresEquisbug not here:  bzr log -p --limit=1 lp:karl317:15
jelmerTresEquis: bzr-svn doesn't import changes to svn:eol-type properties17:15
TresEquisOK, but would that explain the checksum issues on the next revision?17:16
TresEquisit also added 'svn:keywords' property, with 'Id' as the value17:22
TresEquisthat might cause SVN to believe something different about the content of the file than bzr, maybe?17:23
fullermdjam: Don't remember offhand, it was a couple months ago.  But it just flat didn't work at all for anything.17:24
fullermdjam: Yes, need the path.  Don't need changes though; I found I could just 'bzr stat bzrlib' in a pristine tree to bring it up.17:24
jamso my immediate guess is that pyrex is leaving an exception on the stack, and then accidentally checking the exception state as part of the "x == y" statement17:25
fullermdMmm.  The object comparison does that?17:26
fullermdMy fiddling fingered that one specific line of the C.17:27
TresEquisjelmer: the next commit on the karl/trunk branch (the one which fails to import) is svn r5144, which touches (only) the file whose properties got changed in svn r514017:28
jamfullermd: adding a "PyErr_Clear()" just before that line makes everything just peachy17:28
jam*ugh*17:28
fullermdWacky.17:28
jamLooking at: http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/version/CHANGES.txt17:29
jam  - Exceptions caught by an except clause are no longer put into the thread     state and cannot be retrieved using sys.exc_info(). To access the caught     exception, it must be bound to a name in the except clause. A third name     can be supplied to capture the traceback.17:29
jamSo I have another thought, we'll see17:29
jamlooks like I got it17:29
jamchange the bare "except KeyError:" to "except KeyError, e:"17:30
jamand things are happy again17:30
jamcan you try it on your system? (line 1241)17:30
fullermdHm.  Well, that makes 'bzr stat bzrlib' work.  The test script still fails, though, as does stat bzrlib/_dirstate_helpers_pyx.pyx17:33
fullermd(it's 1239 in my bzr.dev)17:33
jamfullermd: my guess is that we just have to trap all of these bare exceptions, because pyrex is fubar without it17:33
jamwe use it in a fair number of other places17:33
jambasically, look for "except[^,]*:"17:34
fullermdChanging the one at 1222 as well fixes it.17:34
jama) This is definitely a bug in pyrex, and I'm trying to write a simple test case to show it17:34
jamb) we can probably work around it for now17:34
fullermd(well, fixes this incarnation of it anyway; who knows what evil lurks in the hearts and minds of any other except's in there)17:34
jelmerTresEquis: hmm17:35
jelmerTresEquis: *looking*17:35
jamfullermd: reproduced17:36
jamI'll file a bug on pyrex17:36
fullermdI guess this just shows how version control systems can help you find bugs   :p17:37
TresEquissvn collapses the $Id: ...$ string in its internal representation when that svn:keyword is set, I think17:38
TresEquisa stupid CVS compatibility hack17:38
jelmerTresEquis: bzr doesn't touch that, it shouldn't really affect it17:38
TresEquisit wouldn't cause bzr and svn to have different ideas about the payload for that file?17:39
jamfullermd: as near as I can tell, dirstate_helpers is the only extension that uses exceptions without objects, I'll put up a patch17:55
=== IslandUsurperAFK is now known as IslandUsurper
=== deryck is now known as deryck[lunch]
=== beuno-lunch is now known as beuno
TresEquisjelmer: I'm trying now to check out the karl/trunk stuff from a copy of 'bzr' with a pdb.set_trace() just before the call to main()18:06
TresEquisso that I can look at the stack when the exception happens18:06
TresEquiscrap, bzrlib is bailing out without giving me a shot at the traceback / stack frame18:11
jamfullermd, vila, lifeless: https://code.edge.launchpad.net/~jameinel/bzr/pyrex_099_bug_582656/+merge/2562518:11
fullermdPurdy.18:13
* fullermd thanks jam.18:14
mgzamusing pyrex bug, well tracked down jam.18:20
fullermdOh, right, "amusing" was totally the first word that came to my mind last night   :p18:22
mgzmaybe it's one of those things that's only funny after the fact ;)18:22
fullermdIt'll give us something to chuckle over in the rest home, anyway.18:24
vilajam: setting a run on babune18:26
vilajam, fullermd : http://babune.ladeuil.net:24842/job/debug-freebsd/2/18:28
* vila dinner, will check later18:29
vilarhymes :)18:29
lfaraoneI'm on a selow connection, and I want to only make changes to a branch then push them up somewhere on launchpad, how can I minimize the data transfer? (I don't really care about full history)18:29
TresEquisjelmer: sigh, the traceback is no help, as the caller (who has computed the window) is implemented in C18:29
jamvila: I'm not sure what in that sentence rhymed... but maybe in french? Anyway, thanks for the run. I'm pretty confident, having used pyrex 0.9.9 here.18:34
vilajam: dinner with later ?18:36
jamI've never pronounced "later" as "linner" but maybe you do :)18:36
viladamn, for once there was no typo :)18:37
jamNow if you said "date: will check late"18:37
fullermdThat would doubly rhyme, since late dates cause strife with the wife.18:39
vilatalking about wife.... see you later :-P18:40
mgzHm, should I file a new bug for my three hashcache-related test failures, or should I piggyback on bug 70272 from 200618:44
ubot5Launchpad bug 70272 in Bazaar "test failure (TestHashCache) (affected: 0, heat: 0)" [Medium,Confirmed] https://launchpad.net/bugs/7027218:44
mgzchanging the three tests not to sleep for four seconds each would be nice as well, can't they be utimed into the past?18:47
mgz...think I'll file a new one, mine's certainly FAT related, just tried unsetting TMP and they pass18:51
=== deryck[lunch] is now known as deryck
cbzwhat is eclipse doing constantly running bzr in the background?19:26
jelmerTresEquis: :-(I19:28
cbzbecause it keeps ending up running out of heapspace - and complains about Decorators19:29
fullermdCalculating missile trajectories for when it becomes self aware and takes over.19:29
TresEquisjelmer: the offending svn revision is actually 5147, not 514019:29
TresEquisand the oddity is that the 'tview' string looks like a real revision of the file19:30
TresEquisbut it corresponds to neither the prior version (5146) nor the updated one (5147)19:30
TresEquisthe tview_len value is the actual length of the file in r514719:31
TresEquisso I have no idea where the bogus version comes from19:31
TresEquisjelmer: OK, the 'view' string is *not* a valid revision:  it contains a Python syntax error, at least19:40
jelmerTresEquis: it doesn't occur anywhere in history?19:58
TresEquisjelmer: nope19:58
MTecknologyIn bzr explorer, is there any way to run 'bzr pull' a lot of branches at once?19:59
TresEquisjelmer: it looks like a partial / intermediate change between the version of the file svn r4908 and the version in svn r509019:59
TresEquisbut it also includes text which wasn't added until 514720:02
TresEquisthe developer who committed 5147 maybe was using bzr-svn?20:03
TresEquisI don't know if there is any way to see "fingerprints" left by such a commit, assuming bzr-svn made it20:04
reehi jelmer TresEquis20:04
TresEquisah, ree is the developer I spoke of20:05
reeze one who messed up things, right :)20:05
TresEquisree:  do you think you might have committed svn r5147 via bzr?20:06
reenot sure.20:06
reeor bzr, or merge from our imagedrawer branch... which was also bzr'd20:07
reeso this may well be the root of the problem but I don't know how to be sure20:07
reemerge from our imagedrawer branch = with pure svn, that is20:08
TresEquisI do see a bunch of bzr: properties on the svn r5090 dump20:10
TresEquiswhich is the one where you merged the imagedrawer branch20:10
reeyes. I am not even sure if that one was merged with bzr or with svn20:11
TresEquisbzr:revision-info, bzr:ancestry, bzr:file-ids, bzr:revision-id, bzr:text-parents, bzr:text-revisions20:11
TresEquisplus svn:mergeinfo and svk:merge ;(20:12
reehow nice20:12
reethe svk bit was someone else ;)20:12
reeTresEquis, in fact it is possible that I done that one with svn20:13
reesorry, usage history longer then memory20:13
reejelmer, would it not be possible, in theory, that bzr-svn just ignores the wrong info, and misses "something" but not the whole lot?20:15
ree'cause it may have been my fault, but if I could do it others will do it I can guarantee20:15
reeso that's maybe something bzr-svn should be prepared of20:15
ree^20:15
TresEquisI think it may be possible to scrub out the bzr: revision properties20:21
TresEquisI will want to try on a scratch repo first20:21
reeTresEquis, that would solve it20:24
TresEquisree: those bzr: properties are not "revision properties" (which are unversioned, and can be changed later), but "tree properties"20:38
TresEquiswhich are revisioned20:38
reed'oh20:40
reedoes this prove that it was me with svn? or it could have been bzr?20:41
TresEquisI don't see how svn would have been adding bzr: properties20:46
TresEquisbut using svn to merge a branch to which those properties had been added earlier via bzr-svn would be plausible20:47
TresEquisI also have no evidence that those properties have anything to do with the error20:47
TresEquisnone of those properties are on the affected file, or its parents20:49
jelmerTresEquis: but they mention the affected file perhaps?20:52
jelmerTresEquis: what version of bzr-svn are you testing with?20:52
TresEquis2.1.120:52
reejelmer TresEquis it was definitely the case, that the properties were on the branch being merged20:54
jelmerTresEquis: of bzr-svn I mean?20:54
reebut, what buggers me is that there is no evidence that those properties have anything to do with the error20:54
TresEquisjelmer: http://paste.ubuntu.com/436359/20:55
reejelmer, I have the issue with 1.0.220:55
jelmerree: Have you tried bzr-svn trunk ?20:55
reeno, but I can20:55
jelmerplease do20:56
TresEquisjelmer bzr plugins says 1.0.220:56
jelmerTresEquis: can you please also try with trunk ?20:56
TresEquisthe file which blows up the checkout / import is karl/trunk/karl/content/views/blog.py20:56
TresEquisjelmer: like so?  $ bzr co lp:bzr-svn ~/.bazaar/plugins/svn20:57
jelmerTresEquis: yep20:58
hnoHow do I temporarily go back to a specific revision? Neither update or switch seem to take revision specifiers.20:59
reeTresEquis, tx20:59
hnoI can do a checkout, but that seems a bit overkill..21:00
TresEquishno: bzr up takes a -r / --revision arg21:01
hnoTresEquis: Maybe by bzr on this box is too old then.. 1.18.1.21:02
hnolong overdue for upgrade anyway.21:02
TresEquishno: I really like the new "shared revisions" repo format21:03
reejelmer, checkout of our project will take some time, cc 10 min21:03
* ree doing with trunk21:03
* TresEquis as well21:04
TresEquisand halfway there21:04
hnoTresEquis: "shared revisions"? Is this part of the 2a format?21:05
TresEquis"Shared repository with trees"21:05
TresEquisright, 2a21:05
TresEquisI misremembered21:05
lifelesshno: no, we've supported shared repos since 1.021:06
lifeless(actually a bit older still, but meh)21:06
reeI just wish joining worked solidly with svn. (to overcome externals)21:06
reewe had a project (kss) that we could never switch to bzr for this reason, mainly21:07
TresEquisjelmer:  I'm back at the pdb.set_trace I added in bzrlib21:07
hnolifeless: I know.21:07
lifelessjam: land that pyrex patch; its like coding on top of a sea21:07
TresEquisjelmer:  same crash21:08
jelmer'morning lifeless21:08
TresEquissame busted not-really-a-revision ;(21:08
jelmerTresEquis: :-(21:09
* ree still just at 488/108921:09
lifelesshi jelmer21:09
TresEquisjelmer: the 'window' tuple has the bits which cause the borked file version in the 'new_data' field21:10
jelmerTresEquis: I suspect the base text is invalid and that's causing the problems21:11
TresEquisis that the 'sview'?21:12
lifelesshno: yes, -r on update is new21:13
lifelesshno: or you can use revert -r21:13
lifelesswhich has been around for ages.21:13
hnolifeless: I do not want to revert, just switch to that revision..21:15
TresEquisjelmer: the 'sview' has the same text as svn r490821:15
reeTresEquis, why was it so much faster for you? Working from a server or something?21:15
TresEquisree: dunno -- I started earlier, maybe21:16
reeTresEquis, did you do a bzr get, or a bzr co?21:16
reeor that shouldn't matter.21:16
TresEquisso, it is trying to apply the patch from r5090 - r5147 against the base from r490821:17
TresEquisree: I did 'bzr co'21:17
lifelesshno: yes, so using your version of bzr: bzr shelve --all; bzr revert -r X; bzr unshelve21:19
lifelesshno: will get you onto that revision the same as update -r21:20
TresEquisjelmer: the 'apply_txdelta_window' curried 'apply_window' has a value for 'sbuf' which is from the wrong source revision21:21
TresEquisbut I can't see who called that code in the first place21:22
jelmerTresEquis: it's called from fetch.py21:23
TresEquisjelmer: does that mean that the checksum matched before the currried bit was returned?21:27
jelmerTresEquis: the base text is wrong21:27
jelmerTresEquis: so yes21:28
jelmerI mean no21:28
jelmersorry :)21:28
hnolifeless: Think I prefer checkout -r then...21:28
* hno starts a 60 seconds countdown of the remaining lifetime of this install. Time for a complete system update.21:29
lifelesshno: why?21:30
TresEquisugh21:32
hnolifeless: Because I like to? And the distro release used becomes end-of-life in some weeks..21:33
lifelesshno: I meant 'why do you prefer checkout -r'21:33
lifelessI am very happy that you're upgrading :)21:33
hnoBecause I do not want to accidently commit that revert.21:34
lifelessk21:34
TresEquishno:  just figured out I knew you from Squid list21:35
lifeless:)21:35
hnoTresEquis: Thanks21:35
lifelessfree software is a small small world21:35
hnoindeed. And hi lifeless ;-)21:35
lifeless:)21:36
hnoOk, countdown ended. Time for system update. See you later and meanwhile let #bzr return to normal high squid developers presence level.21:37
lifelessciao21:38
TresEquisack , curried functinos are a pain to debug21:39
TresEquiscurried functions called by C code are even worse21:39
jelmerTresEquis: that's not really the problem here though, the issue is before the curried code21:40
TresEquisjelmer: yeah, but the curried code is the only place I can detect the problem ;(21:41
jelmerTresEquis: look at SvnEditor.apply_textdelta21:41
TresEquisthe currying gives me no way to get back to the 'self' of the think which created it21:42
jelmerTresEquis: if you go up in pdb?21:42
TresEquisup lands in 'report_inventory_contents'21:46
jelmerTresEquis: but down from that there is apply_textdelta?21:50
TresEquisno21:52
TresEquisdown from there is the curried 'apply_window'21:53
jelmerah, right21:53
jelmerhave you tried setting a breakpoint in apply_window when the problematic file is processed?21:53
TresEquisI have the breakpoint in the apply_txdelta_window function, right before the failing assert21:54
TresEquisthat is the bottom of the traceback21:54
jelmerthat's too late though21:56
jelmeryou need the place where the base text is retrieved21:57
TresEquisyep21:59
NightNordGreeting, everyone. Is there any kind of UTF-8 to native encoding when commiting/pulling to/from remote repository in bazaar, as it is done in subversion?22:00
jelmerNightNord: for paths, commit messages, etc - yes22:00
jelmerNightNord: not for file contents (similar to subversion)22:00
TresEquisjelmer: I have added yet-another-layer-of-indirection in fetch.py22:02
NightNordToo bad, it seems that none of git,hg,bzr capable of this feature. Curious, that CRLF/LF conversion is done in bazaar...22:02
NightNordjelmer: thanks22:02
TresEquiscurrying the curry with a method, to get me access to self22:02
lifelessvila: around ?22:04
lifelessNightNord: what do you mean ?22:06
NightNordlifeless: any known for me DVCS incapabable for switching text-file encodings, despite of that eol conversion could be done without marking all converted files as 'changed'-ones22:08
NightNordIn theory, same trick could be used for encoding conversion22:09
MTecknologywhere is .bazaar/plugins/ in windows?22:13
lifelessNightNord: sure, you could write a plugin to do that for bzr22:13
lifelessMTecknology: bzr --version should show you22:13
MTecknologylifeless: thanks22:13
NightNordlifeless: if plugin is something the same as for git are 'hooks', I suppose it's quite hacky operation... At least if not checking bzr code =)22:17
guijemontjelmer: how do you run bzr-gtk's unit tests?22:17
jelmer"bzr selftest bzrlib.plugins.gtk"22:17
lifelessguijemont: bzr selftest plugins.gtk22:18
lifelessNightNord: filters to do changes like that are a supported feature, not hacky at all.22:18
NightNordHm... That's could done a trick. I'll dig in, thanks, lifeless22:19
guijemontaha, didn't know about that command22:19
lifelessNightNord: if you're new to python you'll probably find the learning curve a little steep; folk here or on the mailing list will be happy to help, I'm sure.22:19
TresEquisjelmer: ok, different stab:  I'll make 'self.chunks' on the FileRevisionBuildEditor an instance of a class derived from list, but which holds onto a reference to the editor22:20
guijemonttime to see how many tests I broke22:21
TresEquisWaiting 10 minutes between tries is not good for staying in the flow ;(22:21
NightNordlifeless: Actually, I'll need to run single very simple shell command (find -name '*.cpp' -exec enca -x KOI8-R '{}' \;), so, I hope, my knowledge in python and some working plugin as example are sufficient. But thanks for invite, anyway =)22:23
lifelessNightNord: you'll need to do the reverse as well, for the input filter22:25
lifelessotherwise you'll commit in your local encoding22:25
NightNordYes, I know, I just simplified description to write less ;)22:26
lifelessok22:27
NightNordI found checkeol plugin, I suppose it will serve as good base22:27
TresEquisjelmer: ok, that hack gets me to the editor instance22:27
TresEquisonly I lost my pdb prompt, gotta run again ;(22:27
reeTresEquis, got to go, good luck!22:28
reejelmer, thanks!22:29
TresEquisjelmer: what information is interesting from the editor?  base_ie?22:33
NightNordlifeless: hah, looks like plugins are actually like git hooks. And I see no plugins that actually 'change' data without marking it as changed22:39
lifelessNightNord: The eol plugin22:40
NightNordAh, you mean embedded one...22:41
NightNordNow I finally got your point. There is a special type of plug-ins, called 'filters', which are exactly what I need22:42
lifelessyes, we hope22:44
TresEquisjelmer: the base_ie shows that it bzr-svn does think that the parent revision for svn r5147 is svn r4908, instead of r509022:44
lifelessnot widely used, but if it doesn't fit file a bug and we'll fix.22:44
TresEquisnow trying to figure out why22:45
jelmerTresEquis: please note that this is the per-file base, not the per-revision base22:45
jelmerand it's the revision against which the diff is sent, that's also not necessarily the base22:45
jelmers/the revision/the file revision/22:46
TresEquisjelmer: (Pdb) parent.base_ie.revision22:46
TresEquis'svn-v4:4f889dee-8c54-0410-98c1-98789d956ae4:karl/trunk:4908'22:46
TresEquisdoesn't that mean that we think the base version of the file is from svn r4908?22:47
NightNordlifeless: simple hack over eol.py show that it fit well. It's even simplier then I thought initially. Thanks again.22:47
TresEquisbecause svn thinks that the base revision is 509022:47
MTecknologyis there any installer package for tortoisebzr on windows?22:48
jelmerTresEquis: it only means we expect svn to send the delta against the base text in that revision22:48
jelmerTresEquis: how can you tell svn thinks the base revision is 5090?22:49
jelmeris that the base revision of the overall revision or of this particular file revision?22:49
TresEquissvnlog shows 4098, followed by 5090, followed by 5147 (the last is the one which blows up)22:49
jelmeris the file changed at all in r5090?22:50
lifelessNightNord: cool22:50
=== jelmer_ is now known as jelmer
NightNordlifeless: Actually, quick googling "git content filter" told me, that git supports just the same feature as well. But I will probably stick with bzr on this project, as folks at #git didn't know an answer for same question =)22:52
TresEquisjelmer: svn log of this particular file22:53
TresEquisthe diff is a diff against 509022:53
TresEquis5090 was, however, a revision which involved merging a branch22:53
TresEquisso maybe we are deceived by the metadata about the merge?22:53
TresEquisyes22:53
TresEquisjelmer: I set a conditional pdb.set_trace() inside FileRevisionBuildEditor.__init__22:54
TresEquisthe first time it hits, it is being called from open_file with base_revnum=508922:55
mwhudsonis there any way of doing what bzr replay does that works on paths rather than fileids?22:57
TresEquisjelmer: the second time, the base_revnum of the caller is 514622:58
TresEquisjelmer: interesting, the 'len' attribute of the base_ie object matches the len of the r5090 version of the file, but its revision is still 409823:04
jelmerso it looks like we're storing the wrong file under the r4098 revid23:07
TresEquisor mapping to it inappropriately?23:08
TresEquisthe file's text matches the 4098 revid23:08
TresEquisbut not its length23:08
TresEquisanything you's like me to look at about the editor?23:09
TresEquisits parent_trees are both tied to svn r514623:09
TresEquisas its base_tree23:09
TresEquisits revid is svn r514723:10
TresEquisin the call to _open_file, the file_id and base_file_id are the same23:13
jelmerTresEquis: sorry, don't have time to help debug this at the moment :-/23:15
TresEquisjelmer: ok, thanks23:19
mwhudsonhm23:20
mwhudsonis there any way i can cherry pick changes to just one file?23:21
lifelessyes23:26
lifelessmwhudson: merge filename23:27
mwhudsonlifeless: ah right23:29
mwhudsonthanks23:29
lifelessjam: tsk, you skipped mentioning pyrex in your fix ;P23:35
lifelessin NEWS, I mean.23:35
mgzmentioning slash blaming?23:38
lifelessoh blaming, most definitely23:39
lifelessdoing 2.0->2.123:39
lifelessto propogate the pyrex fix23:39
lifelesshmm, I want a health checker for our branches23:39
pooliehi all23:49
mgzhello!23:50
pooliemartin?23:50
mgzyup, vila made me get a nick that doesn't take half an hour to type ;)23:50
bignosebah. let them eat tab completion.23:53
TresEquisjelmer: I tried to summarize my findings on the LP issue23:59

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