/srv/irclogs.ubuntu.com/2008/12/15/#bzr.txt

spivGaryvdM: and I can reproduce it.  Thanks!00:01
GaryvdMYhea00:01
GaryvdMspiv: I just tested with 1.10 and I was able to reproduce.00:02
spivMy current hypothesis is that it's to do with which texts are stored as deltas and which are stored as fulltexts in the source repo, which tends to vary in each repo depending on the order things get inserted, etc.00:04
GaryvdMI better go to bed as it 2am.00:06
GaryvdMBye00:06
lifelessspiv: you might like to look at the analysis I did on a bug a month or so back, the one with (IIRC) casper, or apt, or something00:07
lifelessspiv: where there were references to ghosts and $stuff00:07
lifelessspiv: I wrote a tool to rewrite things, but you'd want to id root cause etc00:07
spivlifeless: thanks, I'll take a look00:08
spivGaryvdM: good night00:08
markhGaryvdM: I like the throbber :)00:15
markhGaryvdM: I'm also very happy to hear you aren't opposed to threads used carefully :)00:16
pooliehello markh00:17
markhhi poolie - good trip?00:17
markhyou back now, right?00:17
poolieyes, great00:17
poolieand yes, i just got home00:17
pooliewell, a couple of hours ago00:17
markhexcellent00:18
markhheh - well - I'm sure you aren't quite feeling excellent yet!00:18
pooliei got an upgrade on the way back, so i'm reasonably ok00:18
pooliewill probably fade later00:18
spivpoolie: welcome back00:20
pooliehello spiv00:20
pooliehow was your week?00:21
spivPretty good.  Quiet :)00:23
GaryvdMHi markh00:25
pooliewhat did you get up to in bzr?00:25
GaryvdMRe: threads - If we want responsiveness when looking at remote branch - we are going to need threads.00:26
markhGaryvdM: I understand that well - Lukas is vehemently opposed though00:27
markhie, gone so far as to say he would *refuse* to accept patches that had threads00:27
pooliefor bzr-eclipse?00:28
GaryvdMYhea - I read that.00:28
markhqbzr00:28
markhpoolie: for background, I had a patch that used a single background thread to talk to bzr, while the main thread was doing *only* GUI work.00:28
markhthat kept the gui alive even while bzr blocked00:28
markhthere were never 2 threads hitting bzrlib00:29
GaryvdMmarkh: I think we should merge threadless into trunk now. What do you think?00:30
markhthis was only for things like building the list of changed files - not actually doing the final commit or whatever the "real" operation is00:30
GaryvdMReadonly commands00:31
markhGaryvdM: I agree for sure.  I'm trying hard not to step on Lukas's toes though - possibly a little too hard00:31
markhits a shame he hasn't commented on anything he might like on the branch00:31
markhI haven't heard from him since I posted the threadless version00:32
GaryvdMok - Really going home now.00:36
spivHuh, the problem that garyvdm's hitting appears to be that the initial push is stacked, but subsequent pushes aren't.00:43
spivHence the subsequent pushes are understandably upset about missing data.00:43
spivI guess this is a bad interaction with the way Launchpad tries to make the client auto-enable stacking.00:44
spivI think I have a fix for GaryvdM's bug for pushing to a new stacked LP branch.01:30
spivYes, it worked.  BzrDir cloning-format logic is such a mess.01:32
mwhudsonoh my yes01:33
spivmwhudson: this has probably affected LP devs a lot, although upgrading the local format to a stacking-capable format works around it I think.01:33
mwhudsonthe cloning format mess has certainly affected _me_ a lot!01:34
spivmwhudson: :)01:34
* spiv sees what the test suite thinks of his patch01:34
pooliespiv, can we catch up on the phone when it's convenient?01:46
spivpoolie: sure.  How about now, or otherwise just after lunch?01:47
spivNow might be better if you're likely to fade.01:47
=== mark1 is now known as markh
pooliei'm just going to have lunch now, maybe after that?01:50
spivSure.01:51
mwhudsonspiv: btw, i reported https://bugs.edge.launchpad.net/bzr/+bug/291046 a while ago01:54
ubottuLaunchpad bug 291046 in bzr "pushing branch6/packs5 to location with default stacking policy creates broken branch" [Undecided,New]01:54
mwhudsonspiv: i think that might be what you've just rediscovered?01:54
mwhudsonunless https://bugs.edge.launchpad.net/bzr/+bug/259275 has just reappeared somehow01:55
ubottuLaunchpad bug 259275 in bzr "pushing a non-stacking format into a non-repo bzrdir with a default stacking policy creates broken branch" [Critical,Fix released]01:55
JerubGiven a bzr repo that's at revision 82, but I want to do a compile of the source as at revision 77. How do I revert the code back to that revision?01:55
mwhudsonJerub: bzr revert -r 77 will do it, i think01:58
Jerubmwhudson: thanks! that worked.01:58
* spiv wonders why running "./bzr --no-plugins selftest" just failed with plugins/svn in the traceback...02:10
jml:)02:16
lifelessspiv: https://bugs.launchpad.net/bugs/307988 - did you end up writing up stuff re central mail? [btw I'm on leave :)]02:28
ubottuLaunchpad bug 307988 in bzr-email "Central repository email?" [Undecided,Invalid]02:28
spivmwhudson: those sound suspiciously similar.02:35
spivlifeless: not yet, but I intend to02:35
lifelessspiv: :) if you could reply to that bug then, I would appreciate that.02:40
igchi all03:30
pooliehello ian03:38
igcpoolie: when your formats email said "the following needn't block merges", were you implying bb:tweak by that?03:49
poolieyes04:09
poolieor rather, that they were optional but suggested changes04:09
stewarthi! i'm getting (after recent bzr pull of bzr) bzr: ERROR: The API for "<module 'bzrlib' from '/home/stewart/lib/python/bzrlib/__init__.pyc'>" is not compatible with "(1, 9, 0)". It supports versions "(1, 11, 0)" to "(1, 11, 0)".04:57
stewartanybody get any ideas?04:57
spivstewart: It's probably due to a plugin asking for a the 1.9 bzrlib API04:59
spivbzr-svn is a common culprit04:59
stewartspiv: ahh.. ok, thanks!04:59
stewartany ideas on Revision {stewart@flamingspork.com-20081121160607-n6gdlt013spuo54r} not present in "table.h-20080625052902-61bbthtf22shh0p6-550".05:00
stewarthttps://code.launchpad.net/~stewart-flamingspork/drizzle/nofrm-dev205:00
spivProbably a stacking-related bug :(05:01
stewartany way to push without stacking?05:02
spiv1.10 is better at catching those errors sooner, and I'm about to send a patch that looks like it might fix the main cause.05:02
stewartthat'd be good...05:03
stewartso probably a problem tha lp is using 1.7.105:03
spivNot to Launchpad, afaik.  But if you upgrade your source repository and branch with "bzr upgrade --1.6" and push a new branch that should avoid the bug, I think.05:03
spiv(Or you could re-use the existing LP branch by using a tool like lftp to recursively delete sftp://bazaar.launchpad.net/~stewart-flamingspork/drizzle/nofrm-dev2/.bzr and re-push to that with --use-existing-dir)05:04
spivstewart: actually, the offending bugs are entirely client-side :(05:08
stewartfun05:08
=== Mario__ is now known as pygi
jmlhow do you show a shelf with the new builtin stuff?06:50
vilahi all07:05
jmlhello.07:06
lifelessjml: unshelve --dry-run07:51
jmllifeless: if there are conflicts, it doesn't show you anything useful.07:51
jmlin those cases, it would be useful to see the contents of the shelf, rather than the merge results.07:51
jml(which are reverted in case of a dry run)07:52
lifelessjml: bug a file07:52
jmlok.07:53
=== AfC is now known as AfC|run
* igc dinner08:50
jmlin a lightweight checkout, is there a way to remove all files that aren't in version control?08:57
RAOFjml: bzr clean-tree doesn't work there?08:58
jmlRAOF: it does something different08:58
jmlRAOF: I don't want to delete all of the files that show up in "unknown"08:59
jmlRAOF: I want to delete all my *~ and *.pyc files and the like08:59
jmlRAOF: essentially, remake my tree from the branch.09:01
RAOFAaah.  Because you've added those files to .bzrignore.  Of course!09:02
fullermdbzr ls --ignored | xargs rm?09:03
=== AfC|run is now known as AfC
spivjml: bzr clean-tree --ignored ?09:07
jmlspiv: thanks.09:08
* spiv -> food09:08
pygihi mvo09:31
asabilhi all10:40
asabilcan bzr replay, replay commits from unrelated branches (standalone branches) ?10:41
=== jszakmeister is now known as jszakmeister|awa
=== mark1 is now known as markh
LarstiQasabil: I'd think so13:22
asabilLarstiQ: it didn't seem to work, so I gave up13:22
LarstiQok13:22
awilkinsis "--fixes" supposed to be used for bzr.dev when comitting?13:28
Odd_Blokeawilkins: I don't think there's a policy either way.13:55
awilkinsOdd_Bloke: I'm not sure how it works, it seems to require a tag13:56
awilkinsDoes Bundle Buggy support PGP/MIME?13:58
awilkins(or not care at all?)13:59
Odd_Blokeawilkins: You'll want --fixes lp:123456 I think.14:00
awilkinsNeato14:02
Odd_BlokeBugtrackers are namespaced.14:03
awilkinsOh crap, used the wrong mail address14:08
vilajam: ping14:08
jamvila: is it urgent?14:08
jamI'm around, but having breakfast, etc.14:08
vilajust ping me back when you have a couple of quarters available14:09
vilajam: but if you can update your mysql branches meanwhile.. feel free :)14:10
Peng_awilkins: BB can process such mail, but I dunno if it validates it.14:10
Peng_At least, I think.14:11
jamvila: I'll at least pull in mysql-6.0 which tends to include most of the other stuff14:11
vilashould be enough, I'd like your help to understand which revisions are taken into account on a particular content conflict but you may well already have all the needed revisions14:12
awilkinsPeng_: That's rather what I expected - just as long as PGP/MIME doesn't choke it, I can use it14:22
Peng_awilkins: Lots of people on the list use PGP.. If "This is a multi-part message in MIME format." means it's PGP/MIME, then it definitely works.14:26
=== maxb is now known as Guest20139
=== Guest20139 is now known as maxb
sven_hi! i got a stack trace when running bzr push: http://pastebin.com/m32a4c395 . Then i ran bzr push again and it worked17:03
sven_is this a known bug?17:03
beunosven_, it has been reported, yes. An autopacking error17:04
beunowaht version of bzr are you using?17:04
sven_beuno, ok, thanks. i'm using bzr 1.10. added version and plugins to paste: http://pastebin.com/d3d4e003217:05
sven_beuno, do you know any details? is it safe to just ignore the failure and push again?17:06
beunosven_, well, I'm actually not sure if it shouldn't be fixed by now...17:07
beunosven_, can you file a bug anyway?17:07
beunoit should be safe though, if the second push was succesful17:07
fullermdPushing again should always be safe, at least.17:07
sven_beuno, ok, will file a bug17:07
sven_fullermd, beuno, ok, that's reassuring :-)17:07
Kobazhttp://pastebin.ca/128601917:12
Kobazwhy does bzr need dbus?17:13
LeoNerd<guess>HAL integration for monitoring network events?</guess>17:13
beunoKobaz, my guess is that you have the plugin installed?17:14
Kobazoh17:17
Kobazmaybe17:17
Kobazii  bzr-dbus                             0.1~bzr36-3                     D-Bus announcements plugin for Bazaar17:17
Kobazmmm17:17
=== jrydberg_ is now known as jrydberg
vilaKobaz: 'xhost +localhost' under your regular login maybe ?17:20
Kobazwell i dont need dbus stuff, so i guess i'll just axe it out17:22
Kobazis there a way to get bzr to save bzr+http passwords?17:25
Kobazbzr pull17:26
KobazUsing saved parent location: bzr+https://markm@bzr.local/bzr/myproject/usrLocalLibrary/trunk/17:26
KobazHTTPS markm@bzr.local, Realm: 'Bazaar Repository' password:17:26
AmanicAKobaz: maybe this helps: http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#id2417:44
Kobazk17:46
=== mark1 is now known as markh
vilaKobaz: Amanica was right, authentication.conf should address your problem, did you find it ?18:04
vilaerr, did you *solve* your problem ?18:05
NfNitLoopHrmm.  Can `bzr rebase` cause problems between repositories?  Are there any gotchas I should be aware of?18:16
NfNitLoopI just rebased my changes against someone else's tree and noticed that the rebased revisions have the same IDs as the original ones.18:16
NfNitLoopbut, don't they have different parents?18:16
NfNitLoopwouldn't that cause issues?   *confused*18:17
fullermdThe rebased revs shouldn't have the same ID's...18:19
NfNitLoopHrmm, I may have run bzr log from the wrong dir. :p18:23
NfNitLoopcan't reproduce that.  I *thought* that sounded fishy.18:23
lifelessKobaz: thats fixed in bzr-dbus upstream, just the debian package hasn't caught up18:26
bialixAmanicA: hi18:28
Kobazk18:34
Kobazvila: i just removed bzr-dbus... that fixed it... heh18:34
vilaKobaz: I kind of doubt that provides passwords but.. If you say so :)18:36
AmanicAbialix: hi чувак18:37
AmanicALOL @ vila18:38
Kobazoh18:39
Kobazvila: oooh18:39
Kobazthe autheitcation stuff18:39
Kobazi'm all confuzzeled18:41
Kobazokay now i'm good, well i was confuzzeleded18:41
Kobazso where it says [myprojects]18:44
Kobazdo i really use [myprojects], in the authentication.conf... or do i name it the project namer18:44
Kobaznever mind18:46
Kobazscrolling down helps...18:46
Kobazi wrote out an authentication.conf... but bzr doesn't even open it18:48
Kobazoh18:59
Kobazdoes bzr diff really have to obey the file locks set by bzr commit?18:59
Kobazit's a read-only operation19:00
Kobazwith subversion i always go around diffing everything while i'm in the middle of a commit19:00
beunoKobaz, how about bzr commit --show-diff?19:01
lifelessKobaz: its a bug on windows only, we will fix it but yes, it does need to obey the file lock19:01
Kobazlifeless: i'm on linux19:02
lifelessKobaz: oh, hmm, ah yes.19:02
Kobazbeuno: hmm, that's good, but i would still want to be able to view individual file diffs... i like working with smaller units19:02
lifelessKobaz: it will be locked out there in that case as well :(19:02
lifelessKobaz: same cause, same fix when we get it done19:03
lifelessyou might like gcommit19:03
Kobazlifeless: ah, so the fix will allow diffing on commit-in-progress files?19:03
LarstiQ(or qcommit!)19:03
lifelessKobaz: roughly yes ;)19:04
Kobazyay19:04
Kobazso, why would it need to obey the file lock?19:04
Peng_What would the fix be?19:04
Kobazwhen you're in the editor for bzr commit, nothing is changing, the diff is a read-only operation, linux has no restrictions on reading files that are "in use"19:05
Kobazwindows on the other hand is a pita with file locking... not sure how you would fix it there19:06
Peng_While you're in the editor, the repo is in the middle of a commit..19:07
Peng_Even if nothing is happening *right then*, there's still a half-completed commit sitting around.19:07
Kobazbut at that time... the repo is in a consistant state19:08
Kobazsince nothing has been written of the commit yet19:08
LarstiQI'm not sure how true that actually is.19:09
Kobazthe entities in question should only be locked for reading when the actual commit is taking place (ie: done with the editor, the files are being added)19:10
Kobazit makes sense to lock them for writing, but not for reading19:10
Kobaztheoretically, i see no harm in allowing reading operations during the commit message editing... but then again i don't know all the internals of bzr... but what's your objection to not having a read-lock19:12
fullermdWrite locks as a rule lock out readers   :p19:12
Kobazit depends on the system19:12
fullermdEvery locking formalism that comes readily to mind?19:13
Peng_Hmm, ISTM while the editor is open, the upload file has been created, but it's empty.19:13
Kobazlike for database transactions. you will have several different types of locks... you will have read commited (read/write lock), read uncommited (write lock), and others19:13
fullermdWriting changes things.  Changes tend to lead to inconsistencies.  Reading during inconsistencies is Bad(tm).19:13
Peng_But then, I was just testing with a tiny test repo.19:13
Peng_It's probably not inconsistent at that point.19:13
KobazPeng_: exactly19:13
Peng_At least in pack repos.19:13
Peng_Kobaz: I imagine that's why lifeless said it *could* be fixed. ;)19:14
Kobazyeah19:14
Peng_I've never paid attention; bzr asks for the commit message before going through all the mechanics?19:14
Peng_hg asks afterwards.19:14
fullermdI'm not saying it _good_ to lock out diff while you're sitting in the editor, nor do I think it's likely to be the eternal state.  But it's not just as simple as "change X" to fix.  There are likely a lot of implications and assumptions and side effects to unwind.19:14
Kobazas far as i know, it's only inconsistant during the upload/write procedure after editing the message19:14
Kobazfullermd: oh of course, but i figured i would bring it up19:15
fullermdPeng_: No, the mechanics are run through.  You can prove this to yourself by starting a commit, then editing the file while sitting in the log editor.19:16
lifelessKobaz: its the dirstate file that is the thing19:16
lifelessnot the repo19:16
Peng_fullermd: Oh, good point. I've done that, in fact.19:16
lifelessthe repo is multimaster safe, branches are single writer N readers, trees are [currently] single-writer-no-readers | N-readers19:17
Peng_I just tested it by committing a bunch of large files. When it was a teensy test file, the upload file was empty because of buffering.19:17
Kobazanyways... next topic19:18
Kobazlemme finish my paste19:18
Peng_lifeless: So what's the fix, then?19:18
fullermdYum.  Is it mint-flavored?19:18
lifelessPeng_: write to a newly named dirstate each time, with a atomic-update pointer to the active dirstate, and a RCU style late-delete of old dirstates19:19
Kobazhttp://pastebin.ca/128610919:19
Kobazi'm trying to use authentication.conf19:19
Peng_lifeless: Ah.19:20
Kobazso umm, is there any config options i need to turn on in bazaar.conf, in order to use authentications.conf ?19:21
Kobazthis is 1.1019:21
lifelessKobaz: its on by default, but I've never used it19:22
Kobazas you can see from the pastebin19:23
Kobazbzr isn't even touching authentication.conf19:23
lifelessKobaz: what url are you pulling from though; you've helpfully edited that out :)19:23
Kobazi'm pulling from bzr+https19:24
lifelesstry just https:19:26
lifelessalso whats the error that occurs19:27
Kobazthe error is that the login failed19:29
Kobazsince it's not specifying the password that's stored in authentication.conf (since authentication.conf is not read)19:29
Kobazbzr: ERROR: Generic bzr smart protocol error: Invalid http response for https://bzr.local/bzr/myProject/usrLocalLibrary/trunk/.bzr/smart: Unable to handle http code 401: Authorization Required19:30
lifelessvila: ^ is this a smart oversight?19:31
Kobazusing bzr+https://  and https://  have the same problem... authentication.conf is never read19:31
Kobazlemme try the example in the docs19:31
vilalifeless: shouldn't be19:32
Peng_Kobaz: What about nosmart+https?19:32
vilaKobaz: try -Dhttp -Dauth19:32
Kobazstat64("/home/root/.bazaar/authentication.conf", {st_mode=S_IFREG|0644, st_size=82, ...}) = 019:32
Kobazokay... if i use ftp://  it will read authentication.conf19:32
vilaKobaz: Oh, try adding user in the url19:33
Kobazstrace bzr pull ftp://localhost19:33
vilaftp and http are different we provide a default user for ftp not for http19:34
Kobazi dont get any debugging for -Dhttp -Dauth19:34
vilain the .bzr.log file19:34
Kobazah19:34
LarstiQvila: it would be nice to prompt for credentials, what needs to happen for that?19:38
Kobazhttp://pastebin.ca/128612319:39
vilavila.cucles.free() :)19:39
vilavila.cycles.free() :)19:39
vilaI hate typos in jokes19:39
lifelessvila: your spellchecker needs more timeslices19:39
vilaKobaz: Ok, add your user in the url19:40
Kobazk19:40
vilaI don't know why I keep thinking this bug is fixed....19:40
vilajelmer would kill me for saying that :-)19:41
jfroy|work-slvila: this sounds like the stuff I was working on a few months ago19:41
jfroy|work-slI haven't had the time to sit down and figure out a good way to handle this.19:41
vilajfroy|work-sl: Hey !19:41
Kobazhttp://pastebin.ca/128612819:41
jfroy|work-slBut vanilla authentication.conf certain works for me, even though it's gross to leave a password in cleartext.19:42
Kobazauthentication.conf doesn't get loaded when you use https or bzr+https19:42
Kobazif i manually edit branch/branch.conf19:43
Kobazand put in the url with my username in it19:43
mwhudsongood morning19:43
vilaKobaz: it used : 0.958  Using authentication section: 'myProject'19:43
Kobazit will promot for a password19:43
Kobaz2.716  Using authentication section: 'myProject'19:43
Kobazyes, but19:43
Kobazlook at this strace19:44
vilaKobaz: That's a bug, authentication.conf should be usable to provides the user19:44
Kobazoh19:44
Kobazwait19:44
vilathe password is wrong19:44
Kobazif i provide the username, it loads authentication.conf19:44
Kobazif i don't provide the username, it wont19:45
Kobazi see19:45
vilaor at least that's what the server said (AFAICS), by the way, change it as soon as we finish discussing, basic really is not secure,19:45
Kobaz?19:46
Kobazwhat's wrong with basic auth19:46
Kobazover https19:46
vilanothing19:46
vilaposting pastebin with the http headers on the other hand...19:47
Kobazit's all local19:47
Kobazand i have a little scrubber script19:47
Kobazoh19:48
Kobazyeah19:48
Kobazthe source password is def12319:48
=== elmo_ is now known as elmo
LarstiQKobaz: what's wrong with basic is that if you have the header, you have the password.19:56
evarlastso run it over https :p19:58
LarstiQevarlast: and then paste the headers on pastebin? :P19:59
LarstiQDigest isn't that hard to set up.19:59
Kobazyeah20:02
Kobazdoing that now20:02
Kobazheh20:02
Kobazi dont have any real passwords in there anyway20:03
=== Mario__ is now known as pygi
=== asac_ is now known as asac
jelmerbeuno, ping20:43
beunojelmer, pong20:45
jelmerbeuno, bug 305995 is blocking adoption by alioth and it seems like an easy bug20:46
ubottuLaunchpad bug 305995 in loggerhead "includes internal port numbers in links" [Undecided,New] https://launchpad.net/bugs/30599520:46
jelmerbeuno, can you perhaps give me a hint as to how to do so?20:46
* beuno looks20:47
mwhudsonoh that20:47
mwhudsonit sounds like a configuration problem tbh20:47
beunojelmer, that's using start-loggerhead?20:48
beunomwhudson, hi!20:48
mwhudsonjelmer: please stop using start-loggerhead20:48
jelmerHi mwhudson :-)20:48
jelmerbeuno, yes20:48
beunowe should talk about trying to get a day or two a month to work on LH20:48
mwhudsonjelmer: in the interests of actually solving your problem though20:48
mwhudsonjelmer: can you pastebin your loggerhead.conf ?20:48
beunojelmer, and you're using that because it lets you tweak stuff that serve-branches doesn't?20:49
beunomwhudson, we should make sure we can provide a config for serve-branches, and kill off start/stop-lh20:50
beunooh, and, of course, fix that memory problem...20:50
jelmermwhudson, please remove start-loggerhead then..20:50
* beuno pokes thumper 20:50
lifelessbeuno: I thought you had a day a week :)20:50
jelmermwhudson, start-loggerhead is the only thing that has an init-script in Debian (but I think we've had this discussion before :-)20:50
mwhudsonyes20:50
thumperbeuno: yes?20:51
beunolifeless, *sigh*20:51
lifeless:>20:51
mwhudsonjelmer: do you want to run from the loggerhead package on alioth?20:52
mwhudsonjelmer: or would you be ok running trunk?20:52
mwhudsonjelmer: at any rate, i really don't think you want auto_publish_folders, and would be much happier with the serve-branches approach20:53
jelmerbeuno, config is at http://pastebin.ubuntu.com/85753/ (not created by me but by Lolando)20:53
mwhudson(i mean, how many links saying "unstable" are there on http://bzr.debian.org/loggerhead/ ?)20:53
jelmermwhudson, Well, it should be some package, but since I'm the Debian packager I can upload a new upstream snapshot if necessary20:53
beunojelmer, I'm going to try and release a new version in this week or the next20:54
mwhudsonjelmer: so remind me, why is serve-branches unsuitable?  lack of a config file?20:54
beunojelmer, and that's not passing through apache?20:54
jelmermwhudson, Lack of config file and init file20:54
beunoor it is, and LH is creating the :8080 links?20:54
mwhudsonjelmer: so there's an init file in trunk20:55
mwhudson(for serve-branches)20:55
jelmermwhudson, yes, but it's not using the standard functions for Debian/Ubuntu and it requires users to pick either serve-branches or start-loggerhead20:56
mwhudsonlack of a config file is fixable, presumably, let's fricking fix it20:56
jelmermwhudson, we can hack our way around the current situation20:56
jelmermwhudson, I'm just lobbying for a single binary that does loggerhead and uses a config file20:56
jelmerrather than having two binaries, both of which can do some things but can neither do both20:57
jelmers/do both/do everything/20:57
mwhudsonjelmer: it seems unlikely then that loggerhead can by itself supply an init file that would be acceptable by debian?20:57
jelmermwhudson: Not sure I follow..20:58
mwhudson"<jelmer> mwhudson, yes, but it's not using the standard functions for Debian/Ubunt"20:59
mwhudsonjelmer: perhaps i didn't understand this bit? ^^20:59
jelmerLoggerhead can include an init script that is appropriate, it just doesn't atm :-)20:59
jelmerThe infrastructure provided by start-loggerhead matches a bit better what we need there21:00
jelmersince start-loggerhead can write pid files, etc21:00
mwhudsonoh right daemonization21:00
mwhudsonhm, links like http://bzr.debian.org/loggerhead//bzr.debian.org/current/changes don't look quite right :)21:03
mwhudsonoh man, i always forget how much i hate config file formats :)21:06
rkistneri'm creating a website using python/django, hosting content similar to a wiki site21:09
rkistnerand i need version control for the content21:09
rkistnerwould it be possible to integrate bazaar into the website for version control?21:09
rkistnersimilar to how google code uses svn for the wiki pages21:10
Odd_Blokerkistner: Yes, bzr has a good Python API.21:10
rkistnerhow much work would it require?21:10
rkistneror is that a bad question?21:11
rkistneri'm completely new to bazaar21:11
Odd_Blokerkistner: Well, it's hard to express work. :p21:11
Odd_BlokeIt wouldn't be that hard.21:11
pooliejam, hi21:11
rkistnerok, thanks21:12
Odd_Blokerkistner: A handful of API calls.21:12
rkistnerand i won't need to run any additional processes, apart from the main python process?21:12
Odd_Blokerkistner: Nope.21:13
rkistnerok, cool21:13
rkistnerbazaar seems like a good solution then21:13
mwhudsonhmm21:18
jelmermwhudson, :-)21:18
mwhudsonjelmer: what's going on here?21:18
mwhudsonmwh@grond:serve-branches-config-file$ ./start-loggerhead21:18
mwhudsonTraceback (most recent call last):21:18
mwhudson  File "./start-loggerhead", line 26, in <module>21:18
mwhudson    from bzrlib.util.configobj import ConfigObj21:18
mwhudsonImportError: cannot import name ConfigObj21:18
Peng_Oops, it should be "from bzrlib.util.configobj.configobj import ConfigObj", I think.21:19
mwhudsonyeah21:19
jelmerYeah, looks like it :-/21:19
Peng_Um, the same typo is elsewhere too.21:20
LarstiQto be honest, it's a bit daft.21:21
* Peng_ wonders why his Loggerhead installation isn't broken because of this.21:21
pooliekfogel: hey21:21
kfogelpoolie: hey, about to paste, one sec21:21
Peng_So anyway, who volunteered to fix it?21:21
Peng_:P21:21
pooliebtw i was re-reading 'producing open source' on my trip, coincidentally21:21
poolieit's good21:21
LarstiQPeng_: didn't you? *duck*21:21
Peng_LarstiQ: Heh.21:22
Peng_LarstiQ: It takes more time for someone with commit access to merge a fix from me than it does to fix it. :P21:22
kfogelpoolie: http://paste.lisp.org/display/7220521:23
kfogelpoolie: (and thanks, re the book!)21:23
jelmermwhudson, I've pushed a fix to http://people.samba.org/bzr/jelmer/loggerhead/trunk. Should I file a merge request?21:24
mwhudsonPeng_: you don't use start-loggerhead i guess21:24
Peng_mwhudson: serve-branches won't wind up importing loggerhead/apps/config.py?21:24
lifelessFWIW21:24
pooliekfogel: a good way to make sure this wouldn't get lost is to make sure there are clear bugs for each of them, and tag them eg 'emacs-adoption'21:25
mwhudsonjelmer: ok, though i guess it's the same as the change i have here :)21:25
pooliehey lifeless21:25
lifelessI'd rather serve-branches and a wrapper o r something21:25
jelmermwhudson, Ah, never mind then :-)21:25
lifeless*I* loath loggerhead.conf with a passion, having deployed it on squid-cache.org21:25
* Peng_ made the change too. :D21:25
kfogelpoolie: well, each has a bug ticket already.  I can tag with emacs-adoption now21:25
jelmerlifeless, if it's simple, I don't see the problem21:25
jelmerlifeless, The alternative is loads of config options in /etc/default/loggerhead21:25
poolieand then subscribe to the bugs about the tags interface, this gets recursive :_)21:26
jelmerlifeless, finding branches automagically is a must in any case21:26
LarstiQnot having deployed loggerhead yet, I wonder what's so bad about the config file?21:26
lifelessjelmer: what sort of defaults are you talking about?21:26
lifelessLarstiQ: its broken, heinously and deeply so21:27
LarstiQlifeless: I'm naturally inclined to believe you, but I'm still curious as to _why_21:27
jelmerlifeless, bzr root path, url prefix, port, hostname, log file, title, log rotation, ...21:27
mwhudsonjelmer: committed, thanks21:28
jelmerlifless: trunk directory, user dirs, reload setting,21:28
DBOI received a patch file from one of my contributors, but when I try to bzr merge it (it is a bzr patch file) i get this21:28
DBObzr: ERROR: Revision is not compatible with KnitPackRepository('file:///home/jason/do/future2/.bzr/repository/')21:28
mwhudsonwell user-dirs/trunk directory is very much a setting for people who know they need it21:29
lifelessso21:29
DBOcan anyone help?21:29
lifelessI've proposed before, 'bzr serve --http' -> fires up a loggerhead instance; that should be serve-branches, then you can have a demon if you want.21:29
kfogelpoolie: all tagged with "emacs-adoption" now21:29
lifelessWhat I'd like really is:21:29
lifeless - no separate loggerhead.conf; branches and configs-for-roots are configured in the standard bzr config21:30
lifeless - a sane-default for 'gimme a web ui'21:30
jelmerAs I've mentioned before, I don't care what we end up with, as long as there's a single correct way to configure and start a loggerhead daemon.21:30
lifeless - a sane-dfault for 'I'm running a production server environment'21:30
lifeless*I* strongly suspect these two things are different21:31
pooliekfogel: btw, vila is working on log, both performance and functionality21:31
lifelesshi poolie21:31
jelmerlifeless, so, serve-branches seems to be "just give me sane a web frontend" without requiring configuration21:32
mwhudsonthat's the idea, basically21:33
=== sdboyer-laptop_ is now known as sdboyer|sprint
jelmerand start-loggerhead/stop-loggerhead the "run loggerhead as a service and let me tweak its behaviour however I want"21:33
mwhudsonthat's a nice idea, but it's not really a reflection on reality21:33
jelmerWhat are the plans for start-loggerhead/stop-loggerhead then?21:35
kfogelpoolie: specifically those issues are on his plate?21:35
mwhudsonjelmer: i would like to kill start-loggerhead with a vengeance21:36
LarstiQlifeless: moving loggerhead.conf into bazaar.conf/branch.conf would go a long way to make it less heinously broken?21:37
mwhudsonjelmer: then _add_ something new that fits the "service" requirement21:37
jelmermwhudson, ok21:38
pooliekfogel: no, not those issues specifically, more the log requests from mysql21:38
pooliebut there is some overlap21:38
pooliei haven't caught up with him since i left for UDS21:38
lifelessLarstiQ: No, removing the things like nested-nested-config-nested would21:39
LarstiQlifeless: aha, thank you21:39
lifelessbrb21:40
pooliekfogel: so as far as how they get proritised21:43
poolies/they/bugs/21:43
pooliewe're prioritizing finishing network and repository speed improvements, in what's called the brisbane-core projcet21:44
poolieplus dealing with bugs that are particularly biting people,21:44
poolieand just generally keeping things rolling along with reviews and releases21:45
kfogelpoolie: ok.  I don't really have development time to offer, unfortunately, so the most I can do is tell the Emacs team "Here is where the bugs are, and here is what they're tagged with."21:50
pooliei'll pass them on to vila21:51
poolieactually that sounds a bit lame21:52
poolieit's not just down to him, but i will tell him you marked them21:52
pooliei would guess bug 130588 should be straightforward21:52
ubottuLaunchpad bug 130588 in bzr "show commandline in diff output" [Wishlist,Confirmed] https://launchpad.net/bugs/13058821:52
poolieand probably also bug 20339421:53
ubottuLaunchpad bug 203394 in nspluginwrapper "npviewer.bin crashed with SIGSEGV in g_str_hash()" [Medium,Invalid] https://launchpad.net/bugs/20339421:53
pooliei mean 30639421:53
jelmermwhudson, We'll just go with serve-branches for now then, until something better comes around. Thanks for commenting!21:53
mwhudsonjelmer: cool, i hope something better can come soon!21:54
=== jaavaagu1u is now known as jaavaaguru
spivGood morning.22:03
enigmaHm...I'm using the head of bzr-svn 0.5 and it seems *much* slower during the "determining changes" phase.22:08
jelmerhi enigma22:09
enigmaSo much so that the remote SVN repo is closing the HTTPS connection on my client.22:09
enigmajelmer: Hi22:09
jelmerenigma, during push, pull branch, ?22:09
enigmabranch22:09
enigmaI noticed that downloading the history is *very* fast now. :-D22:10
enigma(There are 8549 versions total in the remote svn repo)22:10
jelmerenigma, the first time it will be slower since it wouldn't have the cache yet that bzr-svn 0.4 has already built up22:12
enigmaOK, so the revision graph is saved in the svn-cache?22:13
enigmaHm...it looks like I might be getting subversion timeouts on top of it all.22:14
enigmaWe're using collabnet and they've been very flaky.22:14
jelmerenigma, it would definitely be a bug if 0.5 was slower than 0.422:15
enigmaOK, thanks for letting me know.22:15
jelmerenigma, but please make sure you've removed the cache in ~/.bazaar/svn-cache and that you're cloning into a fresh bzr repository when testing if that is the case22:15
enigmaLet me ask around my team and see if anyone else is having collabnet issues.22:15
enigmajelmer: No problem. I did remove the cache and I'm cloning into a fresh repo.22:16
kfogelpoolie: agree those two emacs-adoption bugs are likely trivial to fix.  I may have a look too.22:16
jfroy|work-sljelmer: any particularly nasty upgrade issues you might be aware of with 0.5, particularly if less-than-release-candidate versions have been used?22:26
jelmerjfroy|work-sl, not any that I'm aware of (yet)22:26
jfroy|work-sl(BTW, so far, 0.4.16 with the modified prefix has been rock solid)22:26
enigmajelmer: Just tried a branch using 0.4.16 and it's taking forever too. I'm pretty sure it's the remote SVN server in this case.22:29
jelmerjfroy|work-sl, Unless there's a particular reason, I would recommend just testing 0.5 on a temporary repository, not on the actual production branch yet22:29
jfroy|work-sljelmer: I don't plan to switch anyone yet until I've tested it further, yeah.22:31
Peng_jelmer: I might need to RTFM, but what does bzr-svn 0.5 do if you have a repo using the old mapping format? Keep using it?22:35
jelmerPeng_, Yes, you need to read the file UPGRADING :-) Basically, it will use the old mapping for revisions that are already there and use the new mapping (unless the "mapping = v3" configuration setting is present) for new revisions.22:36
Peng_jelmer: Even for new revisions in the same repo? Huh.22:37
jelmerPeng, it will use the old mapping for revisions that were roundtripped from bzr using that old mapping22:38
Peng_Okay.22:39
Peng_Hmm, what happens if you're in a shared repo with revisions in the old mapping format, and do a "bzr branch svn://..."? Will it use the new format?22:41
jelmerpeng_: yes22:41
Peng_Okay. :) Thanks for the information. :)22:42
Peng_Ooh, bzr-svn 0.5 bombed.22:52
jelmerPeng_, please file a bug :-)22:52
Kobazbzr add *22:54
Kobaz...22:54
Kobazignored 1 file(s).22:54
Kobazit should tell you which files were ignored22:54
mwhudsonKobaz: not if there are 4000 of them22:55
Kobazhmm22:55
Kobazbut what if i wanted to know22:56
mwhudsoni think 'bzr ignored' will show you them22:56
Kobazah okay22:56
Peng_jelmer: Before filing a bug, here's the .bzr.log bit: http://paste.pocoo.org/show/DKInz7G6HBc20ifJONCe/22:57
Peng_jelmer: Filed https://bugs.edge.launchpad.net/bzr-svn/+bug/30835323:05
ubottuLaunchpad bug 308353 in bzr-svn "[0.5] KeyError in old_inventory when branching Lighttpd 1.4" [Undecided,New]23:05
jelmerPeng_, thanks, reproduced here23:10
Peng_:D23:10
jelmera large number of bug reports against bzr is with company svn servers, making it hard to debug the actual issue23:13
jelmers/against bzr/against bzr-svn/23:13
enigmajelmer: Is there anyway to have bzr-svn dump out all the metadata without any of the log messages and such? I would be happy to send that your well to help with debugging.23:14
enigmajelmer: Think I found a bug around tagging.23:39
enigmajelmer: Make a brand new svn repo.23:39
enigmajelmer: Create a "trunk/gui" directory and commit it.23:39
enigmajelmer: Then do "bzr branch test-repo/trunk/gui gui"23:40
enigmaThen go into "gui" and do: bzr tag "test-tag-01"23:40
enigmaThen bzr push -v ../test-repo/trunk/gui23:40
enigmabzr: ERROR: exceptions.AssertionError23:41
enigma  File "/home/enigma/.bazaar/plugins/svn/tags.py", line 53, in set_tag23:41
enigma    assert isinstance(path, str)23:41
jelmerAh, thanks23:41
jelmerenigma, It should be refusing to set any tags in that situation23:42
enigmaOh, OK.23:42
jelmersince it wouldn't know where to set tags if you're pushing to "trunk/gui" instead of "trunk"23:42
jelmerin the case of "trunk" it would be creating "tags/test-tag-01"23:42
pooliespiv, can you please before this afternoon make some measures for insert_revision_stream performance?23:42
poolieor point me to them23:42
spivpoolie: sure23:43
Peng_jelmer: Could my bug be related to bug 304134?23:43
ubottuLaunchpad bug 304134 in bzr-svn "KeyError when updating lightweight bzr-svn checkout" [Medium,Triaged] https://launchpad.net/bugs/30413423:43
poolielike for pushing one more rev, and pushing many revs23:44
Peng_Well, maybe not.23:44
* Peng_ shrugs.23:44
enigmajelmer: I just got another assertion error when trying to pull down a approx 380 rev from an 8000 rev repo23:46
enigma  File "/home/neumann/.bazaar/plugins/svn/revmeta.py", line 225, in get_fileprops23:46
enigma    lm = lm.get_direct_lhs_parent_revmeta()23:46
enigma  File "/home/neumann/.bazaar/plugins/svn/revmeta.py", line 310, in get_direct_lhs_parent_revmeta23:46
enigma    assert self == firstrevmeta23:46
jelmerenigma: ah, that's a known issue in 0.523:50
enigmaOK.23:50
jelmerenigma, I've fixed the tags issue you mentioned. Thanks!23:51
enigmajelmer: You're welcome.23:52
jelmerPeng_, no, I think it's not related.23:56
enigmajelmer: Are there docs on the bzr svn-* commands? How do I know what all the different commands are?23:58
Peng_enigma: "bzr help commands"?23:58
Peng_jelmer: Okay. :)23:59
Peng_jelmer: Thanks for your help tonight. :)23:59

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