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

=== sdboyer is now known as crapstain
=== crapstain is now known as sdboyer
NET||abusehey guys.. i tried to branch off a repo on one of my web servers, bzr+ssh   it got to 124MB, still says 1171KB/s but it's stuck, for about the last 15 minutes.01:17
NET||abusethere's only 10 MB left in the repo i believe01:18
NET||abuseis there anything i can do to cancel and recover the branch operation?01:18
spivNET||abuse: unfortunately bzr can't yet resume interrupted fetches01:24
spivNET||abuse: strange that it got stuck, though01:25
NET||abuseyeh, been waiting a while.01:25
NET||abusestill stuck :(01:25
NET||abusecrap.. it's a big fetch, 135 MB01:25
spivI don't suppose there's any errors in ~/.bzr.log on the server?01:26
NET||abuseright, i could look.01:26
NET||abuseyep, error01:27
spivIf you do need to restart, perhaps try "bzr branch -r 500 ...", then "bzr pull -r 1000", "bzr pull -r 1500", etc to do it in stages.01:27
spivCould you pastebin it?01:27
NET||abuseFile "/usr/lib/python2.4/site-packages/bzrlib/osutils.py", line 1810, in until_no_eintr  return f(*a, **kw)  IOError: [Errno 32] Broken pipe01:27
spivHow strange.  Could you paste the full traceback in http://pastebin.com/ ?01:29
spivBut that snippet implies that the connection was lost, at least as far as the server is concerned.01:29
jfroy|workjelmer: ping01:41
NET||abusearrg.01:52
NET||abusetimeout?01:52
spivNET||abuse: yes, you dropped of IRC due to a timeout01:53
spivNET||abuse: which I suppose is consistent with the bzr stream failing due to a network drop out...01:53
NET||abuseoh well..01:53
NET||abuse:) maybe my net connection is dorky01:53
spivNET||abuse: so I'd grab the branch in smaller chunks01:53
jelmerjfroy|work, hi01:53
* spiv -> lunch01:53
NET||abusewell, any ideas from my pastbin.01:53
NET||abusesmaller chunks? how do i do that?01:54
jfroy|workjelmer: I have a rather serious problem01:54
spivNET||abuse: didn't get your pastebin URL01:54
NET||abuseahhhh01:54
spiv< spiv> If you do need to restart, perhaps try "bzr branch -r 500 ...", then "bzr pull -r 1000", "bzr pull -r 1500", etc to do it in stages.01:54
NET||abusehttp://pastebin.com/m64de9e3101:54
jfroy|workjelmer: there was some... evil messing around with our subversion repository01:54
NET||abusei posted when seemingly my irc had dropped, there was no indication for a while.01:54
spivNET||abuse: also, if your branch isn't in 2a format yet, consider upgrading, it'll be smaller.01:54
pooliejml: now would be good, if you've lunched01:55
jfroy|workI described what was done in https://bugs.launchpad.net/subvertpy/+bug/49728001:55
ubottuUbuntu bug 497280 in subvertpy "Assertion hit when pushing merge commit to remote svn repository in parse_mergeinfo_property" [Undecided,New]01:55
NET||abuseit is 2a already01:55
spivNET||abuse: ok01:55
jfroy|worknow, beyond that kink, which I worked around, I thought everything was fine.01:55
spivNET||abuse: hmm, that doesn't look like the whole traceback, just 3 frames, but I think given that you're having network issues it's safe to assume it's not bzr's fault.01:55
jfroy|workBut, a co-worker just committed a revision to our trunk (nested inside our project directory in our new repository)01:55
jfroy|workand bzr won't pull the changes introduced by that revision01:56
spivNET||abuse: thanks for pasting that though01:56
* spiv -> really lunch this time01:56
jfroy|workworse, it allowed me to push 2 new revisions after that revision without any complaint -- normally, it should have stopped, telling me the branches had diverged01:56
jfroy|workif you have a bit of time, I'd like to try to figure out what the heck is going on01:57
jelmerjfroy|work, did your two revisions merge any of his changes?01:58
jfroy|workno01:58
jfroy|workthey were completely unrelated sets of changes01:58
jfroy|workwell, at least I didn't intentionally do a merge01:58
jelmercan you check if those revisions have any other parents?01:59
NET||abusewell, there's nothing i can do other than try fetch again.01:59
jelmeryou didn't push with --overwrite or anything like that?01:59
jfroy|workbut, if you read the bug I filed on subvertpy, it's possible bzr-svn is getting confused by merge properties or even bzr-svn properties that are completely bogus01:59
jfroy|worknope, I did a commit from a bound branch01:59
jfroy|workor, I should say, properties that have been made bogus02:00
jfroy|workand OK, I do I check for parents?02:00
jelmerjfroy|work, bzr log --show-ids should tell you02:02
jfroy|workthe subversion revision in question does not appear in the log02:03
jfroy|workyep, it's as if it was being skipped entirely02:04
jfroy|workthe revision that should have the missing revision as its parent instead points to the one before02:04
jelmerjfroy|work, that's correct, as that's the order in which you committed them locally02:09
jfroy|workwell yes, but there's a whole in there02:10
jelmerso I wonder why it didn't complain about diverged branches - you're sure you didn't push with --overwrite?02:10
jfroy|workpretty sure...02:10
jfroy|workunless something can turn that option on...02:11
jfroy|workit wasn't even a push, it was a commit in a bound branch02:11
jelmerjfroy|work: might be a bug in the commit code in bzr-svn in that case, can you file a bug?02:16
jelmerjfroy|work, I've responded to the other bug report in subvertpy, which is probably unrelated02:16
jfroy|worksure, although I'm not sure I can provide much more information than I have.02:16
jfroy|workYes, it's probably unrelated02:16
jfroy|workAlso, is there a way I can fix the situation?02:17
jelmeryou can cherrypick the changes from the missing revision02:17
jfroy|workApply a diff manually between a svn checkout and a bzr checkout and push --overwrite, at least to pick up the missing changes>02:17
jelmercommit those and then push them02:17
jfroy|work*?02:17
jelmerI need to get some sleep, let's move this discussion to the bug report02:18
jelmersorry02:18
jfroy|workOK02:18
jfroy|workno worries at all02:18
jfroy|workI appreciate you taking some time at all.02:18
* mwhudson randomly wonders how long away realistically being able to disable vfs operations on the smart server is03:57
spivmwhudson: ages, probably, given that it doesn't seem particularly relevant to udd goals04:05
mwhudsonspiv: yeah, fair enough04:06
lifelessronny: hi, I'm back04:06
mwhudsonspiv: if it was a priority, do you have a sense how long it would take?04:07
mwhudson/ how much work it would be?04:07
lifelessmwhudson: I think you're asking the wrong question :)04:07
mwhudsonlifeless: i find it hard to believe you know why i'm asking04:08
lifelessmwhudson: I think the question you want to ask is 'how many operations do people do, that need the VFS today, which we would have to support to be willing to disable the VFS'04:08
lifelessmwhudson: I've got no idea why you are asking04:08
lifelessbut we can disable the VFS today, just at high impact.04:08
mwhudsonlifeless: yes, ok, that's a more answerable question04:09
lifelessmwhudson: also you have a question in /msg04:09
lifelessmwhudson: one implication of framing the question about VFS as I have, is that you can clearly see that lp might reach a different answer than (say) savannah04:10
mwhudsonyeah04:11
lifelessor, more importantly, than core.04:12
lifelessOne useful thing would be to get a % use of VFS today.04:12
lifelessI suspect its 60-70%04:12
lifeless(connections which invoke vfs at all), not % of operations on a connection.04:12
mwhudsonyeah, i guess we could measure it04:30
mwhudsonthough it's probably not so interesting, i mean i would guess 90% of connections just do a fetch in one direction or the other04:31
lifelessso if we want to push for vfs free lp04:31
lifelessthen we should measure it04:31
lifelessif we basically do-not-care04:31
lifelessthen its all moot :P04:32
mwhudsoni guess it's in the do-not-really-care bucket for now, as spiv says04:32
spivmwhudson: if you do start to really care, I'm sure you'll let us know :)04:33
mwhudson:-)04:35
StevenKIsn't there a bzr command that will show me pending merges? I'd like to confirm it before I commit and I'm having a temporary brain-freeze.04:47
Kamping_Kaiserstatus? or am i missing the point?04:48
Kamping_Kaiser'arvo, btw.04:49
StevenKHey!04:49
Kamping_Kaiser:)04:49
StevenKst just shows me modified files. Perhaps because they were all conflicted.04:49
StevenKWell, all bar one.04:49
spivThen you have no pending merges.04:50
AnAntHello, what are valid bzr URLs (other than lp:// & bzr+ssh://) ?04:50
spivUnless you've done "bzr alias st='status --no-pending'" ;)04:50
spivAnAnt: bzr help urlspec04:51
AnAntthanks04:51
StevenKspiv: I ran bzr merge, resolved the bunch of conflicts, but I'd expect it to still say there is a pending merge04:51
spiv(which will include url schemes supported by plugins, if any)04:51
spivStevenK: you probably did a cherrypick then04:52
StevenKspiv: Yeah, it was only one revision04:52
spivRight.04:52
StevenKspiv: That isn't a real merge per-se?04:52
spivWell, it's real, but bzr can't record it :)04:52
spivbzr represents merges as extra parents for the revision.04:52
spivSo it has no way to record "X was merged but not X-1"04:54
spivIt's simply "X was merged [and so implicitly all of its ancestors too]", or nothing.04:55
spivWe'd like to support that better, but it hasn't quite made it to the top of our todo list.04:55
lifelesspoolie: I wonder if you could mail me your APN details from your magic04:58
AnAntis there a way to check wether a bzr URL is valid or not ?04:58
spivAnAnt: valid for what purpose?04:58
poolielifeless: what is an apn?04:59
AnAntspiv: ie. the URL is not wrong, for example, if I do bzr branch lp:foo/boo/zoo I would get this error: "bzr: ERROR: Invalid url supplied to transport: "lp:boo/foo/doo": No such project: boo"05:00
AnAntI want to check if the URL is valid or not without actually doing a bzr branch05:00
lifelesspoolie: access point name05:00
lifelesspoolie: ~= to essid05:00
AnAntI don't see a dry-run option for bzr branch05:01
spivAnAnt: Well, if you want to check if there's a branch there without branching, you can do "bzr info URL" or even just "bzr revno", for example.05:01
AnAntthanks05:01
lifelesspoolie: settings -> wireless -> mobile networks, there should be a list of apns there, I'd like the settings for the one that you're using, which will be what vodafone shipped05:03
poolieok05:04
poolieon phone now05:04
lifelessno rush05:04
lifelessI'm trying to set up tethering to my phone05:04
AnAntspiv: thanks again, that helped me to fix something in git-bzr05:12
spivAnAnt: you're welcome05:13
=== abentley1 is now known as abentley
vilahi all07:05
jmloh right.07:37
jmlI'm still trying to land this branch.07:37
pooliehi vila07:50
poolieand good night07:50
poolieand send a pp report :)07:50
vila:)07:50
pooliei booked trains btw, the details are on the wiki07:51
poolieit was quite cheap07:51
pooliehave a good day and a good trip07:51
vilapoolie: thanks and thanks for updating the patch pilot page !07:51
jmlvila, can you please help me land this patch?08:10
jmlI get the error: merge http://bazaar.launchpad.net/~jml/bzr/lp-login-oauth-2 http://bazaar-vcs.org/bzr/bzr.dev08:11
jmlCommand failed!08:11
jmlAll lines of log output:Sender not authorised to commit to branch http://bazaar-vcs.org/bzr/bzr.dev08:11
Pengjml: Try the new http://bazaar.lp URL.08:11
vilajml: one sec, but I think trying Peng suggestion is worth it08:12
jmlPeng: which one is that?08:12
vilahttp://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev or lp:bzr :)08:12
* jml tries lp:bzr first08:13
jmlvila, what do you have in your locations.conf?08:16
* vila was well known for hanging pqm with lp urls :) 08:16
vilajml: I use branch.conf: http://paste.ubuntu.com/343725/08:17
vilarelevant part: http://paste.ubuntu.com/343726/08:18
jmlvila, that seems to be a bit better.08:18
vilajml: the change dated back to the switch from bazaar-vcs.org to lp for hosting bzr.dev08:19
vilas/for hosting/to host/ ?08:19
jmlthe first one is correct.08:19
jmlvila, I see that HACKING.txt hasn't been updated then.08:20
vilayes, lifeless mentioned it yesterday too, you may have missed that08:21
jmlahh, I did miss that.08:23
johnf1vila: I sent my contributor agreement through months ago. CCd poolie. Where is the best place to resend it?09:37
vilajohnf1: Just comment in the merge proposal, poolie will be the patch pilot next week so he will sort that out09:38
vilajohnf1: sorry about that :-/09:39
johnf1no problems09:39
MvGGood morning!09:42
MvGI've released trac-bzr 0.3.0 today. Due to lack of testing, I've got to consider it of beta quality, so I'll be happy for all of you who use Trac to give it as much testing as possible.09:42
NET||abusehey guys.. i want to inspect older revisoins of one particular file, how can i do this easily?09:54
MvGNET||abuse: bzr cat, I'd say09:54
NET||abusehmm, ok09:54
spivNET||abuse: you might find the bzr-gtk or qbzr plugins handy, they give you commands like glog/qlog that let you explore history with a GUI.09:58
NET||abusenot a bad idea i suppose.09:59
NET||abuseany preference between qbzr or gtk?10:00
spivNET||abuse: qbzr is probably a little more polished at this point10:02
NET||abusejust tried to install...10:03
NET||abuseno applications->programming item, no obvious terminal line command to run10:03
vilaNET||abuse: try  bzr help plugins/qbzr10:22
vilathen you most probably try 'bzr qlog' or 'bzr qblame FILE'10:22
NET||abusethat seems to do it.10:23
vilaerr, qannotate (qblame is an alias so it doesn't appear in that help)10:23
NET||abusewhat does the qannotate doe exactly?10:43
NET||abusethe qlog was great, i got to view the tree from the old revision... was able to open the file in question, i had a UTF-8/Latin10 character encoding problem. litereally the files own encoding type.10:44
Pengvila: What time zone are you in?10:54
vilaCET10:54
vilai.e. I will go to lunch soon :)10:54
PengOh, fun.10:55
PengHehe, I'm in -0500; it's 05:57 here right now. If only I had a sleep schedule...10:57
vilaPeng: Really ? Where are you ?10:58
NET||abusethat's just east coast US10:59
PengYep.11:00
vilacould have been canada or south america :)11:01
PengI'm in Florida, to be a bit more specific.11:02
* vila feeds the satellite Laser11:03
PengI think my LP map location is set semi-accurately.11:04
PengSo as long as the laser can take out an area, say, 30 miles wide, I think it will work.11:05
* vila tries11:06
vilaoops11:06
vilaPeng: your timezone says UTC though11:06
Pengvila: I like using UTC.11:07
vilaPeng: doesn't really help in that for visitors trying to reach you :-D11:07
* vila add 'case'11:08
Pengvila: Well, my usual sleep schedule is more like Australia anyway.11:08
vilagood, use that :)11:09
PengBut I like UTC. No Daylight Saving Time.11:09
PengHmm, using an Australian time zone is a completely insane idea that sounds totally fun.11:10
vilaPeng: yes, that's fine, I'm talking about your lp page, where I don't think *you* care much about what is displayed there, but *others* may. But that's your page in the end :)11:11
Pengvila: Ah. Does that setting influence times displayed on LP, though?11:11
vilaYou'll tell me :)11:12
Kamping_Kaiserwhy does bzr have >700KB of data transferred to do a 2 line commit? :/ Could this be a continuation of  the issues I was asking about earlier in the week?11:16
Kamping_Kaiseri shoul work out who i was talking before *checks logs*11:17
=== jelmer_ is now known as jelmer
Kamping_Kaiserah, vila .11:18
* vila search logs too11:18
vilaWhat is your remote server and what protocol do you use ?11:19
Kamping_Kaiseri should probably grill the savannah admins before i ask here more, i know they have issues at their end.11:19
vilaHa ! savannah, sftp11:20
Pengvila: I added a note to my LP page. :)11:21
vilaSo you may be doing a repack which requires downloading/uploading more than strictly the 2 lines commit11:21
Kamping_Kaiserfrom your reaction i take it sftp is not the fastest way to transfer data :)11:22
Kamping_Kaiseri note my other checkout pulls over http and pushes on sftp - strange but true.11:22
vilaKamping_Kaiser: .bzr.log should give hints11:22
vilaKamping_Kaiser: well, the smart server is supposed to be really smarter than the dumb servers11:22
PengSavannah runs such an old version of bzr that you're better off avoiding their smart server, if they have one.11:22
vilaIn particular it knows how to repack locally (or remotely, well, locally from its pov)11:23
vilaPeng: I don't think so, I'm pretty sure they use a backported 2.0.311:23
Pengvila: Oh, they do now? Thank goodness.11:23
vilaBut they don't have allow the use of it, Kamping_Kaiser ? Can you confirm that ?11:23
Pengvila: I had heard that they were going to stick with Debian Stable, which is 1.5 or something.11:23
* Peng shrugs.11:24
Kamping_Kaiservila: can't confirm what savannah runs sorry.11:24
lifelessPeng: backports11:24
vilaPeng: The change occurred recently (if it has), one or 2 weeks11:24
lifelessPeng: see the long thread on same11:24
Kamping_KaiserI've successfully avoided becoming responsable for savannah in any form *g*11:24
PengYeah, I stopped paying attention to that thread. :P11:25
PengThat's great to hear, though. Go Savannah! :11:25
Peng:)11:25
vilaKamping_Kaiser: I like the etymology of responsible: the one who can respond for :)11:25
Kamping_Kaiservila: hehe. the problem is, I tend to involve myself in projects deeper then i need ;) (I'm still a bzr _user_ thank goodness)11:26
vilaI think spiv and/or jam hacked a ping plugin that could help here but I don't remember the details...11:27
Kamping_Kaiserbzr log tells me 21.366  fetch up to rev {karl@kgoetz.id.au-20091218111320-8qya0xqtb74qzrfn}, so i'll guess thats the problem on that data transfering11:27
vilaKamping_Kaiser: context ? More than 1 commit ?11:28
Kamping_Kaiservila: i'll pastebin the log stanzas, just a tick11:28
Kamping_Kaiserhttp://paste.debian.net/54352/11:29
spivvila: lp:bzr-ping, usage simply 'bzr ping URL', it will report the smart server version at that URL11:29
spiv(or at least which version of bzr the smart server claims to be)11:30
vilaspiv: \o/11:30
vilaKamping_Kaiser: that doesn't tell me if there was more than 1 rev to push  :-/11:32
vilaBut that strongly remains me that we have a pending patch that give that kind of info for pull (at least the revno/revid *before* the pull), it would be nice to do the same for push11:33
Kamping_Kaiservila: afaik it was just one revision11:33
* vila breathes again, subunit/testtools/bzr working happily together again to provide --parallel=fork11:34
Kamping_Kaiserinteresting... bzr.log confirms 2009-11-22 was the last submission CIA got from me. i should track that problem down11:34
Kamping_Kaisersorry. getting distracted by my new data source :p11:34
vilaKamping_Kaiser: no simple explanation comes to mind then :-/ Do you observe that for every push ?11:34
Kamping_Kaiservila: the last half a dozen at least (they're the ones i remember).11:35
Kamping_Kaiservila: I suspect something in a newer version of bzr isn't playing happily with something in my install. cia disapeared enf of last month, and this slowlness issue, its definitely only been a month or so11:36
vilawhat bzr version are you using ?11:37
Kamping_Kaiser2.0.2-1~bpo50+111:37
vilawhere did you get that ?11:39
Kamping_Kaiserhttp://www.backports.org (directly from them, or via roberts backports repo)11:40
=== johnf1 is now known as johnf
vilaok, so that's an official 2.0.2 right ?11:41
vilahaaa bpo == backports ?11:42
Kamping_Kaiseryup11:42
vilak, excuse my English I'm French :) (And sorry for my president too :-/)11:42
Kamping_Kaiserno worries.11:43
Kamping_Kaiseri'll match and raise your president with my communications minister11:43
vilaKamping_Kaiser: where are you from ?11:45
Kamping_Kaiservila: Australia. http://www.abc.net.au/news/stories/2009/12/15/2772467.htm11:46
vilaKamping_Kaiser: bug #465517 may be a candidate, but I doubt it11:46
ubottuLaunchpad bug 465517 in bzr "'bzr push' copies the entire repository if there is a BzrDir but not a Branch" [High,In progress] https://launchpad.net/bugs/46551711:46
vilaKamping_Kaiser: Oh my, you too have internet censors for you own godd ^^11:47
Kamping_Kaisernot the same - whole repo isn't copied, but could be related (as is the way with software)11:47
Kamping_Kaiservila: I feel safer already ;O11:47
vilaKamping_Kaiser: you repo is big ?11:48
vilaKamping_Kaiser: your repo is big ?11:48
vilaKamping_Kaiser: do you an url where I can branch from ?11:48
Kamping_Kaiservila: 88 mb. hang on for the uri11:49
Kamping_Kaiserbzr branch http://bzr.savannah.nongnu.org/r/gnewsense/builder should do the job (I assume you don't have a savannah login :))11:49
vilaKamping_Kaiser: Oh I should have one.... but where :D11:50
Kamping_Kaiserhehehe11:50
Kamping_Kaiserhttps://savannah.nongnu.org/bzr/?group=gnewsense ftr, but i doubt you'll need it11:51
vilaKamping_Kaiser: ok, so the repository is currrently quite fragmented 32 packs in http://bzr.savannah.gnu.org/r/gnewsense/.bzr/repository/packs/ so we may need to access the corresponding indices which in turn should not be quite good for you if you have high latency to savannah11:55
vilawhat is your ping time there ?11:56
Kamping_Kaiservila: 324ms11:56
vilaagain, the smart server can help a lot here since all the indices are local from its pov11:56
vilaso if you can afford to issue 'bzr pack :push' and try a new push after that you may get far better results11:58
Kamping_Kaiservila: will all checkouts be this fragmented, or just mine?11:58
vilathe fragmentation is natural but... geee, I wish I had an url for that explanation...11:59
vilaevery 10 commits a bigger pack file is created, every 100 an even bigger with the 10 bigs, etc11:59
vilahttp://bzr.savannah.gnu.org/r/gnewsense/.bzr/repository/packs/?C=S;O=A12:00
Kamping_Kaiserhm, ok. so is this an 'email everyone suggesting they repack' moment, or a 'oh good, something new learned'? from what you say i assume only people with a reasonable number of commits will be affected to start with12:00
vilaI suspect the high latency is really the most proeminent problem here and only the smart server can address that12:01
vilabzr pack *should not* be needed under normal circumstances, I'm asking here to see if it changes the behaviour you're seeing *right* now12:02
vilaIf you look at the last url I pasted you can see that your last commit is really small, so bzr didn't upload a lot, I'm trying to roughly evaluate if the time can be due to a lot of downloads instead, hence the proposal12:02
Kamping_Kaiserok. its repacked, and pushing. :)12:03
vilaBut that url is weird too because it seems to show a weird distribution of sizes...12:04
vilaStill the same, are you sure you packed the remote one and not the local one ?12:04
Kamping_Kaiserincase its relevant, the original repo was svn, it got bzr-svned, then commited to, then upgraded to some format, then commited to, then upgraded again, and commited to again12:05
Kamping_Kaiservila: its still uploading.12:05
Kamping_Kaiser[########/           ]   7920KB     1KB/s | repacking chk:chk node 9760/4792412:05
vilarepacking, here we go12:05
vilaright, so that may explain the weird distribution, can you put dates on the events above that we can relate the pack dates ?12:07
Kamping_Kaisershould be able to, it'll involve some logs diving though, so could take a min12:08
=== mrevell is now known as mrevell-lunch
vilaKamping_Kaiser: looking at http://bzr.savannah.gnu.org/r/gnewsense/.bzr/repository/upload/ progress, I think I can leave you there and be back after lunch12:11
Kamping_Kaiserhehe. most likely. i'm going nowhere.12:11
vilaKamping_Kaiser: I'll be back in ~< 1h12:12
Kamping_Kaiserenjoy lunch :)12:12
vilano no, already 6.6M uploaded, don't stop it !12:12
Kamping_Kaiser26000KB to upload 6.6mb. ah well. repacking ftw ;)12:12
vilawow, huger spike suddenly 11M....12:12
vilano, your repo is far bugger than 6M !12:13
vilamore like 65M roughly12:13
vilas/bugger/bigger/ damn keyboard12:13
=== vila is now known as vila-lunch
Kamping_Kaisernm. i'll dig those logs, see you later.12:14
bialixMvG: ping12:18
MvGbialix: pong12:18
bialixcongrat on new trac-bzr release12:18
bialixhave a question12:18
bialixdoes trunk supposed to be used only with trac 0.11? or?12:19
bialixMvG: ^12:19
MvGbialix: No, so far trunk and trac-0.10 are equal.12:20
bialixoh, that's great12:20
MvGI just want to give devs the option to track trac-0.10 and be ensured that their setups won't break.12:20
MvGAnd I had supposed I'd break compatibility before releasing 0.3.0, but it turns out there was no pressing need to yet.12:20
* MvG is AFK for a minute.12:21
bialixthanks for the info12:21
bialixMvG: did you send announcement to bazaar-announce or main bzr ML?12:22
bialixwhen you'll have a chance, please do :-)12:23
MvGOh, thanks for the reminder, will try to do so if I find the time...12:26
MvGbialix: btw: caching scheduled as main goal for 0.4: https://blueprints.launchpad.net/trac-bzr/+spec/caching12:27
bialix\o/12:27
* MvG is AFK for a while longer now.12:27
Kamping_Kaiservila-lunch: this should give you some idea. http://paste.debian.net/54356/ not brilliantly accurate, hope its enough (all times GMT+9.5 or +10.5)12:31
=== mrevell-lunch is now known as mrevell
CokeHello! I'm using sftp to upload changes to my main repos, it says I'm uploading using 1KB/s. At the same time, I can upload files using sftp at several MB/s. Why is Bazaar so slow?13:09
CokeRight now bazaar is about 100-200 times slower than svn13:10
Coke(for checking in and updating)13:10
Kamping_KaiserCoke: hm... hang around. i have the same slow sftp upload issue.13:11
=== vila-lunch is now known as vila
Kamping_Kaisersomeone was helping me. perhaps he'll come back from ....13:11
Kamping_Kaiserlunch ;O13:11
vilaKamping_Kaiser: wow, the restaurant was crowded...13:11
vilabut still < 1h :-D13:11
CokeKamping_Kaiser: I've had this problem forever13:11
Kamping_Kaiser;D13:11
Kamping_KaiserCoke: i haven't had it that long - its only existed in my lifetime for example :D13:12
vilaCoke: What `bzr version`, what repository format `bzr info` ?13:12
Coke2.0.113:12
Coke pack-0.9213:12
vilaKamping_Kaiser: looks like your repo is packed now13:12
vilaCoke: upgrading to 2a should make a significant difference, using a smart server (bzr+ssh: instead of sftp:) even more13:13
Kamping_Kaiservila: yes, it is. i pasted you a pastebin link giving some rough info you asked about13:13
Cokevila: I'm not interrested in changing the setup13:13
CokeIf anything I'll just revert to svn13:13
Cokeor upgrade bzr13:13
CokeWhy is it so slow?13:14
Cokesocket.write(data, 1024); sleep(1000) ???13:15
vilaCoke: Good catch, patches welcome !13:15
Cokevila: I'm not really sure how you can get down to 1KB/s without doing above code13:15
vilaCoke: If you don't want to use the smart server you can still upgrade your repository to the 2a format13:16
Cokesftp is pretty smart13:16
CokeKamping_Kaiser: did you solve it by upgrading?13:18
vilaKamping_Kaiser: Nothing suspicious in your log, bzr upgrade --2a should end with an automatic repack so the distribution I oberved before has no good explanation. Is that repository shared with other branches or projects where some commits may have resulted in pack files in the 10MB range ?13:19
vilaKamping_Kaiser: more importantly what happens *now* if you push ?13:19
Kamping_Kaiservila: shared at the server end? I think so. (I didn't set it up). I doubt theres been any 10mb commits to it, but I can't say i've kept very close tabs on it.13:20
vilaCoke: sftp is not "smart" enough because it just provides us with a remote file system, when bzr wants to merge several pack files into a bigger one, it sill has to download the pack files and then upload the resulting one13:21
Cokevila: ok, I'll be honest, I dont understand how the protocol works13:22
Cokevila: but here's what I do know; only bazaar manage to turn my 24MB line into a 9k modem speed13:22
vilaCoke: The "smart" server can do that locally and don't have to use any bandwith for that13:22
Cokevila: sftp in itself does not13:22
Cokevila: but I have 24MB!13:22
CokeI shouldn't have to worry about bandwidth13:22
vilaCoke: what is your latency ?13:22
Cokearound 30ms13:23
vilaAre your repositories/branches used shared with others ?13:23
Cokeno13:23
Cokeand it doesnt matter13:23
Coke1KB/s is just not acceptable after the introduction of 56k modems13:24
Kamping_Kaiservila: its still "fetching revisions: inserting stream". is this a function of sftp? :/13:24
Kamping_Kaiservila: it seems to be faster though, for the small commit i made to test13:24
vilaKamping_Kaiser: the message is expected13:24
CokeI get that too13:24
vilaCoke: expected too13:25
Cokeis regular ssh+bzr faster?13:25
=== bialix_ is now known as bialix
Kamping_Kaiservila: ok. so it has to download <an ammount> anyhow, i assume its related to what you just told Coke about the sftp issue :)13:26
vilaCoke: bzr+ssh is almost always faster than sftp these days (at worst it should be as fast (or slow :))13:26
vilaKamping_Kaiser: Well, bzr has to check what history is available remotely to know what should be uploaded, so certainly the smart server is far better for that13:26
Kamping_Kaisernod.13:27
Cokevila: all revision systems do that13:27
vilaBut the progress bar indicators are not the best tool to diagnose what is dowloaded/uploaded and whn13:27
Kamping_Kaiserwhen i do pushes i'll keep my eye on it and see if it seems to work consistantly better or not.13:27
vilaCoke: We can discuss for hours why the old formats are bad, but I find it a bit less interesting than knowing if the new format and/or the smart server suitsyour needs or not13:28
CokeI went with bzr because of launchpad, basically13:28
Cokevila: does the smart server require me to add additional daemons server side?13:29
vilano13:29
vilaas long as bzr is available in your path there is 0 setup13:29
vilaif it's not you have to set BZR_REMOTE_PATH locally or bzr_remote_path in your locations.conf file13:30
Cokevila: hm. I don't think the host will allow me to run it13:30
CokeI asked before and they said "no, it hogs too much CPU, your shell account is not for running stuff, only for uploads"13:30
Cokemight just move the repos elsewhere13:31
CokeOk, thanks for yer help. I'll have to think about what to do next.13:31
vilaCoke: try 2a, most of the people who tried were happy13:32
* vila keeps talking alone :-.13:32
vilaKamping_Kaiser: so your commit test created a 7kB pack file, expected13:32
vilaKamping_Kaiser: you may want to try to correlate http://bzr.savannah.gnu.org/r/gnewsense/.bzr/repository/packs/?C=S;O=D with your expected upload times and see13:33
vilaKamping_Kaiser: and come back here to tell us or file a bug on launchpad13:33
Kamping_Kaiservila: i assume its a new pack for every commit? or will bzr re-roll the packs now and then?13:34
* bialix waves to vila13:34
vila\o13:34
Kamping_Kaiserand ftr, i'll definitely come here before dealing with LP ;)13:34
vilaKamping_Kaiser: a new pack for every commit, then merge the 10 into a bigger one, then the 10 big into, etc13:35
wvdI've installed bazaar, and now I wanted to do bzr branch lp:ubuntu-bots, but it's gives me some error: 'bzr: ERROR: Unable to create symlink 'bans.cgi' on this platform'13:35
vilaKamping_Kaiser: Is there a specific problem with LP ?13:35
vilawvd: running windows ?13:35
Kamping_Kaiservila: let me use it for 10 min and I'll reply to that question... I never seem to feel the love though. (Its definitely not a politicial issue)13:36
wvdvila: yes13:36
rubbswvd: windows has some issues with symlinks.13:36
vilaKamping_Kaiser: ok, just checking the meme "lp is closed source" wasn't acting again :)13:37
rubbswvd: not sure what the work around is, since I haven't come across that problem yet13:37
rubbswvd: maybe vila knows13:37
vilawvd: bzr doesn't support creating symlinks when doing a checkout13:37
Kamping_Kaiservila: nah, I have (gasp) usability issues with it ;)13:37
* Kamping_Kaiser heads off to do more hacking.13:37
Kamping_Kaiservila: thanks for your help again, I'll bug you another day :)13:38
wvdvila: how would I do this manually?13:38
vilaKamping_Kaiser: EWRONGCHANNEL :-D You want #launchpad-dev :0P13:38
vilaKamping_Kaiser: Always happy to help (tm) !13:38
bialix:-)13:39
Kamping_Kaiser:)13:39
vilawvd: on windows ? You can't. You need a filesystem that support symlinks, I'm not sure you can find that (but I'd love to be proved wrong)13:39
wvdvila: However, is this new? Since like 1 month ago I did some bzr checkouts.13:39
vilawvd: There was a plugin that provided some support for that but bzr evolved and broke it13:39
vilawvd: then you have to talk with your upstream projects and explain them that using symlinks is not windows-friendly and see if they can find another implementation13:40
wvdvila: so any way to still do a checkout indirectly or something?13:40
rubbswvd: if you don't have a system that supports symlinks, then I'm not sure what you can do.13:41
vilawvd: do you have access to some host running some unix or even a mac :-D13:41
wvdI got Ubuntu on this machine, though, my adapter is the *worst* supported, and I got tired of trying to get it work after 15 hours.13:42
vilawvd: otherwise you can try installing virtualbox and a Ubuntu guest but that's certainly not ... easy13:42
vilaadpater ?13:42
vilaadapter ?\13:42
wvdwifi usb adapter.13:42
vila:-/13:42
vilaEWRONGCHANNEL ? :-D See #ubuntu-devel ??13:43
vilakidding13:43
MvGbialix: wrote a mail to bazaar@ and bazaar-announce@ to announce the trac-bzr 0.3.0 release.13:43
vilawvd: You have a dual-boot setup ?13:43
wvdvila: yes. (first time linux ever)13:43
rubbswvd: vila's suggestion about virtualbox is not a very elegant solution, but it would work.13:43
vilarubbs: it's very elegant I use it on my desktop, on my laptop and on my other desktop too :-D13:44
wvdIt's just 1 checkout.13:44
bialixMvG: \o/13:45
vilawvd: If I have a simpler solution, trust me, I'll tell you :D13:45
vilabialix: any idea about the symlinks issue ?13:45
wvdvila: Isn't there some site, which checkouts, and then uploads the file for you :P?13:45
rubbsvila: I mean that he wouldn't be able to use his native environment.13:45
bialixwvd: use Cygwin13:45
vilabialix: \o/13:45
rubbswvd: you could try looking for a shell access site, but they tend to be very restricted environments13:46
bialixvila: :-D13:46
wvdMeh, I'll just wait for someone who develops it, and i'll ask him if he can upload it.13:46
rubbsbialix: does cygwin allow for symlinks? I wasn't aware of that13:47
vilawvd: there are 7 symlinks in that checkout in the root directory only13:50
=== jfroy_ is now known as jfroy
bialixrubbs: yes, it emulates them13:51
vilawvd: all created in revno 123, so at best you can `bzr branch -r 123 lp:ubuntu-bots`13:51
vilarhaaa 12213:51
vilathen you can contact http://bzr.savannah.gnu.org/r/gnewsense/.bzr/repository/packs/?C=S;O=D and askhim if they are really needed...13:52
vilarhaaa damn keyboard13:52
james_whi vila, bialix13:52
bialixjames_w: heya13:52
vilathen you can contact Terence Simpson <tsimpson@ubuntu.com> and ask him if they are really needed...13:52
vilahi james_w13:53
rubbsjames_w: hello13:53
james_whello rubbs13:53
wvdvila: it worked fine, thankyou.13:55
vilawvd: you realize the trunk is at revno 148 right ?13:56
rubbswvd: I would highly suggest looking into Cygwin like bialix said. It might give you a more "complete" environment13:56
wvdvila: I basically only needed one plugin, and it doesn't seem to be changed that much, and yes I realize.13:56
=== bialix_ is now known as bialix
vilawvd: One other trick you may use is `bzr export -r148  xxx.tar` and see if you have a tar that can workaround the symlink problem better than bzr14:20
jammorning vila15:06
vilamorning jam :)15:06
rubbsmorning jam15:07
zekopeko_hi15:17
rubbszekopeko_: hello15:17
zekopeko_is there a way to see how big a bzr branch is before checkout?15:17
zekopeko_in MB15:17
zekopeko_i'm having problems with one on lp15:18
rubbszekopeko_: how big the branch is or just a check out? a check out is just the working directory.15:18
zekopeko_well this one: https://code.launchpad.net/~gloobus-dev/gloobus/newInterface15:18
zekopeko_last night I got to some 300mb before quiting15:18
zekopeko_so either bzr on lp is broken or i'm doing it wrong or the author actually put insane amount of data in there (highly unlikely)15:19
rubbszekopeko_: honestly I'm not sure if you can check the size beforehand.15:21
zekopeko_:(15:22
rubbszekopeko_: I'll keep looking15:23
jamzekopeko_: looking here: http://bazaar.launchpad.net/~gloobus-dev/gloobus/newInterface/.bzr/repository/packs/15:24
jamit seems to be abuot 100MB or so15:24
jamabout15:24
jam300 sounds a bit big, but if you were fetching over http there are some inefficiencies15:25
jamI certainly wouldn't have thought it would be bigger than that15:25
zekopeko_man, what did he put in there?15:25
zekopeko_thanks for your help guys. any chance to point me to more efficient ways of getting the thing?15:26
zekopeko_just want to try that branch15:27
rubbszekopeko_: did you use the lp: shortcut? that usually goes to bzr+ssh15:27
zekopeko_i don't have ssh keys on launchpad15:28
rubbsah...15:28
zekopeko_guess it's time to add them :P15:28
vilaso I just did that using lp: took less than a minute I think at 2MB/s15:28
rubbsI'd still suggest using the lp: shortcut. It tries the fastest ways first.15:29
vilathe resulting working tree is 94MB with 89MB for .bzr15:29
zekopeko_i just used the one on the page15:29
zekopeko_bzr branch lp:xxxxxx15:29
rubbsyeah15:29
jamzekopeko_: yes, though you need to have logged into launchpad first, (set up a user id, ssh key, etc.)15:30
jamIf you haven't done that 'lp:' will still go via http15:30
zekopeko_i'm registered, so just need to upload a key15:31
jamzekopeko_: k, then run 'bzr lp-login' so that we know what username to connect to lp with15:31
vilaright, so using http stil saturate the badnwith at 2MB/s but tooks longer....15:32
vilajam: and no peaks, so definitely something wrong on your connection :-/15:33
vilareaching the 300MB and counting with http :-/15:33
viladone15:33
vilaI missed the precise number but below 400MB15:34
vilaexact same numbers for the resulting wt and associated .bzr dir, pfew15:35
jamvila: expected, but good to know it worked appropriately15:35
vilaso 3 mins for http vs 1min for bzr+ssh, gee, upload your ssh keys :)15:35
vilasince the bandwith was saturated that's indeed 3 times more data downloaded >-/15:36
vilathere is a bunch of Adding the key (<bzrlib.btree_index.BTreeGraphIndex object at 0x2f35d50>, 28198373, 22489166) to an LRUSizeCache failed. value 45109186 is too big to fit in a the cache with size 41943040 52428800 messages in the log15:37
vila14 to be precise occurring roughly every 10/12 seconds15:38
vilaand also some '25 bytes left on the HTTP socket' that look quite dirty, who did that , sheesh15:39
Takany monodevelop users in the house?15:40
bialixheya jam15:41
jamhi bialix15:41
jamvila: ouch...15:41
jamthat would indicate that gloober has a single groupcompressblock > 45MB15:42
jamand it causes us to redownload it repeatedly over dumb transports15:42
jamzekopeko_: it looks like somebody added a 40+MB (gz compressed) file to your repository15:42
jamAnd probably modified it a few times15:42
zekopeko_thats how badchoice rolls (the author)15:43
zekopeko_:sigh:15:43
rubbssounds like his name is appropriate15:43
zekopeko_i still don't get it how after almost 2 years he still doesn't get good development practices15:44
jelmerTak: Yes :-)15:45
rubbszekopeko_: some people just don't learn quickly ;)15:45
vilaapart from the configure file and some Makefile I see nothing wrong here15:46
zekopeko_rubbs, i'm getting an error. i think that i did something wrong with the ssh thingy15:46
vilaa couple of unfortunate ~ files, probably backups not worth versioning...15:47
vilajam: but no big image or other binary file15:47
rubbszekopeko_: what's the error?15:47
jamvila: could have been added and deleted15:47
vilajam: yup, looking at log -v right now15:48
zekopeko_i accidentally added a private key to lp first, then deleted it and added a key i could remember the password for and finally did it right (tm) on the third try15:48
jamzekopeko_: glad you got it working15:48
zekopeko_jam not yet15:48
zekopeko_rubbs, Agent admitted failure to sign using the key.15:48
jamah, I thought "did it right" meant it worked15:48
zekopeko_i did bzr lp-login mylogin15:49
zekopeko_and that doesn't report any error but once i try branching that message pops up15:49
vilahere we go, tar.gz, jpg, pdf, first commit :)15:49
vilalol, even a git repo !15:50
vilapart of it removed in revno 1515:50
rubbszekopeko_: what OS are you running?15:51
zekopeko_9.1015:51
rubbshmmm...15:51
rubbsjam: do you know what's going on with zekopeko_'s error?15:52
jamzekopeko_: have you done "ssh-add" ?15:52
vilazekopeko_: is src/gloobus an executable ?15:52
Takjelmer: hi :-)15:53
zekopeko_jam no15:53
zekopeko_i'm following the faq15:53
zekopeko_and adding with the web interface15:53
jelmerTak: hey15:53
Takjelmer: can I send you an mpack to test, or have you test the one generated by the tip of my md-bzr branch?15:53
jamvila: so .git was added in 1, removed in 15, added *again* in 7615:53
jamdeleted in 8115:54
vilarevno 76 another bunch of... jam beat me :)15:54
zekopeko_vila have no idea15:54
zekopeko_i wouldn't be surprised15:55
Tak(with md 2.2)15:55
rubbsI don't claim to be even a decent developer, but holy crap that's some bad repo usage15:55
zekopeko_rubbs, http://paste.ubuntu.com/343769/15:56
vilawell, people deserves the right to be creative in the way they use the tool15:56
zekopeko_rubbs, i'm no dev but even i know that you don't do shit like that15:56
zekopeko_just have to catch him on irc and bug him i guess15:57
jamzekopeko_: what is your lp username?15:57
zekopeko_zekopeko15:57
vilazekopeko_: either you didn't upload the right ssh key or you don't present the right ssh to lp or you didn't inform your ssh agent to use a new key15:57
zekopeko_i'm just gonna delete the .ssh folder and start over15:58
vilaeerk no !15:58
jamzekopeko_: you have one ssh key uploaded, ending with: zekopeko@leviathan15:58
jamwhich seems reasonable15:58
zekopeko_yup15:58
zekopeko_the problem is probably this:15:58
jamat least it looks like an ssh public key15:58
zekopeko_i accidentally added a private key to lp first, then deleted it and added a key i could remember the password for and finally did it right (tm) on the third try15:59
vilazekopeko_: what does 'ssh-add -l' says ?15:59
zekopeko_2048 96:fb:9d:34:cd:50:98:7f:9c:1e:a6:2f:40:39:e9:a3 zekopeko@leviathan (RSA)16:00
rubbszekopeko_: I'm out of ideas, but vila and jam are regular contributors, they can really help you out.16:02
vilazekopeko_: do 'ssh-add -D' then try again your agent may have kept a previous key16:02
zekopeko_did that now what?16:04
zekopeko_still doesn't work16:04
rubbszekopeko_: not that you need to use this solution forever, but what if you used a non-password procected key?16:05
rubbsat least until we figure out what's going on16:05
vilazekopeko_: going to manual mode :) try 'ssh -v zekopeko@bazaar.launchpad.net'16:05
vilathat should fail but tell us why16:05
vila!paste16:06
ubottuFor posting multi-line texts into the channel, please use http://ubuntu.pastebin.com | To post !screenshots use http://tinyurl.com/imagebin | !pastebinit to paste directly from  command line | Make sure you give us the URL for your paste - see also the channel topic16:06
zekopeko_http://paste.ubuntu.com/343771/16:06
zekopeko_hmmm... perhaps a complete delete .ssh and start over would work?16:09
vilatry logout/login first16:09
vilathe paste above confirms a problem with the agent or a mismatch so just restarting it should be enough and logout/login is the easiest to ensure you get that right16:10
zekopeko_vila, no go16:14
vilayou entered your password again ?16:14
zekopeko_in the web interface right? if so yes16:14
vilano, locally, your ssh agent should ask for the passphrase protecting your private key16:15
vilawhat web interface are you referring to ?16:15
zekopeko_but how do i log out?16:16
zekopeko_i'm guessing bzr lp-login zekopeko logs in16:16
vilaha sorry, I meant logout/login from your Ubuntu session16:17
vilathe one that manage the ssh-agent16:17
zekopeko_oh i thought on lp.net16:18
zekopeko_that the problem was there and not here16:18
vilayeah, sorry, bad explanation from me :(16:18
zekopeko_ok wait16:18
vilayeah, I noticed he didn't quit but I thought he was using some irc proxy... doesn't match the ssh problem though :-/16:19
zekopeko_villa yey, it works!16:20
zekopeko_thank you16:20
vilazekopeko_: well done !16:20
vilazekopeko_: Always happt to help (tm) ! :D16:20
vilagee, yet another long day....16:21
vilazekopeko_: Always happy to help (tm) ! :D16:21
rubbsvila: thanks for taking over that problem. I try to help when I can, but I'm not always great at troubleshooting everything16:22
zekopeko_no to see if it's gonna make16:26
vilarubbs: you're doing fine ! (sry was on the phone)16:32
bialixgood weekend for everyone, bye16:34
Anthony_hi.17:06
Anthony_how can use bzr+ssh with non-standard port ?17:06
Anthony_sorry17:09
Anthony_already found, have a nice day17:09
ronnyNET||abuse: those add new commands to the bzr cli as far as i can tell18:35
ronnyoh man18:35
NET||abuse??18:36
ronnyi just noticed i was scrolled back damn much18:36
NET||abuse:P18:36
NET||abusethis re: bzr qlog18:36
NET||abuse?18:36
ronnywhen you asked why those didnt add entries in the applications menu18:36
ronnybbl18:37
NET||abuse:) yeh, i thought there was a qt front end app that was just like a full gui application that could be used as a front end to bzr in general, not just the revision history stuff :)18:37
NET||abusebut, that said, i'm very happy working cli now,, it's a little tricky switching between svn, bzr and git from time to time, not to mention when i'm pulling from mercurial. :)18:38
NET||abusebut overall, i'm comfortable with bzr at this point.18:38
NET||abusepretty comfortable with svn also.18:39
NET||abusegit is still a little alien, and hg... welll, i really havn't a clue.18:39
rubbsit can be hard to learn so many18:41
rubbsespecially since some of the terms mean different things to different VCS's18:41
jamvila:  are you still around?18:41
NET||abuserubbs, oh god really? there's terminology collision?  eg?18:41
vilajam: for a couple of minutes18:41
rubbsI should rephrase that18:41
ronnyNET||abuse: yup, i learned the guts of all 3, there are various weird differences18:42
vilajam: I'm finishing my patch pilot summary mail18:42
jamvila: I was wondering if you have the ec2 tools on babune18:42
rubbsI meant that the workflow descriptsions seem similar until you really get into them18:42
jamI'm unable to bundle the instance18:42
ronnyhm, all 4 i meant18:42
vilajam: no idea, so propably not18:42
jamand I'm not even getting a failure message18:42
NET||abuseah, yeh, i'm mostly in bzr and svn these days,, i'm leaving git till i really need to learn it..18:42
vilawhat are they ?18:42
jamvila: well 'ec2-bundle-vol' is the command18:42
jambut sure18:42
jamif you don't know them, you probably haven't installed them18:42
* vila fires synaptic18:43
rubbsNET||abuse: good idea. I'm attempting to learn git as well, but it's slow going...18:43
NET||abusei'm very happy with bzr.18:43
NET||abusei just do alot of solo web dev..18:43
vilajam: ec2-ami-tools and ec2-api-tools seem relevant ?18:44
jamvila: yes18:44
vilajam: one of them ? both ?18:44
jammight be an 'ami' tool, but probably both are worthwhile18:44
jamone may depend on the other18:44
jam(ami seems like it would depend on api)18:44
NET||abusebut from time to time someone else joins me, so for the most part, i have my local repo, then i push that up to the hosting server storage, below webroot, and export the code from that to the live site for rollout, but also means i can jump computers(i have 3 laptops) or allow another dev, or designer to join me in working on it very easily.18:45
vilano dependencies, both installed, try again18:45
NET||abuserubbs, so i'm sorta centralized, but distributed when i want to be :)18:45
jamvila: 'ec2-bundle-vol' is now present. Thanks18:46
rubbsNET||abuse: whatever works. there's no reason to change things up if what is working now is fine.18:46
vilajam: for the record, ec2-bundle-vol is part of ec2-ami-tools18:59
alex_hi18:59
jamvila: well, I actually needed ec2-bundle-instance, but I assume that is in the same tool19:00
vilajam: no ! It's part of ec2-api-tools !19:01
jam:'(19:01
alex_is anyone know why the stable update-site (for bzr eclipse plugin) is unavailable ?19:02
jamvila: well, issuing the command via ec2-bundle-instance did, indeed get it to work as I wanted19:02
vilajam: great19:02
jamof course, now to understand why ElasticFox is der-broken19:03
jam....19:03
vilaalex_: did you check recently ? I thought it was broken by the redirection but fixed since...19:03
jamvila, alex_: I believe bzr-eclipse (not qbzr-eclipse) was just removed because it had not been updated in a long time19:04
jamI could be remembering wrong19:04
jambut yes, both were broken by the bazaar-vcs.org => bazaar.canonical.com change19:04
alex_qbzr is another eclipse plugin ?19:04
alex_i'v been on the wiki to pickup the stable url19:04
jamqbzr-eclipse is an eclipse plugin that wraps the qbzr ui19:04
jamversus a closer-integrated eclipse ui19:04
* vila crashes19:05
vilaHave a nice day all !19:05
rubbsnight!19:05
alex_night !19:05
hazmathmm.. so in a working copy i do a bzr merge ../branch.. bzr revert -R . ... and then if i do a bzr merge ../branch  i get an exception with traceback http://gist.github.com/25969119:13
hazmatbasically i tried to back out of a merge with revert, and then when i went to do it again.. bzr barfed.19:14
james_whazmat: just use "bzr revert" to revert the merge19:15
hazmatjames_w i tried to that.. order of steps to reproduce exception was . bzr merge.. bzr revert .. bzr merge19:15
hazmat^do19:16
james_whmm19:16
james_wsounds like bug 33661819:17
ubottuLaunchpad bug 336618 in bzr "dirstate error (Unknown kind 'absent') on merge/uncommit/merge sequence" [High,Confirmed] https://launchpad.net/bugs/33661819:17
salgadovila, around?19:17
james_wsalgado: he left 10 minutes ago19:17
james_wof course, he might not really be gone :-)19:17
salgadooh, that's a shame.  will have to bother next week's pilot, then19:18
hazmatjames_w yup thats the same issue it looks like19:18
james_wsalgado: can I help?19:18
rubbssalgado: maybe we can help you. what's up?19:19
salgadojames_w, maybe.  I'm giving a go at fixing bug 31789619:19
ubottuLaunchpad bug 317896 in bzr "bzr unshelve --dry-run should produce a diff" [Medium,Confirmed] https://launchpad.net/bugs/31789619:19
james_wah, cool19:20
salgadoI did what jam suggested, but tree.changes_from(workingtree) gives me a TreeDelta and I couldn't find a way to extract a diff from that19:20
james_wso, what I would do here is look for cmd_diff in bzrlib/builtins.py19:20
james_wthat will show how "bzr diff" draws diff19:20
james_wit's something like bzrlib.diff.show_diff_trees(tree1, tree2) or something19:21
salgadoyeah, I was able to get a diff using that19:21
james_wshow_diff_trees(old_tree, new_tree, sys.stdout)19:21
salgadobut it includes lots of garbage (e.g. === modified directory 'bzrlib/bundle' (properties changed: -x to ??))19:22
jamhazmat: it looks like you did a partial revert (-R .), which would hint that you are then doing 'bzr merge --force', is that true?19:22
salgadojames_w, and, since it's a diff between the working tree and the PreviewTree containing the shelved changes, all uncommitted changes show up in the diff as removed19:23
jamsalgado: an executable bit change would be considered a change19:23
james_w(setting old_label and new_label could help make it clear whether it is the diff that would be applied that is shown, or the diff that was taken away)19:23
james_wsalgado: could you pastebin your diff to trunk? I'd like to see the approach you are taking.19:24
salgadojames_w, diff.show_diff_trees(self.tree, merger.other_tree, sys.stdout) is what I did19:24
jamsalgado: so there are a few possible diffs to show19:24
jam1) the diff versus the committed state and the current state (what you are doing)19:24
jams/committed/shelved/19:24
jam2) the diff of shelved state versus its basis state (what was shelved)19:25
jam3) the diff of the shelved state applied to the current state versus the current state19:25
jamthe latter is *probably* what people want19:25
salgadoright19:25
jambut requires doing the steps to stage the unshelve into limbo19:25
jamand do the diff from there19:25
james_wI'd argue that --dry-run has to show the latter19:25
james_wwe could add the others, but having --dry-run not show what unshelve would do would be confusing19:26
jamjames_w: only in that we are using --dry-run to say 'show me the contents', if we had a different 'show me the contents'19:26
jamas you said19:26
james_wso, I would use the same as merge --preview to do this19:27
james_wget the Unshelver19:27
james_wmerger = unshelver.get_merger()19:27
hazmatjam it happens with or without the -r flag19:27
james_wtt = merger.make_preview_transform()19:27
james_wresult_tree = tt.get_preview_tree()19:28
jamhazmat: not '-r', -R19:28
james_wshow_diff_trees(merger.this_tree, result_tree, sys.stdout)19:28
jam'bzr revert' no options19:28
hazmatjam.. trying19:29
james_wtt.finalize()19:29
salgadojames_w, cool, let me give this one a go19:29
hazmatjam.. it triggers the error with a naked revert .. http://gist.github.com/25969919:31
hazmatis a shell script that reproduces it19:31
jamhazmat: you still have '.' in there, right?19:32
jam(bzr revert .) versus (bzr revert) ?19:32
jamfrom what you've written, I would guess it only happens when 'b' has no ancestry19:32
salgadothanks jam, james_w!  I'll now figure out how to write a test for it.19:32
james_wit works?19:32
hazmatjam.. ah19:33
salgadojames_w, yep.  don't you trust your code!? ;)19:33
james_wnot at all!19:33
jamthis is actually the "merge into a branch with no history" bug, plus a little bit extra19:33
jamsomething that we could support, but really doesn't happen in practice19:34
jamsince,, you generally have history19:34
jam:)19:34
hazmatjam, it happens with 'bzr revert', and it happened to me in practice when i had history19:36
hazmatjam possibly it wouldn't have happened to me in practice if had used "bzr revert" instead of "bzr revert ." but thats a disconcerting fragile distinction imo19:47
jamhazmat: bzr revert . is quite a bit different from bzr revert19:54
jamthe former doesn't remove the pending merges19:55
jamjust reverts the file content19:55
jamif you had history19:55
jamthe next 'bzr merge' would refuse because it thinks you have pending changes (the pending merge should be committed)19:55
=== salgado is now known as salgado-afk
johnjosephbachirIs there a recommended set of things to check before killing off a branch -- i can check for local changes, and if there is anything on the shelf -- is there anything else to check? any single command to use to see if deleting a branch won't lose work?20:40
lifelesslastlog lifeless20:41
rubbsjohnjosephbachir: that's basically all I check, but my workflow is to just create a feature branch and then delete it when I'm done.20:44
rubbsdon't know if that helps, but there it is.20:44
johnjosephbachirit does help20:44
johnjosephbachirthanks20:44
rubbsnp20:44
ronnyis there any way to get tags as repo objects instead of that britle text file of references?20:53
joaopintohi21:03
joaopintobzr: ERROR: No such file: 'hlmad90t8zneqx2ad024.pack': [Errno 2] No such file or directory: '/home/janito/workspace/debfactory/.bzr/repository/upload/hlmad90t8zneqx2ad024.pack'21:03
joaopintohow do I recover from this error ? it's happening during a commit21:04
cellofellowhow do I remove a "submit branch" from a branch?21:11
joaopintomanually creating the upload dir resolved my problem21:18
lifelessronny: hi21:22
lifelessronny: branch.tags21:22
ronnylifeless: i meant that in a repo format sense, i know the api21:27
ronnylifeless: oh, and hi21:27
ronnyhmm, how do i get bzr to color diffs?21:59
james_wronny: bzrtools has cdiff22:09
ronnyhmm, i remembered that vc actually colors diffs, even from bzr22:09
djbclarkso just googled for this for about 10 minutes, no luck... how does one list all remote branches under a certain point using bzr? I did find a page that showed how to do it with some git bzr-using magic, but that seems suboptimal.22:10
james_wdjbclark: bzr branches URI might be what you want22:11
Kamping_Kaiserjames_w: /win 3322:15
Kamping_Kaiseroops22:15
Kamping_Kaiserjames_w: bzr: ERROR: unknown command "branches"22:15
Kamping_Kaiserseems to not exist in 2.0.2 :/22:16
james_whmm, is that bzrtools as well?22:16
Kamping_Kaiserdon't think iv'e got bzrtools atm, that might be the cause22:17
djbclarkKamping_Kaiser: yeah I just installed pretty much anything that looked bzr-related and it's churning away at something (eg no immediate no command return)22:19
djbclarkyep, that's a long hang, still sitting there... status would be nice ;-)22:22
Kamping_Kaiserthats a big think. whats it doing, downloading the world?22:22
djbclarkKamping_Kaiser: no just "bzr branches sftp://djbclark@bzr.savannah.nongnu.org/srv/bzr/gnewsense"22:22
djbclarkKamping_Kaiser: I should prob try the non-sftp URL, but now I'm intriqued to see if it ever times out.22:23
Kamping_Kaisertheres about a dozen branches, iirc.22:24
ronnyoh my goodness22:25
ronnyhow do i get bzrtools cdiff to use green instead of that blue22:25
djbclarkKamping_Kaiser: ooo it actually did finally work22:25
djbclarklols22:25
Kamping_Kaiserdjbclark: huzzah :) is it any faster over http?22:26
ronnyhmm, i suppose i'll just have to use `vc diff`22:26
djbclarkKamping_Kaiser: not so much22:28
=== jam1 is now known as jam
=== Meths_ is now known as Meths
lifelessjkakar: you should get commandant packaged ;)22:41
scorp007hi, is it possible to, after having done a lw-checkout, turn it into a full checkout?23:24

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