/srv/irclogs.ubuntu.com/2012/01/18/#bzr.txt

GRiDgood, thanks00:36
GRiDquestion, how much processing does a "bzr branch" do, as opposed to essentially transporting files and unpacking?00:40
pooliehm00:46
pooliewell, --lsprof-file will tell you quantitatively 'how much'00:46
poolieit does, for instance, look at the revisions and trees you're pulling across to identify which file texts to send00:47
GRiDok thanks cool i'll check lsprof. i was also looking for a way to validate a repo, bzr check seems to do this...01:23
GRiDpoolie, lsprof is perfect, thanks01:43
BlindWolf8Hello all. When I do "bzr new --colocated-branches --format 2a" from the Windows GUI client to initialize a new repo, it faisl, but it works via a command line on the server (Linux)02:07
AuroraBorealisis the version bazaar explorer is using matches the one that the cli one is using?02:07
BlindWolf8Bazaar Explorer is 1.2.102:08
AuroraBorealischeck the about thingy02:08
AuroraBorealisand see what version of bzr02:08
BlindWolf8bzrlib 2.4.202:08
BlindWolf8this is all on the client02:08
AuroraBorealiswhats the other version02:09
AuroraBorealisand i THINK that colocated branches02:10
AuroraBorealisdoesn't exist until bzr 2.502:10
AuroraBorealisand the one you are using is from the bzr-colo plugin02:10
BlindWolf8the bzr about windows says...02:10
BlindWolf8Bazaar Explorer 1.2.1...QBzr 0.21.1, bzrlib 2.4.2, PyQt 4.8.4, Qt 4.7.2, Python 2.6.602:12
AuroraBorealisso both are 2.4.202:12
AuroraBorealisim not sure why its not working, but i know i was messing with colocated stuff and its not 'offically' supported yet02:12
AuroraBorealisbazaar explorer is just using the bzr colo plugin02:12
BlindWolf8gotcha02:13
AuroraBorealisbasically what it is right now is just a lightweight checkout02:13
AuroraBorealisthat points to a branch/repo inside .bzr02:13
BlindWolf8i am lookign in the logs and I think the first line is:02:14
BlindWolf8  File "bzrlib\commands.pyo", line 946, in exception_to_return_code02:14
AuroraBorealislast line is the most recent call02:14
AuroraBorealispaste that02:14
BlindWolf8last line before a generic syntax error is....02:17
BlindWolf8  File "C:/Program Files (x86)/Bazaar/plugins\explorer\lib\workspace_models.py", line 287, in build02:17
BlindWolf8helpful?02:19
AuroraBorealisnot really haha02:19
AuroraBorealisthat command works for me on windows02:20
BlindWolf8just doing it througn bzr explorer?02:22
AuroraBorealiscommand line02:22
BlindWolf8I'm doing it through bzr explorer using bzr+ssh connecting to a remote server02:22
BlindWolf8which is on my LAN02:22
AuroraBorealisthat works for me too on bzr explorer02:22
BlindWolf8I'm doing it through bzr explorer using bzr+ssh connecting to a remote server02:27
BlindWolf8using Pageant for authing to the server02:27
AuroraBorealisi dont know why its not working, its working for me :<02:27
AuroraBorealisand bzr+ssh shouldn't affect it. i do that all the time02:28
BlindWolf8do you want me to pastebin some stuff?02:35
AuroraBorealissure02:35
BlindWolf8Still here?03:15
BlindWolf8I made a paste but I dunno if you can view it if I set it to private03:16
BlindWolf8http://pastebin.com/bumhufUb03:16
AuroraBorealisi can see it03:16
AuroraBorealis  File "C:/Program Files (x86)/Bazaar/plugins\explorer\lib\workspace_models.py", line 287, in build03:17
AuroraBorealisWindowsError: [Error 123] The filename, directory name, or volume label syntax is incorrect: u'bzr+ssh://wolf@10.8.31.188:8888/sopa/.bzr'03:17
AuroraBorealisit seems to be working but it is failing on a directory03:17
AuroraBorealislike it cant find the file or something03:17
BlindWolf8it's really weird03:22
AuroraBorealismight actually be a bug, i dunno if any of the developers are on atm03:23
BlindWolf8by what it spits out, it's looking for the .bzr directory, but it has yet to create it as that's what that command does03:28
AuroraBorealisor something, its trying to access the directory but it says the url is invalid03:30
BlindWolf8if I run that command directly on the server it works though03:32
BlindWolf8"cd sopa" then03:32
BlindWolf8bzr new --colocated-branches --format 2a03:33
AuroraBorealisyeah, it might be a bug then >.>03:33
BlindWolf8thanks! see ya!03:35
AuroraBorealisdoes nayone know how to make the list of locations in bazaar explorer more..useful? then just "trunk" 20 times04:46
thomiHi - I've just upgraded my second machine to precise, and bzr is completely broken for me - i.e.- I get ConnectionReset whenever I try and do anything that involves talking to launchpad.07:56
thomiI'd submit a bug to LP, but it seems like I must have done something wrong, otherwise someone else would have found this already - any ideas?07:57
fullermdTry ssh/sftp'ing manually and see what happens.07:58
thomifor example: http://pastebin.com/X5y5AXPF07:58
thomifullermd: I'll try that....07:58
fullermdPermission denied (publickey).  is the tipoff.07:58
fullermdMeans you don't have the ssh key LP is expecting.07:58
thomiI thought Bazaar used theanonymous transport when that happened?07:59
thomias in: it would fall back to anonymous transport?'08:00
fullermdNo, at that point there's nothing to fall back on.08:00
fullermdWhen you haven't lp-login'd, it uses http instead of bzr+ssh.  But once you have, it does.08:00
thomiahh, and there's no 'lp-logout'08:01
fullermdDon't think so, no.08:03
thomicool - that works now, I had the wrong key in my LP account. Thanks for your help.08:03
vilahi all !08:06
fullermdOh, figures.  I solve the problem, _then_ vila appears.  Typical.08:06
vilahehe08:07
vilalp-logout is spelled: 'bzr config --scope bazaar --remove launchpad_username'08:08
vilafor recent enough bzr versions08:09
vilabut yeah, the best way to debug this sort of issues is 'ssh -vv'08:09
* fullermd gets a little crosseyed.08:13
fullermdAre you sure the first word of that command isn't "git"?08:13
vilayup, what makes you think otherwise ?08:14
vilatoo complex ?08:14
fullermdOh, no.  I'm sure it'll be perfectly clear after a weekend course and an hour or two of meditation.08:18
sbarcteamhi guys.08:21
AuroraBorealishaha.08:22
sbarcteamI have a checkout of a repository from box A  at box B08:22
sbarcteamI want to run uncommit on box A.08:22
sbarcteamwhat do I need to do on box B so they are in sync ?08:23
sbarcteama pull or an update ?08:23
vilafullermd: one hour in the morning and one hour in the evening, best results guaranteed !08:25
=== Merwin_ is now known as Merwin
vilasbarcteam: it's hard to talk about 'sync' when one side has uncommitted changes in the tree08:28
vilasbarcteam: it's easier to commit on one side and then pull from the other side with --overwrite if needed08:29
sbarcteamvila, since uncommitted changes are local, and by "sync" I mean update/pull I think the question is well defined.08:33
sbarcteamif the answer is not well defined, this means: either there is a bug in bzr behaviour, or the answer is wrong :)08:34
sbarcteamsince if I am doing an uncommit, bzr branch knows it is bound.08:34
sbarcteamand if I am doing update from a bound location, it should be in sync to the latest (or what I specified)08:35
sbarcteamI experienced another behaviour.08:35
sbarcteamthat the checked out repo had remainders of the uncommitted revisions.08:35
vilawow, no offense intended, but thanks for mentioning you're using a bound branch08:35
sbarcteamyep.08:35
sbarcteamsorry.08:35
fullermdOh look, another round of bound checkouts screwing things up.08:35
fullermdHe said 'checkout' right at the start...08:36
sbarcteamSo, what I am saying here:08:36
vilafullermd: I know and couldn't resolve the inherent ambiguity :-/08:36
sbarcteamIS the branch that has been checked out NOT supposed to be doing "uncommit" ?08:36
vilasbarcteam: so, you have a working tree on both sides ?08:36
sbarcteamif by working tree you mean files except .bzr, then yes.08:37
vilaand the working tree on the other side not being updated is what you're not expecting ?08:37
fullermdsbarcteam: The issue is that after the uncommit, your local branch is 'ahead' of the remote.  And bzr has no way of knowing whether that's because something is supposed to be backed out, or you did something locally that hasn't made it to the remote yet.08:37
fullermd(the latter is assumed)08:37
sbarcteamfullermd, you mean: when I am running update against the branch I checked out, and I'm ahead of it ?08:37
fullermdRight.08:38
sbarcteamand that my bzr doesn't know if this has been committed with --local.08:38
fullermd(technically, "I have something the remote doesn't"; 'ahead' is technically imprecise, but colloquially useful)08:38
sbarcteamyes, but in that case I'd expect MERGE behaviour to reproduce, or a statement "man, you've got some stuff we don't... beware the jabberwack!"08:39
fullermdYou presumably got the "standard" behavior, of the commit you have locally turning into a pending merge.08:39
sbarcteamfullermd, I had the pending merge. I then ran merge, but was missing files.08:42
sbarcteamas a result, I got panicked, got back to the checkout branch, ran uncommit there, then re-did the merge again, and then committed. the missing files appeared.08:43
vilaouch08:43
sbarcteamAs you can imagine, finding out the files were missing was not much fun.08:43
sbarcteamUp to now our uncommit attempts did not render such a heart attack.08:44
vilasry for that, but when you have pending merges, you should either commit or revert, doing a merge there is... asking for trouble unless you really know what you're doing (bzr should tell you to use merge --force in this case, didn't it ?)08:44
sbarcteamfullermd, is there a way to know the changelist is coming from a remote checkout branch ?08:45
sbarcteam(I mean within python code of bzrlib)08:45
vilayes, a 'master branch' is involved in this case (from the bound branch side of course)08:46
vilafrom the remote side, no08:46
sbarcteamso it would be "nice to have" a message BEFORE doing the change stating: this uncommit has changes from non-master branches. you better run uncommit on the specific branch it was added at08:47
sbarcteamdoes this make any sense ?08:48
vilanot sure. Can you elaborate on 'change' and 'specific branch' ? (remote/local ?)08:49
sbarcteam(maybe the message should be phrased otherwise, but suggesting to run uncommit on the committing branch seems to me a good idea of having less gray hair)08:49
sbarcteamok, in terms of A and B.08:49
sbarcteamA has a master branch.08:49
sbarcteamB is a checkout branch08:49
sbarcteamI want to uncommit something.08:49
vila:-/ uncommitting a shared branch is always tricky if you don't control who has already copied the revision you're about to remove from a branch history08:50
sbarcteamvila, uncommit command doesn'08:51
vilaall users will need to 'pull --overwrite' at some point08:51
sbarcteamt say it is tricky.08:51
vilatrue08:51
sbarcteamand pull --overwrite can do even more damage. but that's another story.08:51
sbarcteamI say it is easier to have a simple paragraph in uncommit help, than to add code to change the behaviour.08:51
sbarcteamAlso, take into the account, the person doing the uncommit, is not always aware of everything in question.08:52
sbarcteamand ALL the aspects.08:52
sbarcteamA tool would be a more robust tool if it prevented the user from wrongdoing by instruction....08:53
sbarcteamanyway, I had to rant a bit.08:53
vilaright, so you want a big flashing warning when uncommit is ran right ?08:54
vilasbarcteam: care to file a bug about it ?08:55
sbarcteamwhere to ?08:55
vilahttps://bugs.launchpad.net/bzr/+filebug08:55
mgzmorning09:10
vilamgz: morning !09:55
mgzhey vila10:00
mgzlp fdt alwasy comes just when I need something10:01
mgzdone, let's try again10:04
MerwinHi! I'm blocking on : bzr: ERROR: Connection closed: Connection lost while sending request. 5/3671910:39
MerwinWhil doing a pull, always at 5/, that's strange10:39
mgzagainst what sever?10:40
mgz*server10:40
mgzrunning with the debug flags for the protocol used set then looking at .bzr.log may help10:41
MerwinOn launchpad10:43
Merwinresponse = self.retry_or_raise(http_class, request, first_try)10:43
MerwinConnectionReset: Connection closed: Connection lost while sending request.10:44
MerwinHum, seems to be launchpad which have problems ?10:44
mgzthey had fdt and were back up at 10:0410:45
mgzand also a few issues before then10:45
mgzif the timestamp on your disconnect is after that, they'll probably be interested10:46
=== Quintasan_ is now known as Quintasan
wgzcouple of pypy windows specific issues cause a lot of failures <http://float.endofinternet.org/xmlbin/pypy_non_per_FAIL>12:32
vila"An operation was attempted on something that is not a socket" ... EBADF ftw14:22
mgzany ideas on that one? the listdir+unicode one is just the pypy _os module isn't very good14:24
=== gthorslund_ is now known as gthorslund
vilawhich one ?14:44
vilaEBADF not being raised ?14:45
vilamost probably pypy should be fixed to raise it instead of the windows immoral equivalent14:45
mgzah, er... so all those large number of failing tests expect EBADF and the error is just escaping?14:47
vilaalternatively we may recognize 10038 as meaning EBADF everywhere we catch EBADF but.... will be invasive and risky14:47
vilayup14:47
vilawell, I'm 99% sure14:47
vilabut the message itself pretty much describes what EBADF is about: the object has been a socket, it's not anymore14:48
vilawell, not a 100% accurate description but in all cases I've encounter EBADF the object was a socket and the socket has been closed (which in Cpython implementation means the methods are re-bound and raise this exception)14:49
LeoNerdEBADF means the kernel doesn't think what you have is a file descriptor at all14:50
* vila nods14:51
wgzyup, looks possible14:51
vilathe Cpython implementation uses this for _closedsocket() objects14:51
wgzsock.fileno() here is -114:51
vilasee socket.py line ~17014:51
wgzand it got past self.ignored_exceptions14:52
vilaright, you can add it there but that won't cover the client side14:52
vilaEBADF is part of ignored_exceptions right ?14:53
wgzerrno.WSAEBADF is 1000914:54
wgzwe have errno.WSAENOTSOCK14:54
vilaO_o and what is 10038 then ?14:54
wgzadding that gets the test through to a ValueError on select because -1 is invalid14:55
vilaremove the select14:56
vila:)14:56
wgzseems like something fundamental has gone wrong earlier though14:57
vilaI was half joking though, mixing explicit blocking ops and select....14:57
wgzwe shouldn't be trying things on invalid sockets14:57
vilawe can't know if the socket is valid until we try14:57
vilathere will always be a race14:58
wgz-1 is always invalid14:58
vilagetting EBADF is expected though14:58
vilaIIRC when you call shutdown() one side is already blocked and will receive EBADF15:00
vilawgz: what is 10038 ?15:00
wgzWSAENOTSOCK, it's what gets raised if the fileno is -115:01
wgzit's possible this is basically a refcount bug15:01
wgzadding it to the ignored list at least gets some tests further through or with different errors15:02
vilawow, ENOTSOCK exists... never seen it before15:04
=== mgedmin_ is now known as mgedmin
LeoNerdIt's what you get for socket-only calls like send/recv/setsockopt/... on valid file descriptors that aren't sockets.15:05
LeoNerdBecause they're still valid FDs, EBADF isn't appropriate15:05
vilahmm, thanks LeoNerd15:07
vilawgz: we should not encounter this at all, may be something bad happened earlier15:08
* vila suggests comparing socket implementations or failing tests between python and pypy15:09
vilapython tests that is, not bzr tests15:09
wgzwith the code added to ignored ones: <http://float.endofinternet.org/xmlbin/pypy_ignore_notsock_test.http_FAIL>15:16
vilamodified-2.7 ?15:18
wgznote, still hangs, and still has some failures15:18
wgz^pypy change the stdlib a bit15:18
vila...15:19
wgzbut I don't see why their socket module gets a _sock object that contains a bzrlib.transport.http._urllib2_wrappers.Response instance15:19
wgzwhich is what's blowing up there15:19
vilaother way around15:19
vilathe response reads the body from a socket15:19
vilathrough a makefile() object for that matter15:19
vilathe AttributeError message has it all wrong it appears15:20
wgzpdb agrees with the diagnosis15:21
wgzbut that doesn't really help with the cause15:21
vilapdb says what ?15:21
wgz-> self._sock._decref_socketios()15:22
wgz(Pdb) self15:22
wgz<socket._fileobject object at 0x03221220>15:22
wgz(Pdb) self._sock15:22
wgz<bzrlib.transport.http._urllib2_wrappers.Response instance at 0x033e89d0>15:22
vila(diagnosis is ? self._sock is a Response or AttributeError message is borked ?)15:22
vilaO_O15:22
vila._.15:23
vilaserious breakage15:23
wgzI suspect their changes to urllib2 and the _urllib2_wrappers need serious looking at15:24
wgzwill probably resolve the http hangs though15:24
vilathey changed that too ???15:24
vilaand httplib also ?15:24
wgzyup, though we're not really ones to complain15:26
vilaI don't follow15:26
vilaunderstand15:26
wgzwe also modified the stdlib in pretty invasive ways15:27
vilanaaah15:27
vila:)15:27
vilaI don't think we monkey patch anything in socket or urllib2, we use them and derive a lot though :)15:28
wgzWSAECONNABORTED also gets propogated by a few tests.15:30
vilahmm15:31
wgzanyway, enough fun, I'll do another reduced run and see how far it gets before hanging, and get back to other things15:31
wgzthe memory usage is pretty appalling15:31
vilawgz: don't you think you should separate windows specific issues from the rest ? Or are all the tests already passing on ubuntu with pypy ?15:32
wgzhttp was hanging, but there's no way I can run the suite under pypy on my nix boxes15:32
vila:-/15:33
wgzcertainly there are fewer issues on nix, but the hang looks cross-platform :)15:33
jelmer. o O (perhaps related to the hang we were seeing with https?)15:34
vilathe one LarstiQ mentioned yesterday wasn't diagnosed properly, the traceback he pasted hinted that the first request failed for a reason I'd like to know15:34
vilajelmer: nah, that one is yet another cause (but also involves retry_or_raised though)15:34
vilai.e. first request failed, second request (same) retried by retry_or_raised hangs because the server doesn't expect another request15:36
vilathat's crystal clear for LarstiQ case, less clear for the https case, but we already know that in the https case the first request failed because the cert couldn't be verified (which is certainly not the case for LarstiQ )15:37
* vila should get rid of all the self._debug stuff and use the debug http flag instead for retry_and_raise, seriously15:38
vilawgz: in the mean time, you could set DEBUG to >= 2 in _urllib2_wrappers and get more details15:39
wgzissue is we don't get the log from hung tests15:41
wgzany more.15:41
wgzbecause it just goes to a StringIO on the case, not to disk15:41
wgzit's probably possible to break in and poke it, on nix at least15:42
vilaDEBUG relies on 'print'15:42
vilawhich is why I wanted to use debug.flags instead, but it would harm you there ;)15:43
wgzto stdout?15:43
vilabare print, so yes15:43
wgzhm, may be helpful then.15:43
vilano flush() though15:44
wgzokay, that bigger run completed, and is greener <http://float.endofinternet.org/xmlbin/pypy_ignore_notsock_non_per_FAIL>15:52
vilalooks a lot like random failures no ?15:57
vila(I looked at the test_http ones and there is no clear pattern)15:58
vila'Terminated due to possible deadlock' sounds... weird, what do you mean by 'possible' ? Either you see a deadlock or you don't, if you're not sure, let it go ;)15:59
wgzit's a timeout.15:59
vilapypy adds a watchdog thread ?16:00
wgzthe parent process gives the child a limited amount of time before killing it off16:00
wgzit's in my test runner.16:00
vilaha16:00
vilafor each test ?16:00
wgzwith DEBUG=2, hang looks like <http://paste.ubuntu.com/808712/>16:00
wgz^yup16:00
wgzseems odd that the problem test gets the status line but then no headers16:01
wgzcould be a flush issue I guess, but stdout should be, and looks, line buffered16:02
wgzyup, same thing again16:02
vilahmm16:03
vilaso, debug output is splitted between self._debuglevel (from DEBUG) and http in debug.flags16:04
vilaif you want the full monty you need to set both, I mentioned DEBUG for the retry_or_raise specific output, sry I was unclear16:04
vilabut retry_or_raise doesn't seem to be involved in your case16:05
vilawhich means you're not on the same track than LarstiQ yesterday ?16:06
wgzpossibly not, the cases are different at least16:06
wgzmay still have an underlying cause alike16:06
vilayeah, having makefile() suddenly get a Response instead of socket strongly suggest that sockets can get out of sync between server and client, from there hangs are bound to happen16:07
=== iBasic is now known as BasicOSX
=== zyga_ is now known as zyga
=== deryck is now known as deryck[lunch]
=== zyga is now known as zyga-break
jelmervila: still there?17:53
vilaenough but by much ;)17:54
vilameh, s//not/ :)17:54
jelmervila: we seem to be relying on bzrlib.initialize being called again17:54
vilareally ?17:54
vilawhere ??17:54
jelmervila: e.g. clouddeck fails to start here, because:17:55
jelmerexceptions.AttributeError: 'NoneType' object has no attribute 'cmdline_overrides'17:55
vilameh17:55
jelmertarmac seems to be hitting the same17:55
vilacomplete traceback ?17:55
vilabzr version ?17:55
jelmerthe only relevant bit from bzr is:17:55
jelmer  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1074, in run_bzr17:56
jelmer    bzrlib.global_state.cmdline_overrides._from_cmdline(override_config)17:56
jelmervila: bzr.dev, 644017:56
vilasame in lp:bzr/2.5 :-/17:57
vilamost probably a code path we haven't encountered yet17:58
niemeyerYo18:01
jelmerHey Gustavo18:01
niemeyerQuickie: is there an easy way to tell the revision of a tree, without bzr | grep | sed?18:01
jelmerniemeyer: of a tree specifically, or of a branch?18:02
niemeyerjelmer: A branch should work too18:02
niemeyerjelmer: It's for juju's charm store18:02
niemeyerjelmer: I have to import a bunch of branches from lp onto a db18:02
niemeyerjelmer: and tag them with their respective revids18:02
jelmerniemeyer: that should be really easy with bzrlib - are you doing this from Python?18:03
niemeyerjelmer: No, from Go/cmdline18:03
jelmerniemeyer: ah18:03
niemeyerjelmer: But.. python -c is not too hard either :)18:03
niemeyerjelmer: I'd prefer a command line, but happy with python -c too if there's no easier way18:03
jelmerniemeyer: 'from bzrlib.branch import Branch; Branch.open(url).last_revision()' is the python way18:03
niemeyerjelmer: Hah, brilliant, thanks!18:03
jelmerniemeyer: otherwise, cut -d " " -f 2 .bzr/branch/last-revision18:04
niemeyerjelmer: Ohhh.. that sounds nice too18:04
niemeyerjelmer: Since I can bring the logic into the code itself18:04
jelmerniemeyer: (-f 1 for the revno)18:04
jelmerniemeyer: the only issue with that is that it's less robust against format changes18:04
niemeyerjelmer: I'll follow up with the python -c trick since I'm doing a spike/experiment at the moment, but probably introspect the rev file down the road18:04
jelmerniemeyer: not that changes in this particular bit of the format are likely18:05
niemeyerjelmer: Yeah, understood18:05
niemeyerjelmer: Hmm.. breaks with lightweight checkouts too, of course..18:06
jelmerniemeyer: yeah, though you could look at the tree revision instead. That's in .bzr/checkout/dirstate and a bit harder to extract18:07
vilajelmer: the fix for bug #863401 missed this case, if you can file a bug with the failing script (probably import bzrlib; run_bzr(...))that would be nice18:07
ubot5Launchpad bug 863401 in Bazaar "library state will require explicit initialisation (but not yet)" [Critical,Fix released] https://launchpad.net/bugs/86340118:07
jelmervila: ok18:07
niemeyerjelmer: Cool, I'll probably stick to the Python stuff for now18:08
niemeyerjelmer: Future generations will likely thank me for that ;)18:08
mgzwhy is `bzr revno --tree` not the right thing?18:08
jelmerniemeyer: :)18:08
niemeyermgz: That's a revno, not a revid18:08
niemeyermgz: That said, you have a point there.. this is a pretty fundamental piece of information. Having "bzr revid" would be nice18:09
vilaworth adding a --show-ids param there (I'm gone for good now ;)18:09
jelmerniemeyer: there is 'bzr revision-info', but that shows the revno too18:09
niemeyervila: +118:09
jelmerniemeyer: so 'bzr revision-info | cut -d ' ' -f 2' will work18:09
niemeyerjelmer: Oh, that sounds good18:09
niemeyerjelmer: I'll go with that.. I can easily do the cut part with code18:10
niemeyerjelmer: Thanks!18:10
jelmervila: hmm, it seems pretty hard to fix this properly18:17
jelmervila: I think we'll have to require library state in order to run run_bzr18:18
=== deryck[lunch] is now known as deryck
vilajelmer: the best way to cover all cases may be to call bzrlib.initialize(setup_ui=False) unconditionally ? Not sure about the fallouts but I'd rather fix them once and for all, document it and see if the import load is tolerable18:23
vilajelmer: (but I should really go now ;)18:23
mgzmanual rebasing time..18:58
Noldorin_hi jelmer, poolie19:08
jelmerhi Noldorin_19:08
Noldorin_how's it going? :-)19:08
Noldorin_jelmer, ^19:13
jelmerNoldorin_: alright, how are you?19:13
Noldorin_good thanks19:13
Noldorin_jelmer, been doing much bzr work lately?19:13
cody-somervilleSo if bzr blame says a change occurred in rev 96.4.29... how do I see what revision the change *actually* occurred in?19:16
jelmerNoldorin_: some - mostly related to colocated branches and HPSS19:17
jelmercody-somerville: you mean, what mainline revision?19:17
cody-somervillejelmer, aye19:17
Noldorin_jelmer, ah ok cool19:17
Noldorin_jelmer, so when can i next pester you to fix the bzr-git bug? ;-)19:17
jelmercody-somerville: use -rmainline:96.4.2919:21
jelmercody-somerville: e.g. "bzr revno -rmainline:6037.1.4"19:22
jelmercody-somerville: or if you care about the commit message, "bzr log -rmainline:6037.1.4"19:22
jelmerNoldorin_: heh19:22
jelmerNoldorin_: same as always, it's on my todo list but I haven't gotten to it yet19:23
Noldorin_heh okay19:24
Noldorin_yeah, it's a blocking issue for me but otherwise low priority :-(19:24
Noldorin_jelmer, do i have to create loads of fake user accounts and report as blocking issue? ;-)19:24
BlindWolf8Hello all. Found a bug in Bazaar I think. Thorws the wrong kind of error: http://pastebin.com/feLzywii19:43
BlindWolf8The issue was that I forgot to load my private key so it couldn't connect, but it threw something else19:44
BlindWolf8  File "bzrlib\smart\medium.pyo", line 968, in __init__ TooManyConcurrentRequests: The medium 'SmartSSHClientMedium(bzr+ssh://wolf@10.8.31.188:8888/)' has reached its concurrent request limit. Be sure to finish_writing and finish_reading on the currently open request.19:45
BlindWolf8that happened when trying to commit19:45
=== mwhudson_ is now known as mwhudson
jelmerBlindWolf8: hi19:51
BlindWolf8hey again!19:51
jelmerBlindWolf8: that does indeed look odd - can you file a bug?19:51
BlindWolf8I'll have to file one later as I'm in the middle of some things...doing a SOPA Game Jam :-)19:52
jelmerheh, ok19:54
cody-somervillejelmer, cool, thanks.20:00
=== yofel_ is now known as yofel
SpamapSThis might be more a launchpad problem, but I want to delete this branch: https://code.launchpad.net/~clint-fewbar/charm/oneiric/nova-cloud-controller/trunk .. but it says there are 3 branches using its revisions. Is there a way I can redirect their stacking elsewhere?20:40
lifelessdelete them20:43
lifelessor use bzr reconfigure20:44
lifelesswhy do you want to delete the branch ?20:44
SpamapSlifeless: the charm store wants to take any branch named 'trunk' and expose it.. perhaps we should use the Abandoned state as a clue not to expose it though20:51
lifelessyes20:56
lifelesshonouring branch metadata is a good idea20:57
lifeless'development' and 'mature' are probably the only states you want20:57
=== r0bby is now known as robbyoconnor
nickoeHey people. How can I see which revision I am working on, like I can with 'svn info'?21:44
mgedminwell, there's bzr revno21:45
nickoemgedmin, does that shou the head revision, or the one chekec out?21:46
nickoe*show21:46
mgedminuhh suddenly I'm not sure21:46
* mgedmin did a 'bzr help revno' and saw the "--tree Show revno of working tree" option21:46
fullermdHm.  The list archives cut off long messages?22:33

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