/srv/irclogs.ubuntu.com/2008/08/01/#bzr.txt

lifelessit needs to be lazier or something00:08
lifelessor resolve to both ids and then handle one being absent00:08
james_wyeah00:08
james_wthe latter I think00:08
james_wthough I think it has the order backwards currently00:08
lifelessso cat -r x FOO00:09
lifelesscan resolve to two files00:09
lifelessshould it cat both?00:09
james_wno, I don't think so00:09
james_wI think it should cat FOO at x if possible00:10
james_wwith a way to say cat current file-id of FOO at x00:10
james_wpossibly falling back to that if the path FOO isn't in x00:10
Odd_Bloke'Morning'.00:10
pooliehello Odd_Bloke00:10
james_wevenin'00:10
pooliehow's pqm/00:10
james_whey poolie00:11
fullermdThat falls back into 'cat [like log] should be able to take a file-id'...00:11
james_wfullermd: yeah, logs even more complex I think, but we should provide a way to specify what you want00:11
james_wlog's I mean00:12
Odd_Blokepoolie: Not bad.  I had a bit of a lull over the past few days, but I'm back on track now.00:12
Odd_BlokeI intend to spend today working on XMLRPC stuff, mostly testing.00:13
mwhudsonOdd_Bloke: 'today' ??00:16
mwhudsoni see your sleep cycles are still crazy :)00:16
Odd_Blokemwhudson: Yeah, I'm not entirely sure what's going on there. :p00:16
fullermdSounds perfectly reasonable to me   :p00:16
Odd_BlokeWhen I'm like this and want to get work done, I find it easiest to just assume I'm shifted by n hours and act as if it's a normal day.00:17
mwhudsonOdd_Bloke: http://www.xkcd.com/448/00:17
mwhudsonOdd_Bloke: i guess you're around melbourne currently?00:17
mwhudsonperth tomorrow?00:17
Odd_BlokeI think I'm probably just off Australia's west coast ATM.00:20
* Odd_Bloke --> breakfast00:20
lifelesslol00:24
lifelesshgweb is a windows trojan00:24
jelmer'evening *00:25
lifelesshi jelmer00:28
lifelesspoolie: so, last we spoke about groupcompress you were hazy; are you less hazy now ?00:35
lifelessthumper: ping00:36
mwhudsonlifeless: is the graphs-in-hgweb something you have to turn on or something?00:37
mwhudsonlifeless: i don't see it on http://hg.mozilla.org/index.cgi/mozilla-central/shortlog (for example)00:37
thumperlifeless: yes?00:37
lifelessmwhudson: its a recent feature; back at europython CERN there was a beta branch00:38
lifelessmwhudson: but core didn't like the performance00:38
mwhudsonlifeless: ok00:38
lifelessits based on my merge_sort code :P00:38
lifelessthumper: echannel sorry00:38
mwhudsonwell haha00:38
mwhudsonlifeless: presumably it doesn't merge sort the whole graph the whole time though?00:39
lifelessshurg00:39
lifelessor at least, the code I saw at EP was done by grabbing merge_sort00:40
poolielifeless: that was a good summary, thanks00:40
poolielifeless: i'd like to make sure sometime before we commit to it there is a format specification separate from the code00:40
lifelessshocking!00:41
lifeless(do you mean like the EBNF's I write for the other low level things I create?)00:41
mwhudsonwell if you merge sorted the revision graph of bzrlib on every request, performance would be terrible00:41
lifelessI have some infrastructure I want to write00:41
poolie:)00:41
poolielike that00:42
lifelessyeah00:42
lifelessthere isn't one at this point because its got a lot of room for complete changes at the deepest level00:43
pooliei think it would be good to do that as a review into /doc/developers fairly early on00:43
poolienot as a fait accompli with teh code00:43
lifelessfor instance, using a hacked xdelta rather than a custom compressor00:43
lifelesspoolie: uhm, that sounds like committing to it before its done; I'd rather not do that. Why not just discuss on the list like we do for other conceptual changes00:44
pooliei don't mean it has to be frozen before the code is done00:46
poolieobviously that would be inefficient00:46
pooliejust that it might be worth having some of that discussion around a spec, rather than around either the code or just an informal description00:46
lifelessI'm clearly missing something00:47
lifelessI'm off doing research at the moment00:48
lifelessaiming to decide on what spec will work best00:49
pooliei'll try again00:49
lifelesswhere best is 'the C version will be fast enough that we are happy for a few years'00:49
pooliei'd like a spec to be reviewed before it is too late to change the code00:49
lifelessbut without waiting for the code to stop changing00:50
lifelessand the code changes change the spec00:50
lifelessWhatever, we're spinning. I'll send in a doc/ patch before I send in the main code if that will make you happy, but unlike other changes where we can clearly describe what we want, this is deep down under an already defined interface00:51
lifelessI don't understand what process hole doing this will solve.00:51
lifelesspossible conversation bug: I'm assuming you just want me to send in docs early, not to change my actual development process for thisl00:54
lifelessas my development process has for a very long time had plenty of discussion on list and circulation of ideas so its not a design-bomb & code-bomb situation00:54
lifelessif you want my development process to change; perhaps we should talk about what is going wrong there rather?00:55
lifelesss/ rather//00:55
=== emgent_ is now known as emgent
=== mw is now known as mw|out
lifelessbeuno: btw, bzr-search now has '-foo' support02:45
lifelessbeuno: but it doesn't quite play well with suggestions; TODO02:45
poolielifeless: that was a good explanation of your concerns about .bzrrules, i thought03:11
lifelessthanks03:12
lifelessjelmer: ping03:19
jelmerlifeless, pong03:19
lifelessdo you have any thoughts on how we can get jstowers productive again ?03:19
jelmerlifeless, I'm working on getting those file text revids stored in file properties03:20
jelmerlifeless, as to the current broken push, I think that's only really fixable by dumping the svn repo and reloading it without those properties (or adding the text-revid properties manually once bzr-svn supports them)03:21
lifelessjelmer: would it be possible to script that last step for him ?03:21
lifelessI think that would be really nice to do if we can :)03:21
jelmerlifeless: In theory we could though it's a lot more work than just fixing it manually03:22
jelmersince we don't have any functions for modifying svn dump files03:22
lifelesswell03:24
lifelesswe can't easily dump and load the svn, its gnomes production svn03:24
lifelessis there some other way, perhaps rebasing rather than merging, or something03:25
jelmerlifeless, well, rebasing rather than merging will prevent this problem from happening again while the fix isn't in yet03:26
jelmerit doesn't help with the existing repository though03:26
lifelesswell I was suggesting dumping the existing bzr repo03:27
lifelessdoing a fresh conversion from current svn; and rebasing his personal branches03:27
jelmerah, yeah, that'll fix it as well03:27
jelmeractually, I think just starting out with a fresh branch and pulling from his personal branch will do it03:29
jelmersince that shouldn't try to fetch any ghosts, right?03:29
lifelessright03:29
lifelessdo you want to note this in the bug (he is subscribed right?)03:33
igchi all03:39
lifelesshi igc03:40
lifelessigc: I sent the mail we discussed03:40
igchi lifeless03:40
igclifeless: thanks, I'm reading through email now03:40
lifelessigc: btw - re subclassing WorkingTreeFormat403:40
lifelessI think its better to invert the relationship - to bring in newer formats as superclasses03:41
igcwhy's that?03:41
lifelessso that our latest-and-greatest is higher up the hierarchy03:42
lifeless(if they are not siblings that is)03:42
igclifeless: is performance the driver?03:42
lifelessI mean - having format4(format3), format3(format2) etc gets quite convoluted and makes it hard to move format2 out to a plugin03:42
igclogically, a new format adds things03:43
igcah - ok03:43
lifelessso when there is a hierarchy,  having format2(format3), format3(format4), format4(object) means that the oldest code is a leaf node and more easily removable03:44
lifelessoften though we'll actually have something like03:44
mwhudsonbeuno: hello03:44
lifelessformat2(xmlformat), format3(xmlformat) format4(dirstateformat), format5(dirstateformat), xmlformat(dirstateformat)03:44
lifelessdirstateformat(object)03:44
lifelessor soemthing like that - more a tree03:44
lifelessbug the goal over time has to be maintenance of the code base, not representing the order things got added to the code :)03:45
igcagreed03:45
=== jaypipes_mysql is now known as jaypipes
beunomwhudson, howdy04:21
mwhudsonbeuno: i'm hacking at a themed directory listing04:22
mwhudsonbeuno: but it's turning into real hackery04:22
Peng_I was about to say "yay", but..oh.04:22
mwhudsonPeng_: red greed refactor, right?04:23
beunomwhudson, ah, yes, I did that once too04:23
beunoit got so ugly I reverted04:23
mwhudsonheh04:23
beunolifeless, ah, I see04:25
beuno- doesn't play well with suggestions?04:26
beuno(cool, btw)04:26
lifelessyeah, doing Robert -xml in the box gives no suggestions04:27
lifelessits a search bug not loggerhead:04:28
lifelesssearch/trunk$ bzr search -s Robert -- -xml04:28
lifelessSuggestions: []04:28
lifeless/search/trunk$ bzr search Robert -- -xml | wc -l04:28
lifeless4604:28
beunolifeless, ah, I see04:30
beunoI don't think it's a feature you'd use with autocomplete anyways04:31
lifelesswhy not ?04:31
beunoeven though it is a bug you'd want to fix04:31
beunowell, if you already know that much, you'll probably search anyways04:32
lifelessperhaps04:32
lifelessstill, ELATER04:32
beunoyeao04:32
beunoautocomplete currently suggest searches04:32
beunoI'd like to look into providing results04:32
lifelessexactly04:32
lifelessmmm04:33
beunoI have a few ideas for search which may be cool04:33
lifelesscould be interesting04:33
lifelessI'd love to be able to arrow key down into the suggestions04:33
beunoyes, me too. It's a tricky one though04:33
gerelhey, just an easy one, is it safe to run two dedicated servers, one  read-only and another with write access, both for the same repo ?04:34
lifelessworks on google ;)04:34
lifelessgerel: yes thats fine04:34
gerellifeless: thank, you're a bzr dever ? :-) (just curious)04:34
beunoyeah, damn google makes everybody look bad04:34
lifelessgerel: yes04:35
lifelessbeuno: actually I meant 'why not see what they do :P'04:35
* gerel just tried www.cuil.com04:35
beunolifeless, I know how to do it, it's just hard  :)04:35
gerelbig bubble on search engines these days04:36
gerellifeless: many thanks for your help04:36
lifelessbeuno: ah, what makes it hard?04:36
beunoI could peak and see if it's easily re-usable, but google isn't usually some place you can copy javascript off04:36
lifelessgerel: well, people have been trying for what, a decade now? to dethrone google04:36
lifelessI suspect it needs some radical new approach rather than just tweaks04:37
beunolifeless, keyboard keys and browsers don't play well, and re-inventing widgets like drop down lists is complicated too04:37
lifeless(like pagerank was when it came out)04:37
Odd_BlokeWhat sort of message should I use with 'bzr record'?  I'm not sure what I'm meant to be describing.04:37
beunoyeap, re-write parts of the javascript is needed04:37
lifelessOdd_Bloke: you are recording the: list of threads, the tip of each thread04:38
* igc lunch, then reviewing jam's MultiWalker patch04:38
beunolifeless, either way, it's on my ToDo list. I want to make search really useful on LH04:39
lifeless:->04:39
lifelessOdd_Bloke:  you should record before you push; and the message would be something about where you are up to in the overall shape of things - like a commit message is for an individual branch04:40
Odd_Blokelifeless: Cool, thanks.04:40
poolielifeless: i sent a pretty small patch for bug 252428, would appreciate if you could look at that04:42
ubottuLaunchpad bug 252428 in bzr "stacking must always grab full inventories" [Critical,New] https://launchpad.net/bugs/25242804:42
gerellifeless: its just we need a big web classifier that keep us from the irrelevant data that makes us waste time, i thing in 20 years the inet as we know it, totally free and public, will change04:43
gerellifeless: the big corps want to control us all, kill the p2p and what not04:43
pooliegerel, reminds me of the boltcutters a security engineer friend used to keep in his drawer04:43
lifelessgerel: depends on which corp :) big telcos _love_ p2p - more money04:44
pooliewow amazing04:44
pooliegtk just fixed an incredibly long standing bug04:45
poolielifeless: thanks04:50
gerellifeless: hah, maybe but they'll earn more if they sell you a web pack with 20 sites too :-)04:50
gerellifeless: we better start mesh networks with Access points04:52
lifelesswell, mesh is fun04:53
lifelesswe have quite some engineering and political discussions to make it viable large scale04:53
gerellifeless: yeah, and it'll be the only free thing you'll be able to do :-P04:53
gerellifeless: where ?04:54
mwhudson<beuno> mwhudson, ah, yes, I did that once too <beuno> it got so ugly I reverted04:54
lifelesspoolie: was it a bug you filed?04:54
poolieyes04:54
pooliei may have been filing a dupe04:55
pooliebasically it is that you can only click a button after your mouse moves into it04:55
poolieif it appears under your mouse, or changes from disabled to sensitive while it's under your mouse, you can't04:55
poolieyou have to move out and back in04:55
pooliesounds trivial; apparently it was really hard04:55
lifelessgerel: well, we need enough spectrum reserved; we need solid p2p dns (security,robustness, etc); we need solid adhoc networking across the entire mesh etc etc - if you decentralise the entire stack its a lot of work, but thats what the end goal is IMO04:56
pickscrapeI bet it's nice to put things like that to bed04:56
pooliei have been getting and deleting "me too" mail for the last N years04:56
lifelesspoolie: :>04:56
gerellifeless: correct, i guess we'll be forced to04:56
lifelessI have the odd bug like that04:56
jelmerlifeless: I'll follow up with him once I fix this bug (which should be < 1 day now)05:00
mwhudsonbeuno: i see what you mean now :)05:00
jelmerlifeless, Odd_Bloke: Is PQM using lp or bb for merge requests now?05:01
pooliei thought it was using lp05:07
lifelessjelmer: cool05:07
lifelesspqm is using a bit of btoh05:07
gamblerjust experimenting with bzr...i think i found a small bug05:26
gamblerhttp://pastebin.com/m543a24ad05:26
beunomwhudson, lol05:27
beunomaybe we should generate that different05:27
beunoand not hack around it05:27
lifelessgambler: what are you saying is a bug ?05:27
gamblerit looks like it replaced the ~  with a unicode or something05:28
lifelessthats URL escaping05:28
gamblerssh usually expands that05:28
gamblerah ok05:28
lifelessit will be handled correctly05:29
mwhudsonbeuno: well, there is some grottiness in filesystem.py that should be cleaned up i guess05:44
* beuno wonders why he doesn't get email when people ask questions about loggerhead05:58
* beuno wanders off to bed06:01
mwhudsonbeuno: i just set up ~loggerhead-team as an answers contact a few minutes ago06:02
beunomwhudson, aah, ok. That makes sense06:03
beunoI'll unsubscribe06:03
mwhudsonso now launchpad will send us even more mail!!!06:03
beunoshouldn't that be the default?06:03
mwhudsoni have no idea06:03
beunooh, wait06:04
beunoI think I activated answers06:04
beunoa few days ago, trying to change something else06:05
beunosorry  :)06:05
mwhudsonah :)06:05
beunodamn people are fast to find stuff06:05
mwhudsongood idea06:05
mwhudsonbut strange that the owner isn't a contact by default06:05
beunoit is06:07
beunoanyway, off to be for real this time06:07
beunomwhudson, if you get anywhere with the templating, let me know06:07
beunoI'm planning on working on that tomorrow06:07
mwhudsonbeuno: ok, there's a branch on lp06:07
beunonot that it should incentive you to drop it in any way  :)06:08
mwhudsoni'm not going to be working on it much more...06:08
mwhudson(today, anyway)06:08
mwhudsonbut yeah, funny questions like06:08
mwhudson"should there be tabs?"06:08
mwhudsonbeuno: g'night06:08
beunomwhudson, yeah, sometimes giving karma to people fires back  :p06:09
beunonight!06:09
* Odd_Bloke --> lunch06:09
Odd_Blokebeuno: Sleep well!06:09
beunoOdd_Bloke, you too, whenever it is you'll be doing that06:10
beunomwhudson, LP won't let me get your branch06:10
beunobeuno@beuno-laptop:~/bzr_devel/loggerhead$ bzr branch lp:~mwhudson/loggerhead/themed-directory-listing06:10
beunobzr: ERROR: Not a branch: "bzr+ssh://beuno@bazaar.launchpad.net/~mwhudson/loggerhead/themed-directory-listing/"06:10
beunoI suppose because it's private06:10
mwhudsonbeuno: the push hasn't finished yet06:11
beunoah06:11
beunoI still don't trust LP when it says it hasn't. It will take a while to regain it's trust06:11
* beuno closes laptop06:12
=== `6og is now known as Kamping_Kaiser
jmlpoolie: hi07:18
igcpoolie: jam has re-posted a patch for BranchBuilder after you voted tweak. Did you want to re-review it or would you like me to do it?07:30
=== thekorn_ is now known as thekorn
Odd_BlokeI'm trying to write a test for a plugin that uses XMLRPC.  Do we have something in bzrlib that will allow me to capture any POST requests made to a URL?07:53
lifelessthe smartserver code demonstrates a post handler07:53
Odd_BlokeAh, OK, that is working, I was getting confused by something else.07:55
poolieigc, hi08:06
pooliejml, hi to you too08:06
pooliespiv, ping?08:07
=== abentley1 is now known as abentley
pooliespiv, i saw your patch for 251871 was tweaked, is it in now, or ok to go in?08:07
poolieigc, i'll re-read it but you're welcome to if you want to08:07
poolieit should not be very complex or controversial08:07
igcpoolie: I'm looking at markh's changes to setup.py so I may not get to it08:08
igc.. today08:08
poolienp08:08
=== yacc_ is now known as yacc
spivpoolie: It's not in yet, I'm tweaking it at the moment (adding a test)08:19
spivpoolie: the fix itself isn't being changed by the tweak though.08:19
poolieok thanks08:31
spivpoolie: just fired the tweaked version to PQM, in fact.08:32
pooliedid it really drop my merge? :/08:43
igcnight all09:02
poolienight ian09:02
pooliesleep well09:02
pooliespiv, if you're still here09:07
pooliepqm says my stuff is merged but i can't see it in trunk09:07
pooliewhat do you see as the last rev of bzr.dev?09:07
Odd_Bloke"(robertc) Fix bug 150438 - dirstate corruption due to invalid..."09:12
ubottuLaunchpad bug 150438 in bzr "corrupt inventory deltas are not detected by dirstate" [High,Fix released] https://launchpad.net/bugs/15043809:12
Odd_Blokepoolie: ^09:13
pooliemm thanks09:14
pooliemaybe pqm has gone for the weekend :/09:14
lifelessme too09:18
poolie:)09:19
poolielifeless: well, if you want to poke it sometime that would be good but there's no rush on my account09:19
lifelesslet me finish this hardy upgrade09:22
lifelessevms headaches09:22
=== sabdf1 is now known as sabdfl
fullermdpoolie: No actual code on that repo tests reorg thing?09:28
pooliedo you mean no patch09:28
fullermdYah.09:29
pooliethanks09:30
poolieBB should really say 'you silly silly boy' not 'accepted'09:30
fullermdIt's not really paying attention right now; it's off cavorting with pqm for the weekend   :p09:31
poolienight all09:56
Peng_Yikes! Loggerhead's SQL cache got corrupted, leaving most pages as 500 errors for...I dunno how long.10:50
Peng_Wow, good timing! It only happened like 10 minutes ago.10:51
Peng_Poor Googlebot. It even got one 503 error when I shut down LH while fixing this.10:52
gourwhat bzr+http protocol requires on the server side?11:11
* gour is dissussing in #ghc about possibility to use bzr for ghc11:12
james_whey gour11:13
james_whttp://doc.bazaar-vcs.org/latest/en/user-guide/index.html#serving-bazaar-with-fastcgi11:13
gourta11:14
james_wthere may be other ways11:14
james_wbasically you need to make your http server hand of some requests to a bzr process11:14
gourghc is seriously considering switch from darcs, but, unfortunately, bzr is not considered seriously enough11:15
james_wyeah, I saw the wiki page11:15
gourjames_w: have you seen irc log as well?11:15
james_wno, I haven't11:15
gourit's referenced there, iirc11:16
gourhttp://hackage.haskell.org/trac/ghc/attachment/wiki/IRC_Meetings/ghc-metting-2008-07-23.log11:17
james_wthanks11:18
gourjames_w: i wrote (on #ghc) to JaffaCake (he is one of main ghc devs) about bzr...sending blog about mysql adoption etc.11:19
gourit would be nice of some bzr dev could address some of their issues 'cause wiki page has some strong Pro points11:20
gourcherry-picking is the one11:21
fogpush push push. after 3 months of bzr use for our internal projects let me thank all bzr developers. kudos! push push push.11:25
james_w178 [17:22] bos:11:30
james_w179 git has about 2x the number of users of hg, and only one significant project uses bzr.11:30
james_w180 [17:23] JaffaCake:11:30
james_w181 that rules out bzr, I think11:30
gourright, that's why i mentioned mysql to JaffaCake11:30
james_wthe mysql link probably helped there then, thanks11:30
james_wand soon bzr will have more source code in it than any of the others, just that it won't be used by the projects themselves all the time11:31
* gour thinks bzr is the most balanced dvcs...and still improving performance11:31
Peng_Could the ghc devs dry out different DVCSes to see which one they like best?11:33
gourheh, it does not always go like that11:34
Peng_Err, try out*11:35
goursome people on #ghc complain about problems building on mac osx11:37
alsurenI have just realised that I included an mp3 file in my bzr repo a few commits ago, so sharing it over http is going to be slow. What's the best way to remove it from the packs?11:43
LarstiQgour: that is a little bit unclear?11:43
LarstiQgour: they do know of 10.5 and 10.4 dmgs at http://bazaar-vcs.org/Download ?11:43
gourLarstiQ: it looks it was some 10.4 issue and/or tiger & python-2.511:46
Pilkygour: I don't think 10.4 has python 2.511:47
Pilkyif they use the OS X installers it should include it11:48
gourPilky: they wrote "python 2.5 is broken on tiger". i don't know anything about osx versioning11:48
PilkyTiger is 10.4, Leopard is 10.511:48
gourheh, funny11:49
Pilkyjust tell them to use the OS X installers unless they have a specific need to build11:50
Pilkyyeah Apple is cat crazy with OS X11:50
PilkyCheetah, Puma, Jaguar, Panther, Tiger, Leopard, Snow Leopard for 10.0 - 10.611:50
gourit seemed they were able to install it11:50
LeoNerdSurely they'll run out eventually...11:50
gourlol11:50
Pilkyprobably by 11.011:51
LeoNerdHave to start taking more obscure ones.... lynx, ocelot, cerval.. onyx?11:51
Pilkywell there's still Lion available11:51
LeoNerdThough I'm very disappointed there's no Lion yet11:51
Pilkybut I think most people are waiting for Tabby Cat11:51
LeoNerdOr maybe they're saving that for the ultimate conclusion, the pinacle, the peak in perfection. :(11:51
LeoNerd:)11:51
Pilkyheh11:51
gourwhat about Monkeys?11:51
Pilkywell they managed to push Lion off for a while with Snow Leopard11:52
PilkyI can see Ocelot possibly being used, I think lynx has some issues with trademarks or something11:52
LarstiQLiger!11:52
Pilkyheh11:53
fullermdSphin/X11:53
PilkyI just need to get enough money to get a new ADC account so I can get my hands on Snow Leopard, it's meant to have some pretty cool stuff in it. Unfortunately I don't currently have £300 spare :p11:53
JayzeeI have a repository with 2 branches, if I want bazaar to execute a script when files have been comitted to a specific branch (for all users), what do I need to do?12:02
james_whi Jayzee12:02
Jayzeejames_w: hello there12:03
james_wyou can write a plugin that provides a post_commit hook and activate it for the branch that you want12:03
JayzeeI got that but I suppose the plugin is not supposed to be in my home then?12:03
Jayzeesince I'm not the only comitter12:04
james_wif you want it more general than running "bzr commit" in that specific branch, e.g. to run after pushing to that branch, then you can use a "post_branch_change_tip" hook, or whatever it is called12:04
james_wno, it will need to be in bzrlib/plugins wherever bzr is installed12:04
james_wor in every users' ~/.bazaar/plugins/12:04
james_wor you could do something with BZR_PLUGIN_DIR12:04
LarstiQJayzee: is this a centralized setup?12:05
JayzeeI can't find anything abut post_branch12:05
alsurenJayzee: what does your script do? there might be a better way12:05
Jayzeeyes, It's one machine with 2 developers comitting12:05
LarstiQJayzee: post_change_branch_tip12:06
Jayzeebasically I would like to do a "bzr export ..." when stuff has been comitted to stable-branch12:06
LarstiQbut as alsuren said, what is it you are trying to achieve?12:06
james_wah, thanks LarstiQ12:06
LarstiQright12:06
JayzeeI would like code for our website to be copied to www-root when changes are being made to stable branch12:07
* LarstiQ nods at Jayzee 12:07
LarstiQJayzee: post_change_branch_tip sounds like the right thing then12:07
james_wyou *could* do it from cron, but post_change_branch_tip would work nicely12:08
Jayzeeone more thing, do I really need to write a plugin in python??12:08
JayzeeI'm more confortable in php/bash12:08
Jayzeecomfortable12:08
james_wI don't know what the status of the shell hooks work is12:09
james_wJayzee: this plugin should not be too difficult12:10
james_wlet me have a look for you12:10
Jayzeethx james12:10
alsurenit strikes me that having a branch type that forces the working directory to always look like the last commit would be a useful feature12:16
james_walsuren: yeah, that may be something useful12:16
james_wI'm not sure what the best way to expose that would be12:16
lifelessalsuren: that implies that the working dir cannot be decoupled12:17
lifelessalsuren: and that it can't work efficiently over the network without a smart server12:17
lifelessalsuren: and that branch changes have to fail if there are local edits that conflict in the tree12:17
lifelessthis doesn't mean its not usefl12:18
lifelessjust the implications12:18
alsurenlifeless: I'll go through your points in order12:19
Jayzeeit would be nice if bzr export would export to a already existing directory, in that way you could have the most recent using a hook12:19
lifelessJayzee: thats worth filing a bug on I think12:20
LarstiQJayzee: are you per chance working locally on the machine with the www-root?12:20
lifelessJayzee: btw, are you aware of the push-and-update, and also the bzr-upload plugins ?12:21
Jayzeeyes, I have total access to it12:21
LarstiQJayzee: then the plugins lifeless mentioned shouldn't be too slow in operation12:22
alsurenthe point is for publishing branches in a read-only form that doesn't require users' knowledge of bzr. all development would happen elsewhere12:22
Jayzeelifeless: I'm just started setting everything up, I come from svn-world where there's no push-update12:23
james_wbeuno: hey, you around?12:24
alsurenlifeless: the second point is possibly valid, but if your project were big enough to care about performance, you would be using a smart server anyway. The time saved by being able to publish with a single push operation is massive12:26
alsurenlifeless: you will have to explain your third point12:27
james_wis there a way to get a boolean answer from a branch config?12:28
james_wand shouldn't hooks be passed an outf?12:30
lifelessalsuren: I think my first point is valid too12:31
lifelessalsuren: your refutation is actually talking about goals not about implementation; you proposed an implementation of 'publishing branches in a read-only form that doesn't require users' knowledge of bzr.'12:31
james_wJayzee: I think this would be a useful thing to have as part of bzr-upload, and it would make the plugin much more robust. However there has to be some refactoring in that plugin first. How urgent is this for you?12:34
alsurenlifeless: ok, so what's the recommended implementation currently?12:34
lifelessbzr-upload or bzr push-and-update12:35
Tapoutis bazaar faster than svn when it comes to really large projects?  I've been running an svn commit and it's been going for about 1 hour and only 1GB done out of 4GB12:38
alsurenlifeless: thanks. I suspect that bzr-upload is what I'm looking for (I assume that it is possible to use bzr pull on a bzr-uploaded branch?)12:39
alsurenTapout: what are you storing in your repository that makes it 4GB?12:40
Tapoutit's a website ... docs+pdf's, text files12:40
Tapoutsvn add * ; svn commit -m "Import"12:40
Tapoutthis is on a 1Gb network, average about 35-40MB/sec between machines12:41
james_walsuren: bzr-upload only uploads the tree12:43
Jayzeejames_w: since I will be not using any distributed version control any time soon I think it's better for me to stick with svn for time being (and skip python scripts :))12:43
james_walsuren: if you bzr-upload to the same location as the branch then it should all just work12:43
james_wJayzee: ah, shame. I was just wondering whether I should do a quick hack for you know, or whether you could wait a little while until we have a really elegant solution in bzr-upload12:44
Jayzeejames_w: you can still do it properly, sooner or later I'll look at bzr again :))12:45
james_wJayzee: great, and we'll have a really nice solution for you then :-)12:45
alsurenjames_w: ah. so it's still 2 commands if I want to use it as a public site and bzr repo at the ame time?12:45
Jayzeejames_w: yeah, hooks are good to have :)12:46
james_walsuren: yeah12:46
james_walsuren: but I'm working to make it automatic right now12:46
lifelessalsuren: I'm not 100% sure, but beuno here is one of the authors of bzr-upload12:48
lifelessalsuren: I'd wager you actually want bzr push-and-update though12:49
alsurenlifeless: already checked, and my department doesn't have bzr installed12:49
lifelessalsuren: ah thats a shame. if python is on the machine you could drop it in your home dir ;)12:51
alsurenlifeless: tried that. installing bzr from source seems to require python-devel installed12:55
james_walsuren: was that for the pyrex extensions?12:56
alsurenjames_w: might have been... this was 3 months ago13:10
james_whmm, I don't think python-devel should be required13:11
james_wexcept if there is something packaged in there that is really a runtime thing13:11
alsurenerror: invalid Python installation: unable to open /usr/lib64/python2.5/config/Makefile (No such file or directory)13:12
alsurenopensuse13:13
alsurenwhen I'm in the department, I just use git instead13:14
alsurenjames_w: if you fancy debugging, there's your info13:15
lifelessalsuren: we don't need the extensions - you can just do 'tar xzf bzr-1.6b4.tgz' ; bzr-1.6b4/bzr help13:15
lifelessalsuren: for that error, is there a 'python-dev' or similarly named package available for opensuse ?13:16
james_wlifeless: do you know what change is causing "Exception: Old server API in use: <bzrlib.transport.ftp.UnavailableFTPServer object at 0x978b22c>, setUp() takes exactly 1 argument (2 given)"?13:16
lifelessjames_w: is that in a plugin ?13:17
alsurenyeah, but I'm not root13:17
lifelessalsuren: ok, well that would be whats missing for the makefile to work; but as I mention above, the C extensions are 100% optional13:17
james_wlifeless: yeah, I'm testing bzr-upload13:18
lifelessjames_w: I'd annotate the constructor13:18
alsurenokay, so if I just put a symlink from bzr to ~/bin, it should work?13:18
lifelessjames_w: that will give you the patch that changed the signature ;)13:18
lifelessalsuren: yeah.13:18
lifeless$ ls -l ~/bin/bzr13:18
lifelesslrwxrwxrwx 1 robertc robertc 43 2007-08-16 20:16 /home/robertc/bin/bzr -> /home/robertc/source/baz/bzr-test-fixes/bzr13:18
james_wlifeless: ok, thanks13:18
lifelessalsuren: all it sacrifices is some speed13:20
alsurenlifeless: okay, well using bzr 1.4, on the branch that I just pushed over sftp, I get bzr: ERROR: No WorkingTree exists for "file:///homes/courses/ugrad/05/dl325/swingbar/.bzr/checkout/"13:23
lifelessalsuren: run bzr checkout . in the swingbar directory13:24
alsurenlifeless: thanks (maybe that error message needs changing)13:26
pickscrapeAre there any bugs in beta 3 that would make it inadvisable for use server-side?13:29
alsurenpickscrape: why don't you try it and find out (isn't that what betas are for? :P )13:34
=== thekorn_ is now known as thekorn
james_wah, UnavailableFTPServer wasn't transitioned to the new API13:37
pickscrapealsuren: :)13:39
ignaswhat do I do with a lightweight checkout if someone deletes the branch i was bound to?14:00
ignasi am getting: bzr: ERROR: Not a branch: "https://code.launchpad.net/".14:00
ignaswhen trying to bind, unbind, switch, info or status14:00
james_whmm, I assume switch should work14:01
james_wit may be a bug though14:01
james_wignas: yeah, can you file a bug please?14:02
ignas:'(14:03
james_wecho -n new-location >! .bzr/branch/location14:04
james_wthat should fix it up14:04
james_w-n is important14:04
ignasyeah, thought of doing that14:04
james_wI don't know if >! is a zshism though14:04
ignasno idea, replaced it with plain ">"14:06
ignasand it worked14:06
jamignas: isn't there a 'bzr switch --force' ?14:08
jamjames_w: >! *is* a zsh-ism14:08
jamother shells don't care if the target exists already14:08
fullermdActually, >! exists in tcsh...14:09
fullermd(though I've never used it, since I keep noclobber unset)14:09
ignasjam: don't know really, i'd expect that i should get a warning that tells me to do --force it instead of an error though14:09
james_w--force        Switch even if local commits will be lost.14:10
james_wit may still work, but it isn't obvious14:11
james_wI think there's a bug there somewhere, either that it isn't possible, or that it isn't obvious14:11
jamjames_w: I would probably say the help should be clearer, and the switch code should be taught about not being able to open the target of the lightweight checkout and letting the user know about it14:13
jamcertainly bugs to be fixed14:13
ignaswhy should I lose my local commits on a lightweight branch if i am switching it?14:14
ignasi don't think current behaviour of force is related to this kind of problem14:14
jamignas: I think it *is*, it just isn't documented well14:22
jamThe reason we require access to the old branch14:22
jamis to make sure nothing ends up lost14:22
jambut the specific help just mentions the heavy-weight checkout form14:22
jamwhere you could have local commits, and a switch will lose them14:22
ignasi see14:22
jamI'm 90% sure it is just a doc issue14:22
ignasjust that relation between - "lost checkins" and "branch that was moved" is not completely obvious14:23
ignasi mean - if I would get a warning - you can't switch, we will lose your changes, because we can't access the original branch14:23
james_w--force doesn't work in my test here14:23
ignasthen - yes14:23
ignas--force would be the thing I'd try14:24
ignasbut not with the "old branch does not exist!" error14:24
lifelessignas: lose local commits? lightweight brnaches don't have local commits..14:34
ignaslifeless: precisely, so even if  "switch --force" would fix missing remote branch problem, with --force being described as "switch even if local commits will be lost" I would not have any way of finding out that it is the option I need14:36
ignasand even without local commits, you still can lose local changes14:37
ignasif i have changed some file, and the remote branch disappeared, bzr won't be able to find out which files I have modified, unless you do some magic that I am not aware of14:38
lifelessignas: what changes have you list ?14:40
ignas?14:40
pickscrapelost?14:40
ignasahh, well - my lightweight checkout was not modified14:41
ignasI think14:41
ignasok14:41
ignasit was modified14:41
ignasbut switching the location14:41
ignasdid not lose anything14:41
ignasso yeah, you are doing some tracking somewhere14:42
lifelessignas: :) gotta be careful of these assertions :)14:45
ignasi kind of assumed that if you are losing local checkins, chances of keeping local changes in place without the parent branch being present are pretty low14:46
ignasstill - having an interface to fix --ligthweight checkouts would be kind of nice14:47
lifelesswhats broken ?14:52
ignasmake a lightweight checkout, remove the original branch (or move it) try bzr st,info, switch, bind, unbind ...14:53
ignasi had to edit .bzr/branches/location to fix it14:54
lifelesshmm yes14:54
lifelessplease make sure there is a bug open for this14:54
lifelessif it fails on 1.6b414:54
ignascould someone with 1.6b4 check it, because I don't really have a bzr checkout around ...14:56
ignasonly bzr that is available in ubuntu (ppa one)14:57
ignas1.6b314:57
ignasi can repro it on 1.6b314:59
ignashttps://bugs.launchpad.net/bzr/+bug/198821 is there already15:02
ubottuLaunchpad bug 198821 in bzr "switch of lw checkout shouldn't require force when branch moved" [Medium,Confirmed]15:02
=== mw|out is now known as mw
ahasenackHi, I'm using bzr 1.3.1 on a client and branching from a server that is running 1.6b3, and I get this warning on the client: "Server is too old for streaming pull, reconnecting.  (Upgrade the server to Bazaar 1.2 to avoid this)"15:11
james_wahasenack: hi15:13
ahasenackjames_w: hi15:13
james_wthe problem is that the verb was removed, and the code just assumes that means that it is too old, but in this case it is too new15:14
james_wthere is a bug open, but I believe it's marked "Won't Fix"15:14
james_wthe message is misleading, but everything still works15:14
ahasenackok15:14
spivIf you update the client to 1.6b3 you won't see that message.  That's a fix ;)15:15
ignaswhat is the rationale behind showing this to users a.k.a. clients, it's like firefox telling me that some server is using an old version of apache :/15:16
spivThe reason is that when client and server versions are mismatched things can sometimes be surprisingly slow15:16
spivBecause the protocol is still in flux, so while things will still work, the mismatched versions might not be able to figure out how to do it quickly.15:17
james_wyeah, I guess it's like the discussion over when to show an upgrade message for formats15:17
spivSo by telling the user that there is a mismatch like that it lets them know how to fix bad performance.15:18
ignasmy point is - I can't access most servers, much less upgrade software on them15:19
spivThat's the logic, anyway.  Ideally there would be some way to suppress those warnings if you're sure you don't care about them, but no-one has cared enough to volunteer a working patch ;)15:19
ignasso the benefit of the warning is like - firefox telling me that "this site is slow, because they misconfigured caching, it's not our fault"15:20
spivPretty much.  "We know this is sucking, here's why, now you know who to talk to to get it fixed."15:21
spivWe are erring on the side of verbosity here.15:21
spivI think it'd be fine to have e.g. a locations.conf setting to suppress that warning, so you could choose not to be informed about it for particular sites.15:23
spivThe long term fix is to stop changing the protocol so much :/15:23
alsurenalso, there's something to be said for encouraging everyone to keep their softare up-to-date. Especially with a project that's moving as fast as bzr15:23
ignaswell - if you are assuming that most of bzr users can do something about servers they are using ....15:23
ignasthen showing warning by default makes sense15:23
alex-weejhello15:24
alex-weejwhen i commit to my local repo i'd like for it to be mirrored instantly online when possible15:24
alex-weejis it "bind" that i need?15:25
alex-weeji'm using lp btw15:25
ignasyes15:25
spivMany can, especially if you count "email the sysadmins of the server" as doing something about it ;)15:25
spivI don't much like that it makes it feel like bzr is nagging you, especially because you might not be able to do something about it, at least not immediately.  But I'd rather give more information about what is going on rather than less.15:26
alex-weejso how do i tell bind to use the default push location?15:27
ignasbzr info15:27
ignascopy the url15:27
ignasand do bzr bind url15:27
spivAnyway, it's time to sleep.15:27
jambeuno: ping15:31
jamspiv: sleep well spiv15:31
spivjam: thanks :)15:32
* spiv -> really sleep!15:32
beunojam, pong15:33
jambeuno: I'm happy to see the new theme land on Launchpad, but at least here, the annotate view has far too much whitespace15:33
* beuno looks15:34
jamI don't know if this is LP specific, or if it is part of the latest trunk15:35
jamBut certainly something is a bit off with the CSS15:36
wingo-tplifeless: cough poke #239499 :)15:36
beunoit's the same for both15:36
beunoit's the same for both15:36
beunoso fixing trunk should fix LP15:36
* beuno files bug15:36
jambug #23949915:36
ubottuLaunchpad bug 239499 in bzr "corrupt knit index on an old arch-imported bzr repo" [Medium,Confirmed] https://launchpad.net/bugs/23949915:36
beunojam, does the line spacing in diffs seem fine to replicate in annotate?15:40
jambeuno: checking now15:41
beunojam, http://bazaar.launchpad.net/%7Eloggerhead-team/loggerhead/trunk/revision/19015:41
beuno(LH in LP seems very slow today)15:42
jambeuno: it is a lot better, but compare it to: http://bzr.arbash-meinel.com/gvim_spacing.png15:43
jamThat is the spacing in my text editor15:43
jamYou can make the text bigger if you give less whitespace15:43
jamAnyway, if I had to chose between current, and diff view, I'd pick diff view15:44
jamBut *I* would probably go further15:44
jam*I* am not a web designer or graphics designer, and my fashion sense is poor, though15:44
beunosure, I'd prefer to fix everything at once15:44
beunoI'll make the bug about spacing in general15:44
jamI would guess the spacing in T-bird is about the same as gvim15:44
beunoand see if it looks too ugly  :)15:44
beunojam, bug #25398115:47
ubottuLaunchpad bug 253981 in loggerhead "Line spacing for code text is too big" [Medium,Confirmed] https://launchpad.net/bugs/25398115:47
jamjoy.... the other day they reset LP passwords, and now I'm on Linux so I have to log in15:49
jamThen I log in to the normal site15:49
jamwhich redirects me to edge15:49
jamand I'm not logged in again15:50
james_wbeuno: hey lp:~james-w/bzr-upload/auto_upload16:01
james_wwhat do you think about including that?16:02
* beuno branches16:04
james_wit don't work if you commit from a checkout in the same shared repo as the branch with the configuration, but it looks like that may be a bzr bug16:04
beunojames_w, I really like the idea. How would you specify which branch you want to be auto-uploaded?16:08
james_wauto_upload = True16:08
james_win wherever you put upload_location16:09
beunoah, right, I missed that16:09
james_wupload_automatically may be better as it has "upload" first, but it's a pain to spell16:09
beunoit would be cool to be able to set it from the command like, but the branch looks very good as-is16:09
james_wyeah, sorry, didn't add any docs yet16:09
james_wbzr upload --auto?16:10
beunoyeah, that sounds good16:10
beunoand --noauto?16:10
james_wgood idea16:10
james_wI need to work out how to test it as well16:10
beunoand, vila will kill me if I add anything without tests16:10
beunothat's it  :)16:10
beunoI have some LH work today, but I'll try and help you out with this so we can merge16:11
beunoit looks very good, so thanks  :)16:11
james_wI should finish my TreeTransform patch first though16:11
james_wyou don't mind adding the class in __init__.py16:11
james_wI couldn't run the command from the hook, as the source branch is already write locked.16:12
beunonot at all, it moves logic out of the command16:13
beunoor we could move logic out of the command, actually  :p16:13
beunojames_w, anyway, just a little bit of work on top of that, and it's perfect16:14
james_wbeuno: can you try it from inside a shared repo?16:15
james_wi.e. create a shared repo with a branch in, upload that somewhere, then add the auto_upload = True16:16
beunojames_w, yeap, just need to pack up and move to the office for a few hours, so I will in a bit16:16
james_wthen checkout in the same shared repository, and commit from there16:16
james_wbeuno: sure, no problem, just wanted to rule out a screw up on my end16:16
beunojames_w, I have a use case for this at work, so I'll plug this right in so we can test it a bit. It even uses a shared repo already16:17
james_wbeuno: great, I love it when a solution finds a problem16:19
jamjames_w: why not just "upload_auto = True"16:23
james_wthat would work I guess, it just feels ungrammatical16:23
james_wit's not a novel though16:23
jamupload_automatically_for_thou_art_my_biznatch = True16:39
jamI don't think I would read that book, though16:39
robtaylorlifeless: just read your partial commits idea, sounds lovely!16:41
thekornhi all,17:15
thekornI have once again a bzrlib question,17:16
james_whey thekorn17:16
thekornlet's say I know the path to a versioned file17:16
thekornhi james_w17:16
thekornhow can I get the revno of this file?17:17
thekornsimilar to   bzr revno /boo/bar/baz.py17:17
james_wI'm not sure whether "bzr revno /boo/bar/baz.py" does what you think, let me check17:20
james_wyeah, that just prints the revno of the last revision on the branch containing that file17:21
james_wyou want to know the revno of the last revision that changed that file?17:21
thekornjames_w, no just the current revision of this the branch which contains this file17:22
thekornjames_w, sorry I just found it in buildins.py17:22
james_wcool17:22
thekornit is BzrDir.open_containing(location)[0].revno()17:23
thekornthat was easy :)17:23
thekornactually not BzrDir but bzrlib.branch.Branch, but it works17:25
james_wbeuno: hey, are you settled in the office yet? I'd like some testing advice.17:35
jelmerany dd around that can upload a new version of trac-bzr for me?17:55
beunojames_w, yeap17:57
james_wbeuno: it looks like the uploading is well covered by tests, so we just want to make sure that an upload is triggered by a commit17:58
beunocorrect17:58
james_wYou've got an interesting test strategy though, so I'm not sure of the best way to integrate with it17:58
beunoright, it's less flexible then I'd like17:59
beunoit seems like you have to duplicate a lot of code, right?17:59
james_wyeah, that's what I was worried about18:00
james_wit seems like I could have something completely separate fairly easily, but that might be too much duplication18:00
james_wyou wouldn't want this to be tested against different transports and things though, would you?18:01
Nyadhi. I'm reading the bazaar in 5min guide, I'm trying to push to a branch on launchpad.net  so $ bzr push bzr+ssh://joseph.werd@bazaar.launchpad.net/~vorkasm-project/vorkasm/vorkasm-v1.0.418:03
Nyadbut it's not working18:04
james_whi Nyad18:04
james_wdo you get an error?18:04
beunojames_w, no, I think we can safely assume that if it works with one, it works with all. We just want to test it auto-commits18:04
Nyadjames_w: bzr: ERROR: Not a branch: "/home/jason/".18:05
james_wsure, I'll put something together18:05
james_wNyad: are you in "/home/jason/" when you run the command?18:06
beunoNyad, you have to push from the dir that has the branch18:06
Nyadoh, woops18:07
Nyadn18:09
NyadThe authenticity of host 'bazaar.launchpad.net (91.189.94.254)' can't be established.  I have created an ssh key pair18:09
james_wNyad: if you "ssh bazaar.launchpad.net" you will get a chance to verify the key18:10
rockyi gotta say i'm not really sure the point of doing an init-repo when if i merely do a checkout or branch it doesn't need it18:10
luksrocky: speed and disk space are two reasons for doing it18:11
asabilrocky: init-repo is an optimization for making branching faster18:11
Nyadjames_w: I got the same error when I ran that18:11
james_wNyad: it doesn't let you accept the key?18:11
rockyoh ok18:11
luksrocky: without the shared repository, it has to copy all the data18:12
james_wrocky: if you only ever have one branch then it's no win, but once you have more than one it is18:12
asabilrocky: let's say that you have a branch "A", that has 3 revisions (1, 2, 3)18:12
luksrocky: but if you branch in a shared repository, nothing is copied18:12
james_wrocky: and if there's any chance of having more than one then I suggest you create one, it will save you effort later18:12
asabilrocky: if you create branch "B" from "A", outside of a repo, then you will copy all the 3 revisions18:12
Nyadjames_w: it says "Are you sure you want to continue connecting (yes/no)?    "18:12
asabilrocky: if "A" was in a repo, then the revisions were actually stored in the repo, and "A" only contained "pointers" to them18:13
james_wNyad: ah, you can then say "yes", and it will let you connect from now on18:13
asabilso creating a branch "B" would be just a matter of pointing to the same revisions, instead of copying them18:13
=== davi__ is now known as davi_
grahalfor testing, i was tried to make my Documents directory into a bazaar repo18:24
grahalit's about 600mb in size18:24
grahallot's o binaries as you may expect18:24
Nyadjames_w: ok that works, thanks18:24
grahalwhen I ran "bzr add .", bzr ran for a while and I noticed it started eating up memory18:25
grahalcontinuous scaling, 60% in a 1GB machine18:25
grahaland growing18:25
grahalis that expected? is the use case not supported at all?18:25
korpiosAFAIK bzr's optimized for source code much moreso than binary data18:25
korpiosI wouldn't say that use case is ignored, just that it's definitely not ideal right now18:26
grahalit's a curious use case, at least to consider any sort of design decision when dealing with "add" operation18:27
grahalcertainly not top priority I believe18:27
korpiosfor binary data, a more basic backup system is probably better (e.g., Apple's Time Machine)18:29
grahalyeah... this test idea came to mind mind because I read some time ago the idea to do something a like apple's time machine in ubuntu18:30
grahaland bzr was being considered as the backend18:30
grahalgoogle summer of code stuff18:30
grahalnot sure what happened with such idea18:30
james_whmm, maybe hooks aren't run in test code18:33
beunojames_w, maybe you can steal code from lifeless' bzr-search18:33
beunohe uses hooks and has tests18:33
james_wah, nice, I was trying to think of a plugin with tests18:33
james_wer, I mean hooks :-)18:33
james_wthanks18:33
beuno:)18:35
james_wbut it doesn't test the hooks it seems18:37
beunoah, bad lifeless!18:37
james_waha, bzr-dbus to the rescue18:40
jamgrahal: was this during "bzr add" or "bzr commit"18:40
jamIf it was during "bzr add" that would be *quite* unexpected18:40
jamcommit wouldn't be as surprising18:40
grahalsorry18:40
grahalduring commit18:40
grahalyou are right18:41
jamso... our specific goal is to hold < 3 copies of any text in memory at a given time18:41
jam(merge needs 3 copies to compare against)18:41
jamI have the feeling we are missing something trivial in commit18:41
jamwhich is causing us to hang on to old texts that we aren't using anymore18:41
jambut I haven't personally spent the time profiling it, etc.18:42
jam(It is hard to profile memory consumption in python)18:42
james_wbeuno: so, they are disabled, which makes sense. I can add a check that the hook is registered, and then tests triggering it manually, would that satisfy you?18:43
=== davi_ is now known as davi
beunojames_w, yeah, absolutely18:45
beunowe can also add a message notifying the user it's auto-uploading18:45
beunoor spit it out to ~/.bzr.log18:46
james_wyup18:46
beunojust so we know when it's auto-uploading18:46
james_wand thankyou again for your contributions to loggerhead, I'm using it now and it's so much better18:48
beunojames_w, I've really been enjoying it, so my pleasure  :)18:50
gerelhey, can i maintain a working-tree on the main branch server such that it's updated when I commit/push to it ?18:56
beunogerel, push-and-update if you want bzr data18:57
beunoand bzr-upload if you just want the working tree18:57
gerelhmm18:57
gereli'll ty18:57
gereltry18:57
beunoand if you want for bzr-upload to upload automatically on commit, wait for a while for james_w's patch to land  :)18:58
james_wbeuno: it's working :-)18:58
gerelbeuno: when you say push-and-update you mean, bzr push, bzr update from my local working-tree ?18:58
james_wjust got to finish the tests and add --auto18:58
beunogerel, no, it's a plugin18:58
gerelagggh18:59
beunojames_w, rockin'18:59
gerelbeuno: it's weird since i tested it and when the repo is on my local disk it actually copies the working-tree18:59
gerelbeuno: but when the repo is remote, it doesn't18:59
beunogerel, right, locally, it auto-updates18:59
beunoremotely, it doesn't19:00
gerelpty19:00
beunothat's the intended behaviour19:00
gerelpity19:00
beunoyou can't guarantee remote updates, since you need bzr on the other side19:00
beunose we have plugins that work around it19:00
beunowhat's the problem with using a plugin?19:00
gerelah, nothing, but im kinda tired doing apt-get :-P19:01
beunogerel, well, it isn't packaged, so you don't have to worry about that19:01
* beuno ducks19:01
gerelbeuno: the other workaroun is issuing a checkout on the remote host19:01
gerelbeuno: hah forget it19:02
beunogerel, bzr co lp:bzr-push-and-update ~/.bazaar/plugins/pushandupdate19:02
beunoshould have it running in a minute19:02
gerelnice19:02
gerelbeuno: in short, the --no-trees is useful only when doing local repos19:04
beunogerel, right19:04
evarlasthello, I'm getting a LockFileEx error on win32 trying to branch from a network mapped drive.19:04
gerelbeuno: otherwise it's automatically used19:04
beunoevarlast, can you pastebin the full error?19:04
beuno!pastebin19:05
ubottupastebin is a service to post multiple-lined texts so you don't flood the channel. The Ubuntu pastebin is at http://paste.ubuntu.com (make sure you give us the URL for your paste - see also the channel topic)19:05
jamlifeless: when you wake up, can you check the PQM logs? I seem to have some patches that pass the test suite, but then "die". I don't get a success or failure message, and I don't see a commit going to the bazaar-commits mailing list19:24
jamI checked to see that the tests really were running19:24
jamand when I submitted one with an error, I got a failure right away19:25
jamit seems something bad is happening after "make check" succeeds19:25
jamOdd_Bloke: ^^ You *might* want to see if there is something to be fixed here. But you'll probably want to wait for a better bug report19:25
Odd_Blokejam: poolie was having issues as well.19:29
Odd_BlokeBut, yeah, I'll wait for a better bug report if one is needed.19:29
jamjames_w: You need to send your email to the list, I didn't CC so you didn't look as foolish :)19:42
james_wjam: well it's twice as bad now :-)19:43
=== abadger19991 is now known as abadger1999
james_wbeuno: lp:~james-w/bzr-upload/auto_upload/ should be more to your liking19:58
* beuno pulls20:00
beunojames_w, you rock, merging now20:04
james_wcool, thanks20:04
james_wbeuno: I'm gonna spend some time selling bzr and bzr-upload to my web developer friend soon, I think she's going to love it. It does make a pretty easy and interesting way of deploying code.20:06
james_wI'll make sure to pass on any suggestions that she has20:06
beunojames_w, yay!  more users.  Any feedback will be very welcome20:07
james_wand she's got a friend who does presentations and training on how to do this with svn, so hopefully I can get her to switch as well20:08
jamjames_w: Is there no feature that can tell if hardlinks are supported?20:12
jamOr does the "create_hardlink" just fall back to create_file if it can't create a hard link?20:13
james_wjam: oh yeah, I thought about that as I was writing the test, but forgot to revisit it20:13
james_wbut yes, there is a feature20:14
james_wI'd fix it, but I'm just heading out the door20:14
ahasenackguys, https://launchpad.net/~bzr/+archive is missing hardy 1.5.0 packages20:14
james_wany other review comments that I could fold in would be appreciated20:14
ahasenackfor bzr (bzrtools is there)20:14
james_whey ahasenack20:14
james_wI heard tell they were removed20:15
jamjames_w: "If self.tree_kind(trans_id) != self.final_kind(trans_id)" is that true when the target is being deleted?20:15
jamOr does that just raise "NoSuchFile" ?20:15
ahasenackI know 1.6b3 was removed from there20:15
ahasenackhmm20:15
james_wthat will be it then, poolie should probably re-upload 1.5 with a "really" version number20:15
jamI'm also a *little* concerned about raising + catching an exception in an inner loop when there maybe 1000s of content changes due to a merge20:15
ahasenackthe hardy one is in state "superseeded"20:15
ahasenack bzr - 1.5.0-1~bazaar1~hardy1     beuno   2008-05-17  Superseded  Hardy20:16
james_wjam: yeah, I tried to minimise the number of times it would be called, but it's not ideal20:16
ahasenackprobably because 1.6b3 was uploaded for hardy, then removed but 1.5.0 was not reuploaded20:16
ahasenackok20:16
james_wjam: I don't know if I could avoid the exception20:16
jamjames_w: well, this is "_apply_removals" right?20:17
jamSo things which are actually deleted will raise the exception20:17
james_wjam: but yes, I think that raises NoSuchFile, and we're not building up and exact list of kind changes, just collecting all the ones we can to make sure they get an inventory_delta entry20:17
james_wyeah, it's _apply_removals20:18
jamjames_w: well, it seems abentley asked for this20:18
jambut to be honest20:18
jamit doesn't seem to fit the way everything else is tracked20:18
jamspecifically, apply_insertions20:18
jamdoes a lot of20:18
jam"if trans_id in self.XXX"20:18
jamand now we are creating a separate local variable20:18
james_wyeah20:19
james_wI think actual removals go through a different code path, only modifications hit this one20:19
james_wI think I understood the other approach more, I'd like to know abentley's reasoning20:20
james_wmy guess was keeping state is more likely to be buggy20:20
jamjames_w: well, his claim was that the information is already somewhere20:20
jamso it would lead to redundancies20:20
abentleyjames_w: I thought I explained.  It's redundant with other data we have.20:20
jambut where is it storeed20:20
jam?20:20
james_whi abentley20:21
abentleyjam: TT._new_contents20:21
jamabentley: so is it just as simple as:20:21
jamor trans_id in self._new_contents ?20:21
jamadding that to the "apply_insertions" if statement?20:21
abentleyjam: Well, you could.  That's a bit overkill.20:22
jamabentley: then it doesn't sound redundant to have a *smaller* list20:22
abentleyjam: I would suggest comparing to the tree kind.20:22
jam list / set20:22
abentleyjam: we already know the state in the old tree.  We already know what files are getting new contents.20:23
jamabentley: do we know what files are becoming directories?20:23
jamaka, losing content20:23
jamand getting a new kind20:23
abentleyjam: yes.20:23
jamas that was the bug here20:23
jamthat it wasn't actually creating an inventory entry for it20:23
jaman inventory *delta* entry20:23
abentleyjam: _new_contents lists all files, symlinks and directories that are getting new contents on disk.20:24
jamabentley: but the idea is that you don't need an inventory entry just for a content update?20:25
jamSince you pass it the full Inventory Entry, I would have thought that you would20:25
jam(since the sha1sum / size / etc are changing)20:25
jamAnd it *might* be a solution for the "commit doesn't update sha1sum" bug we are having20:25
jam(I could certainly be conflating things, though)20:26
abentleyjam: This is working tree state that's being updated, so the sha1sum and size are not expected to be accurate.20:26
abentleygotta eat.20:29
rockyjelmer: i'm seeing extreme slowness when committing to a svn checkout using bzr-svn ... is that normal?20:29
jelmerrocky, hi20:29
james_wright, I'm off, I'll work on this on Monday probably, so any review comments will be appreciated.20:29
jelmerrocky, first time may be a bit slow20:29
rockyoh ok20:29
evarlasthttp://paste.ubuntu.com/33097/20:37
evarlastLockFileEx not supported in vista client and XP server with server being a USB device shared.20:38
jamevarlast: sounds like you are running into a problem with accessing the working tree when doing 'bzr branch'20:38
jamUnfortunately the new code path tries to copy file contents from a WT if it can find one20:38
jambecause it is often faster than reading it out of the repo20:38
jamand we didn't add a way to say "just branch and ignore the WT"20:38
jamabentley: ^^ Thoughts?20:38
jam(abentley is currently eating, but he is the one that implemented the WT processing)20:39
jamevarlast: if you are just looking to "get going" you can do this trivial hack20:39
jamcd other20:39
jammv .bzr/checkout .bzr/checkout-hidden20:39
jamevarlast: then 'bzr branch' will work20:39
jamand you can "mv .bzr/checkout-hidden .bzr/checkout" later.20:39
evarlastreally?20:41
evarlasti'll try that, thanks.20:42
jamevarlast: we only use LockFileEx on working trees20:42
evarlastah, and this fakes being a non-working tree.20:43
evarlastvery cool. thanks.20:43
n[ate]vwQuick ?: bzr status on both my laptop and desktop show no uncommited changes. Is there a way, though, to check which revision both are on?20:51
beunon[ate]vw, bzr revno20:52
jamn[ate]vw: 'bzr missing' between them20:52
jambzr log -r -120:52
jambzr revision-info20:52
jambzr revno20:52
jamn[ate]vw: need any more? :)20:52
n[ate]vwawesome, revno was exactly the info I didn't know how to get20:52
n[ate]vwmissing looks handy too, but takes almost as long as a pull so not sure how much I'll use it20:53
n[ate]vwthanks!20:53
jamn[ate]vw: what version of bzr?21:04
jamn[ate]vw: (just to mention that 'bzr missing' is much faster in 1.6)21:05
n[ate]vw1.3.121:05
jamwell, soon-to-be-released 1.6 :)21:05
n[ate]vwjam: I should upgrade, I'm sure there's other good stuff too21:05
jamso you may want to revisit it21:05
n[ate]vwshelve is still a separate plugin, though, right?21:06
jamn[ate]vw: shelve is in 'bzrtools'21:09
jammostly because it relies on "patch" being an available program21:09
jamand it fails for non-text files21:10
n[ate]vwah, ok21:10
n[ate]vwkeep realizing I haven't gotten around to installing it on the occasional occasions I need it21:10
Demostheneswith my rcs files i used the header keywords to put the RCS version # in my file header, does BZR have a similar feature?21:19
Peng_Demosthenes: It's in progress. http://bazaar-vcs.org/KeywordExpansion21:30
jamDemosthenes: though it may not be what you really want: http://jam-bazaar.blogspot.com/2008/07/last-week-in-bazaar.html21:33
pickscrapeCould anyone point me at a decent example of how to add a pre-commit hook?22:24
pickscrapeI found one but it used a method that was apparently deprecated in 1.522:24
jampickscrape: what was the deprecated function? (I'm guessing install_hook versus install_named_hook)22:42
pickscrapejam: yes, thanks. I found that myself by looking at the release notes22:43
jamthat should be the only *major* difference, which just means passing in a name at the same time22:43
jamrather than installing it22:43
jamand then naming it as 2 separate steps22:43
pickscrapeI think I have everything I need now: just need to read up on TreeDelta and RevisionTree which I haven't needed to touch so far :)22:44
lifelesshi jam will you be wowing ?22:57
lifelessjam: ^23:04
jamlifeless: probably not, family time tonight23:37
lifelessjam: kk enjoy23:50

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