/srv/irclogs.ubuntu.com/2009/12/02/#bzr.txt

=== sdboyer_ is now known as sdboyer
lifelesspoolie: have you read transition (iain banks)00:08
pooliemaybe, is that the new one?00:16
domashi! does bzr support shallow clones?00:16
chxdomas: sorry, what do you mean?00:19
chxdomas: also if i got the chance to talk to you, are you now working on Cassandra?00:20
domasI'm working on MySQL00:21
chxAt Facebook? Interesting development :)00:21
domaswhy?00:21
domasfacebook is mysql shop, isn't it? :)00:22
chxwell, they released cassandra didnt they :)00:22
domasyou missed http://www.facebook.com/MySQLatFacebook?ref=nf  ? :)00:22
chxyes i did00:24
chxanyways, let me answer to my best knowledge -- bzr does not support that but i am a humble bzr user not a developer. afaik bzr works with complete trees always.00:25
domashehe00:25
chxor what you really mean by shallow clone?00:25
domasyeah, I don't want to know everything about every revision ten years ago00:25
PengUse a stacked branch?00:25
domasworks locally00:26
domasnot remotely :)00:26
chxuse checkout?00:26
chxcheckout --lightweight?00:26
domasit won't be a branch then! ;-)00:27
chxyou can commit --local :)00:27
domashm! ;-)00:27
chxnot to lightweight.00:27
lifelessdomas: we don't support offline shallow clones00:27
chxbut normal co , yea00:27
lifelessdomas: we do support online shallow clones - thats a stacked branch. However we don't support committing directly to those yet.00:28
domaschx: anyway, to answer properly your question, fb is very much mysql shop, Mark Callaghan started to work few months ago, I joined recently too00:30
chxgreat00:30
pooliekfogel: hi, thanks for following up about the contributor agreement01:14
=== mneptok is now known as weremnep
=== weremnep is now known as mneptok
poolieall, please take a few stabs at https://answers.edge.launchpad.net/bzr/+questions?field.sort=recently+updated+first&field.actions.search=Search&field.status=Open&field.search_text=01:41
mwhudsoni think stephen turnbull has managed to find a way to make his network connections travel faster than light...01:59
Pengmwhudson: ?02:08
mwhudsonPeng: claiming that ssh vs not only makes a difference between 5 and 15 ms02:08
lifeless15 light milliseconds02:08
lifeless4486 kilometres, I think02:08
mwhudsonlifeless: that's about what i came out with02:09
idnarhahaha02:09
PengHeh.02:09
PengIf you use a master SSH connection, you don't have to reconnect every time.02:10
PengI do that when I'm busy with LP. I figure it'd be rude to keep a connection open 24/7, though.02:10
lifelessPeng: its still not long enough to send to the uk and back.02:10
lifelessunits\n15 light milli seconds\n kilometres02:10
PengI know. I was just sayin'.02:11
mwhudsonPeng: right02:12
mwhudsonPeng: keeping an sftp connection open is fine02:12
PengOh? What's the difference?02:13
lifelessand idle master connection is just a tcp socket02:13
lifelessmore-or-less02:13
PengOh, really? I would've assumed there was an sshd on the remote side.02:13
Pengsshd process*02:14
lifelessif we ran sshd02:14
Penglifeless: Oh. Right.02:27
PengSo, it's OK to leave a connection open? :D02:27
lifelessif mwhudson says so02:35
mwhudsonwell if everyone did it life might get a bit interesting02:36
mwhudsonbut yes, it should be fine02:36
_AndrewAnyone here used bzr upload?03:15
_Andrewhttps://launchpad.net/bzr-upload03:15
lifelessmany people I think03:16
AfCIf I'd like to use bzr-git, where might I best get it from? It doesn't seem to be in https://launchpad.net/~bzr/+archive/ppa04:20
=== shikibu_ is now known as shikibu
PengOh, looks like I opened a connection 7 hours ago and forgot. :D04:22
Pengpoolie: I'd prefer a lawnmower shed. :D04:41
poolielifeless: i guess discussing which of them is best is not bad05:02
pooliebut ... random measurements of latency don't seem very correlated with that05:03
lifelessEOD06:24
ovnicrafthi folks, if i branch a lp:project and make my changes after this i push in other branch, that maintain the stack branch default?06:39
Pengovnicraft: ....Yes?06:42
Pengovnicraft: Pushing to LP will automatically stack on the project's development focus branch.06:42
ovnicraftPeng, so the project what i branch has 53MB but pushing after my 2KB changes continue pushing in 70MB, this is for stack?06:45
PengWhat?06:48
* lifeless guesses a transcoding issue.06:59
AfCI'm so sorry to be dense, but am I missing anything on https://launchpad.net/bzr-git which would tell someone who knows better where to get a .deb of it from?07:34
vilahi all07:35
Kamping_KaiserAfC: its packaged in debian(unstable/testing)/derivatives, if you want a newer version you might need to backport yourself.07:37
AfCKamping_Kaiser: ah07:37
AfCKamping_Kaiser: alright, thanks.07:37
Kamping_KaiserAfC: np... if you find a backport for debian stable let me know ;)07:38
AfCThat's the second time today I've hit "seems like it's time to learn how to add Debian repositories to my /etc/apt/sources.list & pinning with /etc/apt/preferences"07:38
Kamping_Kaiserhehe. advice: add the repos to sources.list.d/foo.list07:39
AfCStill; it doesn't seem unreasonable to wonder if we might get bzr-git & dulwich into the ~bzr/ppa07:42
lifelessAfC: useful commands to know, #432, 'rmadison bzr-git' and 'rmadison -u debian bzr-git'07:43
AfCNot sure what might inhibit that.07:43
poolieafc, for ubuntu or for debian?07:43
lifelessAfC: also apt-cache policy bzr-git07:43
AfCpoolie: Karmic07:43
pooliepresumably for ubuntu07:43
AfCrmadison?07:43
lifelessAfC: 0.4.1-1 is the version in Debian, and in ubuntu:07:43
pooliesounds even more like something pornographic07:43
lifeless   bzr-git |    0.4.1-1 | karmic/universe | source, all07:43
poolieanyhow, good night07:43
lifeless   bzr-git |    0.4.1-1 |      unstable | source, all07:43
lifelesspoolie: :P remote madison07:44
poolie:)07:44
pooliei did guess actualyl07:44
AfClifeless: jeesh! so it is.07:44
AfCNot sure how I missed that. Whatever I searched on didn't turn it up.07:44
AfCOh, well, I looked at the bzr PPA page, since that's where I get Bazaar from, and so the absence of bzr-git there threw me.07:45
AfClifeless: so; _would_ it be appropriate for newer releases of bzr-git & dulwich to be in ~bzr/ppa?07:45
vilaAfC: yes07:48
* vila disclaims: I may not be the one doing it :)07:49
AfCvila: sure07:50
* AfC gets that07:50
vilaAfC: But I was as surprised as you to not find it in https://launchpad.net/~bzr/+archive/ppa07:51
bialixhi08:30
donriare branches directories like in svn or histories like in git?09:14
bialixthey are like in bzr09:16
* chx grins09:16
chxdonri: yes a branch is a directory but unlike in svn it's one unit you can't checkout a subdir or commit it.09:17
chxdonri: and that's a GOOD thing. One of the reasons I love bzr.09:17
donriuhm. i can't stand thingsl like /project/trunk :/09:19
bob2so don't name them that way09:19
bialixdonri: every branch in bzr is like separate clone in git09:20
donrisounds expensive09:21
bialixhello vila, have a minute?09:21
bialixdonri: yeah, and we have rich-roots in addition09:21
bob2directories cost up to 4KB of disk09:21
vilabialix: ask your question :)09:22
bialixso bzr is for rich people. perhaps09:22
vilabialix: and hi !09:22
bialixvila: about real gui testing in qbzr09:22
bialixmaybe it's good idea to check some env variable and skip those tests?09:22
bialixe.g. QBZR_DISABLE_GUI_TEST09:22
bialixor something like that? what do you think?09:22
donria git clone holds complete history, usually quite more than 4kb09:22
bialixdonri: yep, bzr too09:23
chxlast i checked, disk space, for all practical usages was free. (youtube videos are not practical :p)09:23
bialixdonri, but you can cheat and use shared repo09:23
donriso if i want a topic branch, i have to copy the whole project?09:23
bob2donri: of course not09:23
vilabialix: That's a good workaround if you can't find a better way, at least on unix, DISPLAY should be set if you want to be able to display anything, I guess it doesn't matter on windows09:23
vilabialix: what is your motivation ?09:24
bialixvila: yep, it does not matter on windows, I wanna cross-platform way09:24
vilato check what ?09:24
vilathat a display is available ?09:24
bialixvila: I'll add more of such tests, trying to figure out how's better layout our tests09:24
donriso if i want a topic branch, i have to keep a directory both for the source branch and the new branch? i quite like the cleanliness of gits "one directory, use commands like checkout to change state"09:25
bialixno, I'm just want a useful knob to disable them sometimes for speed reasons09:25
vilaa test feature, then you can decide how probe() should behave09:25
bob2donri: what's your interest in bzr?09:25
bialixdonri: look http://oxygene.sk/lukas/2009/10/working-with-branches-in-bazaar/09:26
viladonri: first you have to understand the difference between a branch and a working tree, in both bzr and git branches are cheap, but in bzr the default workflow creates a working tree for each branch. If you don't want that behavior you have to work a bit more09:27
bialixvila: another possibility is to separate gui and non-gui tests to different subpackages and control with selftest regexp09:28
vilaI don't use git, but I'm pretty sure you have several working trees by working a bit more too09:28
vilabialix: that's up to you, but using a test feature will offer greater flexibility09:28
bialixvila: does knob via env variable is good candidate for feature?09:29
bialixvila: I understand what you mean about $DISPLAY09:29
bialixbut this is slightly different use case09:30
vilaanything that can be checked by python code is a good candidate, the sky is the limit ! :) What is the qbzr basic sanity check before displaying any window ?09:32
bialixvila: mmm? only presence of pyqt4 I guess09:32
vilabialix: hmm, so what happens if I try to run qlog on an headless PC ?09:33
bialixheadless?09:33
bialixwhat's that beast09:33
vilawith no screen, a server for example09:34
bialixoh, I have no idea09:34
bialixperhaps it will eat your kitty09:34
vilalol09:34
vilaok, that's exactly the missing check :)09:34
bialixI suspect qt is smart enough to check this itself09:35
vila...and raise an appropriate error, that's the error you want to check09:36
vilabzr-gtk does that in __init__.py.opend_display()09:36
* bialix checks09:36
bialixvila: do you have headless server to check?09:36
smartgpxGreetings. I have a documentation 'sanity check' question. Could someone glance at http://doc.bazaar-vcs.org/bzr.2.0/en/user-guide/publishing_a_branch.html09:37
vilano, the best I can do is to unset DISPLAY I presume, let me checl09:37
vilabzr: cannot connect to X server is what I get09:38
smartgpxIn 'example of the Second Way' I think the final push is typographically wrong (should be PROJECT u/c) and redundant?09:38
vila'bzr: cannot connect to X server' is what I get09:38
bialixcan you pastebin traceback?09:39
vilabialix: no traceback09:39
bialixeven in .bzr.log?09:40
vilaeven in .bzr.log09:40
* bialix mutters: interesting bzr-gtk is not support 1.18, but does support 2.1, funny09:40
bialixvila: cannoct connect to X server is different from bzr-gtk check ("could not open display")09:41
bialix(I know I'm boring and overly pedantic)09:42
vilabialix: what makes you think 1.18 is not supported ?09:43
bialixthere is explicit list of supported versions09:43
vilaand the errors are different because is not qt maybe ? :-D09:43
bialixafter 1.17 there is 2.109:43
vilabialix: no, there is a list of supported bzrlib APIs09:43
bialixthe variable called COMPATIBLE_BZR_VERSIONS09:44
bialixnot COMPATIBLE_BZR_API09:44
bialix(the same remark about bialix boring)09:44
bialixignore me09:45
vilabialix: read the next line, what matters is how the variable is used :)09:45
bialixthanks vila, I will try to do something about qbzr test suite soon09:45
vilabialix: but if you have a patch to clarify gtk sources, it will be welcome :-D09:46
vilaBIG FLASHING RED JOKE, this code lies anyway, like all plugins only the latests bzr versions are supported, devs are just too lazy to maintain an accurate list :)09:46
bialix:-D09:52
bialixthat's why we don't have such list09:56
smartgpxGreetings. I have a documentation 'sanity check' question. Could someone glance at http://doc.bazaar-vcs.org/bzr.2.0/en/user-guide/publishing_a_branch.html10:03
smartgpxIn 'example of the Second Way' I think the final push is typographically wrong (should be PROJECT u/c) and redundant?10:04
bialixsmartgpx: you're right10:24
bialixpush is wrong there, because in 2nd case it's checkout10:24
bialixsmartgpx: I think you're welcome to https://launchpad.net/~bzr-doc10:25
smartgpxthanks. still sufficiently 'newbie' to be uncertain, but it seemed to conflict with the explanation in the next sentence.10:25
smartgpxI'll look at patching it. (a one-line deletion)10:26
bialixcopy-paste error I guess10:26
smartgpxYes, except that the case 0f the PROJECT dir changed. no matter, we know what to do.10:27
bialixall this cp -ar stuff is not very windows friendly, so I'm just ignore it10:33
smartgpxbialix: so, are you working on that doc then? Agree with your comments about cp, but I can see it's difficult to make cli examples os-neutral10:36
bialixsmartgpx: no, I'm working on qbzr10:36
bialixI'm not native English man, so working on English docs is not for me10:37
bialixthis was just "sigh" comment10:37
smartgpxto save me a long Branch operation, is the source in lp:bzr ? (or lp:bzr-alldocs ?)10:38
smartgpxOK - brain in gear, I can browse LP to find out before I Branch them! no reply needed.10:39
ibboTI'm trying to do a bzr pull from my launchpad project, but it only gets a small way in the "pull phase" and then hangs10:53
ibboThmm it's finally completed after 10 mins10:58
_AndrewAnyone know off the top of their heads where I install plugins on ubuntu to make them system wide11:14
_Andrew/usr/share/pyshared/bzrlib/plugins ?11:15
beaumontathanks vila for the merge... but didn't you already provide an alternative solution? (i'm talking about my bzr-upload branch)11:16
vilabeaumonta: I think it was built on top of yours (or at least on top of your idea). I was just cleaning up the merge proposals queue and thought 'merged' was the closest status for yours11:17
vila_Andrew: 'bzr plugins -v' should give your pointers11:18
beaumontavila: I see, so it's not a real code merge, ok, thanks for your consideration!11:23
vilabeaumonta: thanks for your contribution, without you the option would still be waiting to be implemented :-D11:23
beaumontavila: yup :)11:48
LeoNerdShould I expect sshfs to get in the way of bzr at all? I have a local SVN checkout, and "bzr st" works fine on it using bzr-svn. I have an sshfs mount of a remote machine having checked out the same thing. That throws a wobbly about: bzr: ERROR: exceptions.TypeError: expected a character buffer object11:55
LeoNerdAhh.. It seems sshfs isn't the problem.. I can sshfs mount localhost in some crazy loopback setup, and bzr-svn works fine over that. I suspect maybe bzr-svn is confused by the remote checkout12:13
LeoNerdAnd.. yes.. if I make my local desktop 'svn co' it again, then bzr is happy with it. I think I blame the remote svn12:18
jelmerLeoNerd, can you paste a backtrace?12:26
LeoNerdhttp://paste.leonerd.org.uk/?show=69812:27
jelmerLeoNerd, hmm, that's odd - I didn't know repos could be None12:36
LeoNerdMmm?12:37
jelmercan you add a line before that assertion in workingtree.py?12:38
jelmerprint self.entry.repos12:38
jelmerI suspect that will print None12:38
LeoNerdNone indeed12:41
maxbIf 'repos' is repository root url gleaned from the subversion working copy, then it will be because ancient svn versions didn't record that information12:48
vilabialix: ping14:23
vilabialix: I'd like your input about win32utils.get_console_size(), there is a comment there about avoiding problem with redirecting output via pipe and using stderr instead. But what if stderr is redirected too ?14:24
bialixvila: heya!14:24
bialixvila: if stderr is also redirected then we fallback to default value14:25
bialixI can test for you14:25
bialixit was long time ago14:25
vilaoh, because the GetConsoleScreenBufferInfo fail ?14:25
bialixwhat's your real question?14:25
vila:-)14:25
bialixIIRC -- yes14:25
* bialix looks at the code14:26
vilaWe want to change the default width to None instead of 80 when we can't establish the terminal width14:26
vilabah, don't worry, I can just pass None as the default value, no need to modify that function...14:27
bialixcool :-D14:27
bialixalways happy to help14:27
bialix:-D14:27
vilathanks for being my teddy bear :)14:27
vilai.e. the one listening to my baby cries :)14:28
bialixnever had teddy bear14:29
vilaI had a rabbit myself :)14:29
bialixbut one nice girl once upon ago call me "bear"14:29
bialixdespite my appearance14:30
bialix:-D14:30
jammorning all14:39
vilamorning jam !14:51
chxmorning ham! :p14:52
bialixhi jam14:52
jammorning chy14:54
jamand vila and bialix14:54
vilavilb and bialy ?14:55
vilabialiy, sorry for the typo :D14:55
=== vds1 is now known as vds
jamwell he was the only one to typo15:37
kfogeljelmer: have you seen https://lists.ubuntu.com/archives/bazaar/2009q4/064932.html?  Apparently Norbert Tretkowski has uploaded a bzr 2.0.2 lenny backport to http://people.debian.org/~nobse/temp/bzr/.  He said he was going to upload it to backports.org, but I don't see it at http://packages.debian.org/lenny-backports/bzr.  Is this something you can do?  (It would help us for the Emacs switchover.)15:44
jelmerkfogel: I am able to upload, but we should probably check with him15:53
kfogeljelmer: I don't know him, and his email address doesn't appear to be in that mail, but do you know how to contact him?  I can try to track him down if not.15:54
jelmerkfogel, his email address is nobse at debian.org15:54
jelmerhe is also here on IRC as nobse15:55
jelmerIf you haven't asked him about the backports yet, I'm happy to talk to him15:55
kfogeljelmer: I haven't talked to him about it yet.  If you can coordinate with him, that'd be great.  As soon as it's on backports, we'll ask the savannah.gnu.org admins to install it, and there's some built-in delay there already (as they're volunteers).15:57
pickscrapeHi, is anyone able to help me with a bundlebuggy (or possibly rio-related) problem?16:03
pickscrapeWe've been using BB just fine for months. Today it is broken, in a very odd way.16:04
pickscrapeWe are getting the following backtrace when viewing a merge request: http://pastebin.com/m85d219416:05
=== beuno is now known as beuno-lunch
pickscrapeNow, the request list pages currently work, but they didn't before I rejected the three requests that were submitted this morning. They also failed with similar backtraces.16:06
pickscrapeThe only thing I can think of is that last night I did a merge with the upstream BB trunk. But all that did was bring in the lastest revision "Merge references fix"16:06
pickscrapeI have since reverted that change, but we still have a broken BB.16:06
pickscrapebzr version on the server is 2.0.116:07
pickscrapePython 2.5.416:07
jelmerkfogel: I've pinged him in private but he doesn't appear to be around at the moment16:09
jelmerkfogel: I'll try to remember to ask him about it again in the next few days16:10
kfogeljelmer: thanks16:10
jelmerkfogel: the package is already uploaded but waiting for manual approval because it introduces a new binary package - nobse is doing that now, so I suspect the package should be on backports.org in a day or so16:19
RenatoSilvaverterok: hi16:20
jelmerkfogel, s/day/hour/16:20
kfogeljelmer: excellent!  Thank you.  I'll keep checking.16:20
=== beuno-lunch is now known as beuno
dOxxxif I have an unversioned subdirectory containing unversioned files, in a branch working tree, 'bzr ls' should or should not list the unversioned files in the unversioned subdirectory?17:35
hazmatis there a magic switch to enable post mortem debugging in bzr?17:47
jelmerhazmat: set BZR_PDB=1 (as environment variable)17:51
jelmerLeoNerd, any chance you can try again with bzr-svn trunk?17:54
hazmatjelmer, thx17:56
LeoNerdjelmer: Hmm... if I work out how to install that, rather than just using the debian package...18:03
jelmerLeoNerd, bzr branch lp:bzr-svn ~/.bazaar/plugins/svn18:03
LeoNerdOK.. it fails in a different way :)18:05
LeoNerdTypeError: object of type 'NoneType' has no len()  at    File "/home/paul/.bazaar/plugins/svn/tree.py", line 385, in find_ids      relpath = urllib.unquote(entry.url[len(entry.repos):].strip("/"))18:05
jelmerLeoNerd, please pull and try again18:09
jelmerI've committed a fix for that particular issue18:09
LeoNerdNo revisions to pull.18:09
maxbI would like to discover the history of discussions into URL formats for addressing colocated branches. Can anyone point me in the right direction?18:14
jelmerLeoNerd, sorry, please try again18:14
jelmermaxb, have you tried searching the mailing list archives for "colocated branches" ?18:14
jelmermaxb: Also, see doc/developers/colocated-branches.txt18:15
jelmercontains a link to the discussion on the list18:15
maxbaha, thanks. lists.ubuntu.com isn't searchable, unfortunately18:16
LeoNerdjelmer: OK... 'bzr st' now works.. :) claims my working tree is out of date, so I bzr up, which... segfaults. :)18:16
LeoNerdBut.. no great problem; I can svn up on the remote end... I mainly wanted bzr for the shelve ability18:16
jelmerLeoNerd: probably a similar issue where we rely on .repos being non-None18:18
jelmeror, in the C code - non-NULL18:18
LeoNerdYah..18:18
LeoNerdIt's possibly not that important to fix... the version of svn that created this checkout is quite old18:18
LeoNerdsvn, version 1.1.4 (r13838)   compiled May 10 2005, 13:50:02    it claims18:18
jelmerLeoNerd, It would still be nice to fix - if you are familiar with gdb, any chance you can get a backtrace?18:19
LeoNerdHrm.... gdb claims /usr/bin/bzr is not an executable file format18:21
LeoNerdAhh.. do I have to  gdb python ?18:21
LeoNerdHrm.... I have a backtrace, but it's mostly Python internals...18:24
jelmerthat might still be helpful18:24
LeoNerdhttp://paste.leonerd.org.uk/?show=69918:24
jelmerah, it's unfortunate you don't have debugging symbols for subvertpy18:25
LeoNerdHrm.. no debug package appears in debian18:27
beunoabentley, hi, are you around?   do you have any insight on: http://paste.ubuntu.com/333305/18:29
dOxxxbeuno: looks like bug 27397818:30
ubottuLaunchpad bug 273978 in bzr "UnicodeDecodeError when strerror is not ascii" [Low,Confirmed] https://launchpad.net/bugs/27397818:30
dOxxxbuuuut maybe not18:31
dOxxxI remember seeing that error before though18:31
abentleybeuno: I haven't looked at that yet.18:31
beunodOxxx, I think that this bug may be in bzrtools instead of bzr18:31
dOxxxbeuno: gotcha.18:32
abentleybeuno: it looks like bug 35200618:33
ubottuLaunchpad bug 352006 in bzrtools ""bzr branch-history | more" fails with UnicodeEncodeError" [Undecided,New] https://launchpad.net/bugs/35200618:33
beunoabentley, it does, thanks. the Emacs guys are hitting this bug18:34
abentleybeuno: I'm surprised, because even I don't use that command anymore.18:35
beunoabentley, I don't even use emacs  :)18:35
beunoI have no idea why they're using it18:35
abentleybeuno: I've never even shopped at a bazaar :-)18:36
beunoheh, touche18:36
amanicaI'm having difficulty to branch from launchpad ATM eg. `bzr branch lp:bzr-explorer`  .  Is it just me ?18:48
LeoNerdI've just managed to   bzr log10  it18:50
amanicamm.. `bzr log lp:bzr-explorer` also fails for me:18:52
amanicabzr: ERROR: exceptions.NotImplementedError: should resend request to http://feeds.edge.launchpad.net/bazaar/, but this isn't implemented18:52
amanicamight be hiding the real error :(18:52
amanicacould log https://code.launchpad.net/~bzr-explorer-dev/bzr-explorer/trunk now.  i think for some reason lp:bzr-explorer resolved wrongly19:00
amanica(or I just cant access it over bzr+ssh for some reason)19:01
dOxxxjam: awesome! I only get 1 failure and 2 errors running the full selftest on win32 :)19:58
=== ahasenack is now known as ahasenack-away
rubbsBen Finney wrote on the mailing list that he created a patch that removed trailing whitespace from the doc folder. He couldn't contribute because he hadn't signed the contributor agreement.20:43
rubbsI created a branch that did the same thing20:43
rubbsIs it even worth trying to get it merged in?20:44
rubbsI mostly did it as an exersize to learn sed20:44
dOxxxpropose it, see what happens :)20:44
rubbsdOxx: ok, I'll try it out.20:44
dOxxxyou know how to handle the merge proposal stuff?20:45
rubbsyeah20:45
dOxxxcool20:45
rubbsI've gotten a few in before, but didn't know if this was even worth it.20:45
dOxxxclean docs are good, imo :)20:45
rubbsbut I guess your point made sense... only one way to find out.20:45
rubbsgood point20:46
dOxxxyou separated the whitespace change from the VCS vs RCS change right?20:46
jamdOxxx: what failures? I just ran once and didn't get any failures20:49
dOxxxjam: http://pastebin.com/d5c922b0020:49
jamdOxxx: so the 'diff' failure is because you don't have a diff.exe on your machine20:51
jamcPickle.load is strange20:51
dOxxxjam: I have some of the gnuwin32 stuff installed, I can install the diff too.20:51
jamthe ssh one, I also don't quite understand20:52
dOxxxjam: installed gnuwin32 diff and bb.test_diff passes now20:53
jamdo you know what version of python you are running?20:54
jamI'm wondering if you don't have the right lsprof libs installed20:54
dOxxxjam: 2.6.4 ActiveState ActivePython20:55
dOxxx32-bit20:55
dOxxxrunning on vista64 though20:55
dOxxxwhere would I find the lsprof libs?20:55
jamhmm.. I wonder if activpython versus stock python...20:55
jamwell, I would first run the test directly, to make sure it still fails20:56
dOxxxI don't see lsprof in python\libs20:56
dOxxxtrying20:56
jamlsprof became cProfile and started being bundled with python stdlib20:56
dOxxxtest_lsprof passed...20:56
jamso, it seems like a spurious/race condition20:57
jampossibly the output code isn't flushing?20:57
dOxxxyeah20:57
rubbsdOxxx: yes20:57
dOxxxthe ssh test still fails when run on its own though20:57
dOxxxrubbs: go for it :)20:57
rubbsdOxxx: cool thanks20:58
=== ahasenack-away is now known as ahasenack
dOxxxjam: selftest is sometimes hanging in test_breakin on win3221:13
jamdOxxx: are you on a single cpu machine?21:16
dOxxxjam: core i7, looks like 8 CPUs21:17
dOxxxjam: using r4852 of bzr.dev21:18
lifelessdOxxx: its 4 real, with hyperthreading21:39
dOxxxlifeless: yes21:39
lifelessjam: does gc in win32 python run threaded or something?21:39
dOxxxs/looks like/appears to OS as/21:39
lifeless:)21:40
dOxxxI just pushed my first draft of .bzrmeta/ignore to lp:~doxxx/bzr/bzrmeta-ignore21:42
dOxxxno backwards compatibility yet21:42
=== tommieb is now known as t0mm13b
pooliegood morning21:53
dOxxxhey poolie21:53
jamlifeless: I don't think gc is threaded, but if you have del SFTPFile, it calls "CMD_CLOSE" in async mode21:55
jamand *that* may not finish before the next command21:56
jamhowever, I'm also seeing self.write_stream.close(); transport.rename() fail21:56
jamand that is calling .close() synchronously21:56
=== tommieb is now known as t0mm13b
lifelessdOxxx: what does that branch change?22:06
dOxxxlifeless: it changes all handling of .bzrignore to use .bzrmeta/ignore instead22:07
lifelessthat seems likely to cause headaches for folk on older versions; is it really worth changing?22:07
dOxxxlifeless: it's speculative and I'm using it as an opportunity to learn more about the internals.22:08
lifelesshave you considered having .bzr/meta/ignore be a symlink to ../.bzrignore?22:08
dOxxxlifeless: that would work in the absence of backwards compatibility as the branch currently stands22:10
asabilside question, why .bzrmeta/ and not .bzr/meta ?22:11
dOxxxbecause .bzr is not versioned22:11
lifelessdOxxx: I'm not concerned about backwards compatability, rather forwards compatability.22:11
dOxxxthe ignore file must be versioned22:11
asabilah I see, ok thanks22:12
dOxxxlifeless: could you describe a scenario?22:12
lifelessdOxxx: user installs karmic. bzr branches, runs make, runs bzr st sees a tonne of files.22:13
lifelessdOxxx: many users do not run recent releases - they are commonly 18 months behind22:13
dOxxxlifeless: hmm...22:15
lifelessdOxxx: versioned data structures are very very sticky22:15
pooliedoxxx: i think you need to read either of them22:15
poolie(phone)22:15
lifelesswhether they are casually defined or more complexly defined22:16
lifelessI don't have good answers for dealing with change to them, and that caused a lot of friction with tree filters22:16
dOxxxso the ignore file handling should read and update .bzrignore if it finds it, otherwise create/read/update .bzrmeta/ignore?22:16
dOxxxto be honest, I don't know how serious this whole .bzrmeta thing is22:17
lifeless.bzrmeta is a place for plugins that /dont care/ about doing a really elegant job - somewhere where bzr core can just punt, and its up to the plugin authors to do well.22:17
lifelessdon't care is maybe harsh.22:17
lifelessWhat I mean is, they want something simple, with known behaviours that we can offer all plugins.22:17
dOxxxbrb22:17
dOxxxback22:18
dOxxxso why would ian clatworthy want .bzrignore to migrate to .bzrmeta?22:19
dOxxxor was it nmb?22:19
dOxxx"For a present solution to the  versioned metadata situation, Bazaar core devs decided (?) to go with  files under the .bzrmeta directory.  This is certainly preferable to  .bzrignore, .bzrexternal, .bzrautomirror, .bzremail, ... all in the  project's  top level directory."22:20
lifelessso, .bzrmeta is a new facility22:22
lifelessthat new versioned-as-files metadata can be put into22:22
dOxxxso it would seem22:22
lifelessand authors of existing versioned-as-files metadata can choose whether to migrate into it or not.22:22
dOxxxyes22:22
lifelessTheres a lot of history using .bzrignore, and tools that know about it; personally, I'd hesitate to migrate .bzrignore - seems high likelyhood of disturbing something, and low return.22:23
dOxxxlifeless: yeah. it's been an interesting excursion though. :)22:26
apm12In my repo history i have a commit in past (not last commint) which i want uncommit. So i want something like "bzr revert-past r1231" and get in my HEAD new commit (or just apply to WC) that destroy modifications of code done in r1231. Is it possible? Which plugin or command i can use for this?22:29
lifelessapm12: bzr merge -r1231..1230 .22:30
apm12thanks!22:31
dOxxxhow are symlinks treated when branching onto a win32 filesystem?22:37
lifelessthey are elided and the metadata kept in dirstate22:38
dOxxxso the file represented by the symlink is not created?22:39
dOxxxi.e. if there is a symlink from .bzrignore to .bzrmeta/ignore then it wouldn't be created?22:39
dOxxxand .bzrignore would not exist in the working tree?22:39
lifelessthats right22:39
dOxxxbleh22:39
dOxxxdoes ordering matter in .bzrignore?22:44
lifelessno, we | the rules together.22:45
=== tommieb is now known as t0mm13b
jamlifeless, dOxxx: We crash when there are symlinks and we try to checkout22:50
jamwe don't silently elide them22:50
dOxxxyikes22:50
jamwe *do* handle that for executable22:50
lifelessoh, mea culpa22:50
lifelessits X bit we do that fo ... beat me22:51
jamwell, I should say we don't exactly crash22:51
jamwe get to the point of creating one, see that we can't, and rollback the checkout22:51
dOxxxoh ok22:51
=== tommieb is now known as t0mm13b
lifelessjam: you've seen the remote-submit for pqm-submit?23:12
jamlifeless: I have, but I don't prefer it23:13
jamI prefer to see what I'm submitting23:13
lifelesshmm23:14
jamespecially since there is a race condition23:14
lifelessif it showed a diff?23:14
jamperhaps23:14
jamhowever, when we have 20 doc updates23:14
jamit is still nice to only wait for pqm 1 time :)23:14
lifelessyes, I merge them together too :)23:15
jamalso, it gives me a chance to try "bzr merge ../bzr.dev"23:15
jamand make sure there isn't a trivial conflict that needs to be sorted out23:15
jamespecial wrt NEWS23:16
jamanyway, I'm off for tonight, have a good evening23:18
lifelessgnight23:18
dOxxxcheers jam23:18
dOxxxlifeless: I updated my bzrmeta-ignore branch with backwards compatibility for .bzrignore23:39
dOxxxstill not sure how to handle forwards compatibility23:40
=== dOxxx is now known as dOxxx_afk
pickscrapeWhat's the easiest way to force bzr to use the python implementation of rio?23:42
lifelessrm bzrlib/*.so23:43
lifeless:P23:43
pickscrapecool, thanks :)23:43
pickscrapeI'm having a problem with bundle buggy. It's trying to decode a merge directive and is complaining that something is not a "plain string"23:43
=== tommieb is now known as t0mm13b
pickscrapelifeless: is it safe to delete just _rio_pyx.so, or would others need to be removed too?23:45
lifelessits safe to delete just the one23:45
pickscrapecool.23:45
lifelesshowever23:45
lifelesssounds like you have a unicode string, but rio is a byte serialiser/deserialiser23:47
lifelessso you should have an ascii string23:47
pickscrapeYes, the python implementation complains about the same thing (though with a slightly different backtrace)23:48
pickscrapeI have absolutely no idea where this has come from. BB has been working fine for us for months, and then yesterday I restart it and suddenly all hell breaks loose :)23:49
pickscrapeThe only clue that I have, is that if I reject all merge requests received since the restart, the merge request lists work, but viewing a request still doesn't.23:50
lifelesshave you upgraded any system stuff, such as python, or django or whatever it is that bb is built on?23:52
lifelessor perhaps your sqlite dbapi etc?23:52
pickscrapeWe're running on postgres, which has been stable since the last restart. It's turbogears-driven.23:53
pickscrapeI have upgraded sqlalchemy, and I've had to make one other compatibility fix to BB in order to support it. I suppose my biggest suspect is some other sqlalchemy incompatibility issues that I'll have to dig into tomorrow.23:54
pickscrapeThe version that BB is writte for is gone from gentoo's portage though :(23:55
pickscrapeIs BB basically a dead project these days?23:55
pickscrapeI proposed a small branch for merging ages ago which just fixed a string escaping issue, and it hasn't been picked up.23:56
pickscrapeAt this point I'm seriously considering trying to install launchpad and use that for both hosting and reviews :)23:56
pickscrapeAnyway, I need to go. Thanks for your help lifeless :)23:57

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