/srv/irclogs.ubuntu.com/2010/05/17/#bzr.txt

igcmorning00:56
* fullermd waves at igc.00:57
igcfullermd: hi00:57
thumperigc: hey02:52
thumperigc: how are you feeling today?02:53
igchi thumper02:53
igcthumper: I'm feeling good today thanks02:53
thumpercool02:53
thumperigc: I'm getting closer to announcing 0.1 of wikkid02:53
thumperigc: but hit a line ending snag02:53
thumperigc: how much do you know about the bzr line ending magic?02:54
igcthumper: a fair amount02:54
thumperit seems that http posts send '\r\n'02:54
thumperand I want to normalise the http post to whatever the current file is using02:54
thumperis there bzrlib magic that could help?02:55
igcthumper: probably not02:55
thumperhmm.. ok02:55
thumperI'll work on it tonight I think02:56
igcthumper: we don't support branch-specific rules yet so ...02:56
thumperigc: where in bzrlib is the line ending work?02:56
igcnewline handling is defined by each user in their ~/.bazaar/rules file02:56
thumperI may nick some code02:56
igcthumper: bzrlib/filters may help?02:57
thumperthanks, I'll look later02:57
thumperhi lifeless02:57
thumperlifeless: home?02:57
lifelessthumper: yes03:01
lifelessjust walked in ze door03:01
thumperand straight onto irc?03:02
lifelesswell, it is a work day03:02
lifelessclothes into laundry pile03:02
lifelesslaptop on charger, fire up the standard work env03:02
lifelessI doubt I'll get all that much done 'today' though03:05
igchi lifeless03:06
lifelesshiya03:08
lifelessigc: are you home now?03:13
igclifeless: yes indeed03:16
igclifeless: and back at work at last03:16
lifelesscool03:16
lifelessis it just me, or is the emacs-editor-locking thread a little high in the handwavy, little low in the read-whats-been-written-about-the-guts stakes?03:22
spivlifeless: it's not just you03:25
spivI think my main work for the day will be making sure I take cold & flu pills regularly...03:26
igchi spiv03:26
spivHey igc03:26
lifelessspiv: ubuflued?03:33
spivlifeless: mildly, I hope.03:42
spivIt feels like something that a good night's sleep might fix.03:42
Peng_With bzr-search indexing committers and stuff, does that mean we have to delete and recreate the indexes or something?03:54
Peng_Or run "bzr index" again or...?03:59
Peng_(Although, with bug #580534, that might not work anyway...)04:01
ubottuLaunchpad bug 580534 in bzr-search "ValueError indexing with 2a and bzr.dev trunk" [Critical,Triaged] https://launchpad.net/bugs/58053404:01
* igc lunch04:04
mwhudsonigc: great to see you back online again!04:09
lifelessPeng_: delete the index04:10
Peng_lifeless: Do you know where #580534 fits in? I don't want to delete everything and then discover I can't recreate it.04:12
lifelessbug 58053404:12
ubottuLaunchpad bug 580534 in bzr-search "ValueError indexing with 2a and bzr.dev trunk" [Critical,Triaged] https://launchpad.net/bugs/58053404:12
lifelessbah caches04:12
lifelessits fixed04:12
lifelessit was broken by the index reordering stuff in trunk04:13
Peng_Oh, awesome.04:13
igchi mwhudson: thanks!05:17
=== dash_ is now known as dash
lifelessok, halt(); am naffed05:57
igcbbl07:00
vilahi all07:22
=== radoe_ is now known as radoe
=== bialix_ is now known as bialix
=== mrevell is now known as mrevell-lunch
=== jelmer_ is now known as Guest6486
vilafullermd: ping13:48
vilafullermd: gmp conflict while trying to upgrade freebsd8 (gmp-5.0.1 with libgmp-4.3.2 involved for py-pycrypto and bazaar-ng)13:49
=== mrevell-lunch is now known as mrevell
vilafullermd: nm, pkg_delete -f libwhatver ; pkgdb -F ; portupgrade py-pycrypto appears to do the trick, sanity check welcome though13:55
guijemonthi14:45
guijemontare there bzr-gtk people here?14:45
jelmerguijemont: hi14:46
jelmeryep14:46
guijemontcool14:46
guijemontI've been scratching an itch lately14:47
=== oubiwann is now known as oubiwann_
guijemontthat is, I want bzr viz to have the history graph "collapsed"14:48
guijemontlike qlog does14:48
guijemontam starting to have something working14:48
guijemontthough not finished yet14:49
guijemontdunno if you would be interested in integrating such a patch when it's finished14:49
jelmerYeah, we'd definitely be interested in something like that14:50
guijemontI found myself refactoring things quite a bit in the TreeModel14:50
jelmerthough I would encourage you to move the logic to determine those graphs from qbzr into bzrlib14:50
jelmerand then use that logic from both qbzr and bzr-gtk14:50
guijemontyeah, would probably be clever14:50
guijemontdo you know how the graph is generated in qbzr?14:50
jelmeryou might also want to talk to garvdm14:51
jelmerhe is the author of that code in qbzr and is also interested in moving the qbzr logic up14:51
guijemonthaven't lkooked at the code, but it's much faster to start: does it generate the graph on the fly when expanding a node ?14:51
guijemontoh, and also, are there code standards to respect in bzr-gtk?14:52
guijemontwould that be the same as the ones for bzr?14:53
mgzvila: did we mess something up with babune? because it looks like everything *but* windows is deadlocking in bt.per_repository now14:53
mgzhey gary.14:53
jelmerguijemont: basically the coding standard would be the same14:53
vilamgz: no idea, I'm currently upgrading a lot of various things and haven't investigated yet14:53
jelmerspeaking ofthe devil...14:54
vilamgz: and congrats for your new and shiny and easy to recognize nick :-P14:54
mgzehehe :)14:54
GaryvdMHi mgz  (are you Martin GZ?)14:54
mgzyeah, vila made me get a non-ridiculous nick14:54
GaryvdMOh - ok14:54
GaryvdMHi vila, jelmer14:55
vilamgz: but to answer to your first question, I don't think we've messed up anything, most probably an unfortuante coincidence14:55
jelmerhi vila, GaryvdM, mgz14:55
vilahey jelmer, GaryvdM  :)14:55
vilamgz: but if you feel otherwise, I'm all ears14:55
mgzehehe14:55
guijemontyeah, hi .*14:55
guijemontGaryvdM: so, are you the one who knows about the visual graph generation stuff in qbzr?14:56
mgzI looked at the history and didn't see anything likely, but yell if you want me to try poking anything here14:56
vilaguijemont: wow, yeah, there is definetly interest for that and GaryvdM's brain is the one you want to suck from :)14:56
GaryvdMguijemont: I wrote the code...14:57
vilamgz: I'd like to setup debug-windows to a branch of yours so you and modify it so you can add a test.this file with the tests you're interested in instead14:57
guijemontif ppl want to play with where I'm at (quite functional) for collapsing in bzr viz, it's at lp:~guijemont/bzr-gtk/collapsed-merges14:57
GaryvdMvila: If I want to run some test code in a subprocess, should I create a hidden command, and have a blackbox test, or is there an easier way.14:58
vilamgz: AIUI we now have ~260 new failures we didn't see before14:58
guijemontGaryvdM: does it generate the graph info on the fly, or is it just better than bzr viz to precompute that?14:58
mgzyeah, I put a message in a bug about that. fixing the reporting stuff means we're now seeing them all.14:58
vilaGaryvdM: ECONTEXT, don't you enough support in qbzr with qrun or something ?14:59
mgzvast majority are thread-leak related, makes me wonder if your chunking of tests into small groups workaround has slipped?14:59
GaryvdMguijemont: Will respond in a sec15:00
vilaguijemont: I think GaryvdM tested qlog with some mysql branch, you should try and see if you get comparable results15:00
mgzput up branches for some of the others that I can repo here.15:00
vilamgz: leaks coming back is what I fear the most15:00
GaryvdMvila: no. qrun is a dialog for running a arbertery bzr command,15:01
GaryvdMvila: qlog is to big15:01
guijemontvila: well, for now, my changes in viz are purely graphical, it's still as slow (or maybe slower) as before15:01
vilamgz: but thinking about hudson hanging on zombies made me realized I should file a bug there as that's clearly a blocking one15:02
GaryvdMvila: I want a test for the threading infrastructure, not the threading infrastructure and qlog. :-)15:02
vilamgz: (not that I suspect zombies right now, but you never know with those undeads...)15:02
GaryvdMguijemont: When I wrote qlog, I refactored the code so that the logic could easily be reused in bzr-gtk, and others.15:03
vilaGaryvdM: hmm, but do you still need to use bzr to launch your main then ?15:03
GaryvdMvila: yes, because it needs to know how to import qbzr15:03
* vila hugs GaryvdM for thinking about reuse15:03
vilaGaryvdM: ouch, ok, I see15:04
guijemontGaryvdM: yeah, jelmer was talking about the idea of merging it in bzrlib15:04
guijemontGaryvdM: do you know what still needs to be done to make that happen?15:04
GaryvdMguijemont: I plan to move this logic into bzrlib, but I'm going to need a better test suit.15:04
vilaGaryvdM: then an hidden command is probably your best bet.... can you lazy register a test command ?15:04
vilaGaryvdM: do you start to see why you may want to address the root bug instead of going with a work-around :-} :-/15:05
mgzvila: I'm going to do a complete test run on my machinary just to confirm that nothing on trunk has affected thread-problems15:05
guijemontGaryvdM: ok. I think I will have a look at that code and try to make bzr-gtk work with it in the meantime15:05
GaryvdMvila: Yes - but fixing the root bug is hard15:05
GaryvdMguijemont: The relevant code it the qbzr branch is lib/loggraphprovider.py15:06
GaryvdM*in the15:06
guijemontok15:06
vilaGaryvdM: may be you can register the command just before launching the test subprocess and avoid polluting the name space ?15:06
vilavila: Did I really just suggest such an idiotic idea ?15:07
GaryvdMvila: but that would need to happen in the subprocess,15:07
guijemontis qbzr at lp:qbzr?15:07
guijemontI guess so, seems to work15:07
GaryvdMguijemont: yes15:08
GaryvdMguijemont: There are 2 qbzr imports in that file that we would need to do something about.15:08
GaryvdMLogGraphProvider is a base class, and there is a specific qbzr LogGraphProvider in lib/logmodel.py15:10
* GaryvdM looks at lp:~guijemont/bzr-gtk/collapsed-merges15:11
guijemontGaryvdM: I barely touched the graph generation stuff  though15:11
guijemontthe code didn't look like it wanted to be changed (it's basically one huge function)15:12
mgzI do wonder whether it might not be easier to just rewrite all client-server tests to use a subprocess server, which can just be killed on teardown15:12
vilaguijemont, GaryvdM : If you manage to share the exact some code, there will be a strong case to include it in the core15:12
guijemontI think I'll try to go in that direction15:13
vilamgz: easier, may be (there are a few tests that directly talk to the server though) but the performance will surely suffer15:13
guijemontmight find bugs in the process, who knows15:13
mgzcan't perform worse than a hang ;)15:13
vilamgz: hehe, hangs are generally due to uncaught exceptions which is the first thing I want to address15:14
mgzselftest-freebsd looks stuck to me, probably needs killing.15:17
vilamgz: yeah, as soon as I get a free hand :)15:18
vilamgz: it was my last hope for a blue icon :-/15:19
GaryvdMbzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~guijemont/bzr-gtk/collapsed-merges/". :-(15:20
vilamgz: I'm about to upgrade to lucid and will come back later15:20
guijemonthmm, did I mistype it?15:21
guijemont    push branch: bzr+ssh://bazaar.launchpad.net/~guijemont/bzr-gtk/collapsed_merges/15:21
guijemonthaha15:22
guijemont_ not -15:22
guijemontsorry15:22
GaryvdMok - np15:22
jelmervila: quickest upgrade ever!15:22
GaryvdMjelmer: vila is offline15:23
vilahehe, isn't it ? lucid rocks !15:23
GaryvdMOh wow back allready!!!!15:23
vilaGaryvdM: I rejoined from my laptop while upgrading the desktopn :)15:23
GaryvdMOh - very pro...15:23
vila...and will soon update babune too15:23
vilaGaryvdM: hehe, the joy of versioned setups :)15:24
mgzdammit, testtools change has borked my setup again.15:25
mgznow seems like there's no way at all of getting a stack from an expected failure15:26
GaryvdMguijemont: fyi qbzr/lib/loggraphprovider.py was derived from bzr-gtk/branchview/linegraph.py, but has change substantially.15:29
guijemontok15:30
guijemontto be honest, I don't like much the code in bzr-gtk/branchview/linegraph.py though15:30
vilamgz: are you sure stack backtraces are available to testtools ? I would have tought that only the tests themselves could get them, and even that...15:31
guijemonta huge function with tuples everywhere, and variable names that tend to look like each other15:31
vilawow, first time ever I'm able to get gdm working on gentoo...15:32
GaryvdMguijemont: Sorry - I'm partially to blame for that. loggraphprovider.py is better at that.15:32
mgzthey're not really, I've had to add hacks to get them back unmangled15:32
mgzthere's a 'wishlist' bug on testtools to restore things to how they were before15:33
GaryvdMguijemont: LogGraphProvider loads a lot of data at load and caches it. Each time you colapse and expand in qlog, the whole graph layout is recomputed, but because of the caches, that is very fast.15:34
guijemontok, that is the secret15:36
GaryvdMguijemont: These are the entry points for LogGraphProvider:15:36
GaryvdMopen_branch or open_locations15:36
GaryvdMload_graph_all_revisions or load_graph_all_revisions_for_annotate15:37
GaryvdMThose are called on load^15:37
vilamgz: an old or a recent bug ?15:37
GaryvdMcompute_graph_lines is call each time you collapse or expand.15:38
GaryvdMguijemont: ^15:38
mgzvila: old, from r4920 when testtools was merged and broke a bunch of things for me15:38
mgzI still have bugs to file on other issues too.15:38
vilamgz: ok, may be you should start with that then ? :-/15:39
guijemontGaryvdM: ok15:39
guijemontwill try playing a bit with it15:39
guijemontafter having cleaned the flat, that is...15:40
=== deryck is now known as deryck[lunch]
GaryvdMguijemont: Good luck. Fell free to bug me when I am on irc, or mail me on either the bzr, bzr-gtk or qbzr mailing lists15:43
guijemontok, thanks15:44
GaryvdMguijemont: Btw qlog is missing 2 features that bzr-gtk has:15:45
GaryvdMguijemont: a Progress bar15:45
GaryvdMguijemont: and filtering revisions from the command line.15:45
mgzselftest related - am I mad, or does --strict do absolutely nothing?15:46
mgzI want to see a real traceback for this expected failure, and can't work out a way to make bzr let me15:47
=== Adys is now known as Bawdys
=== Bawdys is now known as Adys
nessitahello everyone! I need help on the following: I have a branch of a project X where I need to moved out a subfolder to another subfolder in project Y. I've tried bzr split but I can't push the splitted folder into a branch subfolder. Any ideas how can I workaround this? (I need to preserve the history from the source project)16:54
=== deryck[lunch] is now known as deryck
nessitathis is basically what I need to do https://pastebin.canonical.com/32341/16:58
nessitaoops, that link is not open to everyone, this is public: http://nessita.pastebin.com/nmRpjHXa16:59
=== beuno is now known as beuno-lunch
vilamgz: sry to have missed that earlier, but why do you want to see a traceback on an expected failure ? The test pass (its failure is expected) so nothing should be output17:26
vilamgz: may be you *had* tracebacks when *trying* to handle the expected failure and things are now working correctly ?17:26
mgzha, you ask just as I have bent testtools to my will17:26
jelmer_:-)17:27
mgzI want it because there's some useful information in there, particularly what the failure is exactly and what line it came from17:27
=== abentley is now known as abentley-lunch
mgzso, the code I needed was:17:28
mgzif _post_testtools_apocalypse:17:28
mgztest.addOnException(self._set_real_exc_info)17:28
mgzand:17:28
mgzdef addExpectedFailure(self, test, err=None, details=None):17:28
mgzif err is None:17:28
mgzerr = getattr(self, "_real_exc_info", None)17:28
mgzolderr = err[1].args[0]17:28
mgzif isinstance(olderr, tuple) and len(olderr) == 3:17:28
mgz# This is the knock-on ExpectedFailure, but it's passed the17:28
mgz# original exc_info for some reason, so get that back17:28
mgzerr = olderr[0], olderr[1], err[2]17:28
vilamgz: hmm, this is really ugly, it may be correct though, I have no idea :D17:43
vilawhat is post_testtools_apocalypse ?17:44
mgzwell, with a few more pokes looks like I've finally got full test run going17:44
mgzwill give result when I get back in an hour and a half17:44
mgz^just a check to see if we're post r4920 or not, my tests for this code run it against multiple bzrlib versions to make sure I don't regress17:45
vilaho, ok17:45
vilamgz: I may not be there anymore in far less than an hour :) But if you post to the list, I will certainly read17:46
mgzwill do if I find anything interesting, otherwise I'll just file bugs17:46
mgz(my aborted run earlier got thread leaks as normal, but no "failed to start thread" stuff, so I think we've not regressed that, so probably an environment change causing it rather than code)17:47
mgzright, gotta go.17:48
fullermdvila: Yes, gmp rename.18:11
vilafullermd: wait... were you *sleeping* ???? :-P18:11
vilafullermd: thanks for the confirmation ;)18:11
vilaerr, the *explanation*18:11
vilafullermd: as you can guess, I shot in the dark hoping for the best :)18:12
fullermdI wasn't sleeping.  I was just resting my eyes.18:13
vilaan thinking so deeply you were making some weird noise, yeah, I do that too, I don't understand why they call it snoring...18:14
fullermdI know!  My, uh, engine is just a little imbalanced when it's running that hard!18:15
* fullermd nods at himself.18:15
=== beuno-lunch is now known as beuno
LorIs there a simple way to make a merged-in branch the mainline?18:47
LorThe non-simple way would be to just merge in the other direction, but this might require setting up another branch locally.18:48
GaryvdMLor18:50
GaryvdMLor: Unfortunatly not.18:51
GaryvdMLor: There has been talk of a "land" command though.18:51
LorRight. The problem is how to merge stuff into the true mainline from a feature branch. A merge + push will turn the feature branch into the new mainline.18:53
LorA pqm would of course solve this, but it's pretty heavyweight.18:53
maxbYes. It's rather annoying. You'll have to have another branch locally18:56
LorIt's not really a big deal, of course.18:57
LorBranches are conceptually a bit heavyweight, though.18:58
LorI'm not sure if it's a good idea to require them all to have a separate directory with its own .bzr.18:58
LorI'd appreciate fuller support for lightweight heads (after all, a branch is really just a head) like the ones loom uses.18:59
GaryvdMsigh - I have way to many in progress qbzr branches ...19:10
nessitaanyone around with knowledge in bzr-fastimport plugin?19:28
mgzoooh, good news, I got the hang, and the thread problems19:30
mgzand Alexander's diff problems with newlines19:32
mgzhang in bt.test_lockable_files.TestLockableFiles_RemoteLockDir.test_break_lock but that's probably just going to be any unlucky smartmedium using test19:39
mgzokay, the only revs between my last good full run and this in the blame for bzrlib/tests/test_smart.py are r5223 and r523219:42
mgzhm... both look reasonably innocent. will try backing out Robert's change and see if that helps.19:45
jelmernessita: you probably want to talk to igc when he's around19:47
nessitajelmer: thanks! I'll try ping him19:48
mgzhey Alexander.19:56
mgzI think I understand those test failures you were getting with merges19:56
mgzthey were all (diff3) paramatised ones right? I see them now, so will file a bug and patch later.19:57
bialixhey mister19:59
bialixwill be nice, thanks20:00
bialixhow's your trip back to home?20:00
bialixmgz: ^20:00
mgza lot less stressful than the one over :)20:01
bialix:-)20:02
bialixyou finally found the right nick ;-)20:03
mgzblame vila!20:04
bialix:-D20:04
bialixmy home internet is sooooooo sloooooooooooow after uds one :-(20:08
mgzmy home internet is very fast compared to UDS. terrible latency there, had to wait till someone had left their laptop unattended ;)20:11
bialix:-)20:16
GaryvdMbialix: Hi20:34
GaryvdMmgz: lol20:34
bialixheya20:34
bialixGaryvdM: I've missed a good joke?20:35
GaryvdMinternet was slow for mgz...20:35
GaryvdMbialix: ^20:35
bialixah, yes20:36
bialixterribly slow20:36
bialixGaryvdM: it was true about my hangover20:37
bialixI'm trying to talk in English with people here in Ukraine. crazy20:37
=== abentley-lunch is now known as abentley
GaryvdMbialix: Made some progress with the threads branch. Error reporting better, got tests passing, and have push branch to lp.20:37
GaryvdMbialix: lol...20:37
bialixwow20:37
LorWhat is the easiest way to get rid of a big file that was accidentally added to a branch and takes inordinate amounts of space in a repository?20:48
LorI know that it is in principle possible to rewrite history and alter the commit that added the file, and then replay everything back.20:48
LeoNerdHeh... fun20:48
LeoNerdYou'll change the commit IDs, and anyone who's branched from you since then will shoot you20:49
LorThis is for private development, so that's not a huge problem.20:49
LeoNerdsearch for "bzr obliterate"20:49
LorBut still, it would be even better if it was just possible to tell the repository to get rid of the text of that file.20:49
* LeoNerd runs away20:50
mgzokay, not r5222 at fault, will probably just do 5222 + (5222-5200)/2 next20:51
mgz*r522320:53
prkosHi! How do I get just the source of an application every once in a while but so it's fast to download, I only need it to compile, I won't do dev work on it so I don't need history21:15
bialixtry `bzr checkout --lightweight`21:23
prkosbialix: thanx, what's the workflow with that, I always do it in the same folder, and compile somewhere else?21:25
bialixI don't understand\21:25
bialixit's like doing `cvs checkout21:25
prkosI tried it one before but it compile with some features missing21:26
prkosI've read about the lightweight option but it's not easy to understand from a non-dev point of view21:27
bialixwhat is `source of an application`?21:27
prkossource code21:28
prkosso I can compile the application21:28
prkosI'm not sure if that's the tree in bzr?21:29
prkosworking tree?21:29
bialixso you'd better download tarball with the sources21:29
bialixworking tree, yes, -- it's the files under version control21:29
bialixlightweight checkout creates working tree without history21:30
prkosis there a bzr command for the tarball source for an application on lp?21:30
bialix`bzr export` but I'm not sure about lp21:31
bialixthere was feature request for loggerhead to add the option: download sources as tarball21:31
bialixhey loggerhead devs, are you here?21:31
prkosonce I do a lightweight checkout, how do I update to get the new code - bzr update?21:34
prkoswill it only download the source without history as the first time?21:35
bialixyep21:36
bialix~~~21:46
MvGjam: Are you this week's patch pilot, as the wiki claims?22:24
* jelmer waves22:24
* MvG notices the away state of jam22:25
MvGjam: Now that you seem to be back from away: are you this week's patch pilot? If so, shouldn't the topic reflect this fact?23:02
=== jam changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: jam | bzr 2.1.1 is out
MvG:-)23:03
jamMvG: yeah, I'm this weeks pp23:03
jamI'm mostly recovering from traveling today, but I'll certainly be giving it some attention this week23:03
MvGHappy to hear that.23:04
MvGI'll particularly appreciate any comments on my outstanding merge requests.23:04
MvGThose about bash_completion plugin.23:05
MvGhttps://code.launchpad.net/~gagern/bzr/bug560030-include-bash-completion-plugin/+merge/23912 was already approved by vila, but will need a second opinion.23:06
MvGhttps://code.launchpad.net/~gagern/bzr/bash_completion-ExecutableFeature/+merge/24951 depends on the former, and might benefit tests beside those for bash_completion.23:06

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