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

Gilgaddoes anyone know about the current status of nested tree's is?  Last references on the wiki point to the 0.15 version, saying support is incomplete01:07
RollyGilgad: last I checked that feature hadn't been worked on in a year01:09
Gilgadouch01:10
Gilgadi guess thats why i can't find anything more recient than 0.1501:10
RollyIt sure would be nice to have :)01:11
Gilgadagreed, i was thinking of doing something like this: http://toykeeper.net/tutorials/svnhome using bzr, but it depends heavily on svn:externals (which as far as i can tell is nested trees) for organization01:13
Rollyyep, svn:externals == nested trees01:14
ToyKeeperYou could do something similar, sort of, by doing a lot of one-way merges.01:14
RollyWhat is a one-way merge?01:14
ToyKeeperPut the config modules in different branches, then merge each into host branches.  It's not the greatest approach, but it can work.01:15
Gilgadbut when happens when i want to commit a change01:16
Gilgadas in, isn't the merge a one time thing01:16
ToyKeeperBasically, commit on the module branch, then re-merg.01:16
ToyKeepermerge, even.  :)01:16
Gilgadhmm01:16
ToyKeeperI really haven't found a good way to use bzr for $HOME.01:16
Gilgadwhat do you use? or nothing?01:17
ToyKeeperAt least, if I want to share parts of a config across multiple hosts and have localized changes on each.01:17
ToyKeeperI'm using svn.01:17
Gilgadyea01:17
Gilgadmm, aparently svn would work, but i don't have a place to set up a server01:17
Gilgadi mean, i guess there are free services01:17
Gilgadbut i like that i can have my repo be just files on another system01:18
Gilgadi just use my universities unix access to store it on my space there01:18
ToyKeeperAny host you have ssh access to should work.01:19
Gilgadfor svn?01:20
Rollysvnserve daemon would also work, no?01:20
Gilgadnote my above admission that i know little about vcs in general01:20
ToyKeeperHeh, I just perked up because someone said my name.  :)01:23
pygijml, around or busy?01:32
jmlpygi: just having lunch01:48
=== bla5362627 is now known as pygi
pygijml, when you come around, please poke ;) thx01:50
pygihopefully I wont be sleeping01:50
jmlpygi: ok if I poke you tomorrow morning my time?01:51
pygijml, probably, but we should finish it then :)01:51
jmlyes01:51
pygibecause Douglas needs to work on contracts01:51
jml*nod*01:51
pygianyway, have fun :)01:51
AfCIf I've come across an svn:// URL that Subversion can check out but Bazaar can't, would Jelmer et al want a bug report about it?02:45
pygiAfC, why not? :)02:46
pygiHI abentley02:46
AfCHm. Or it could just be that their "server" is insanely slow and underpowered.02:46
pygiurl? Perhaps I can try?02:47
pygiprobably wont help tho :D02:47
AfCpygi: svn://svn.xmlroff.org/trunk/xmlroff02:48
pygiups, no bzr svn here :/02:48
* pygi looks into it02:48
* AfC has to run, but if works ok for you then I'll try again from a different uplink02:49
pygikk02:49
abentleypygi: hi02:54
=== mwhudson_ is now known as mwhudson
GPH-LaptopIs there a way to get a print out of the directory structure in a repository?06:39
fullermdls?   8-}06:46
fullermd(which is to say, you're probably asking either too little or too much; what's the goal?)06:47
awmcclainDo I need to set up an ssh umask to be able to share the branches that I push? Every new bracnh that I push has teh wrong group perms. :(06:48
spivawmcclain: https://lists.ubuntu.com/archives/bazaar/2007q3/027560.html ?06:50
awmcclainI already set the repo branch to 277006:51
awmcclainrepo dir06:51
awmcclain:-\06:51
awmcclainohhhh06:51
awmcclainlet me try doing it one level down06:51
GPH-Laptopfullermd: Oh, you're back. Yay!06:52
GPH-Laptopfullermd: Is there a command that I can use to just list the whole directory structure of the repository? (Similar to ls, I guess, but recursive, maybe?)06:53
GPH-LaptopOr am I asking too much06:53
GPH-Laptop?06:53
GPH-LaptopAlso, what's with the delay in packaging 1.10?06:54
jmlGPH-Laptop: possibly UDS?06:54
awmcclainspiv: drwxrwsr-x 14 clownfish dev 4096 Dec  8 16:22 andrew06:55
GPH-Laptopjml: Sorry, UDS?06:55
jmlGPH-Laptop: the Ubuntu Developer Summit that's going on right now.06:55
GPH-Laptopah06:55
GPH-Laptopwasn't aware of that06:55
jmlGPH-Laptop: I haven't been tracking the 1.10 release closely, so it might not be the case06:56
AfCfwiw, Gentoo Linux has got bzr 1.10 packaged. Great to see them so on top of things.06:56
GPH-Laptopjml: Doesn't look to be much more than source and Mac OS X 10.506:56
GPH-Laptopunfortunately, I'm on 10.4 ;)06:56
fullermdGPH-Laptop: Do you actually mean the structure of a [shared] _repository_?  Or do you mean of a branch?06:57
fullermdFor a branch, there's always `bzr ls` and its various options.06:58
GPH-Laptopfullermd: Um... probably a shared repository, but either should do.06:58
GPH-LaptopYup, that does it.06:58
GPH-LaptopThanks06:58
fullermdThere's nothing in bzr to list _repositories_ as such (at least, not at the UI level), since they're not treated as semantic units.06:59
GPH-LaptopAlright... but an up-to-date branch serves just as well.07:03
GPH-Laptopfullermd: Any reason why directories don't have a trailing slash?07:04
fullermdWell, the flip answer is "because that's how it was written"   :)07:05
fullermdI don't know if there was an intentional choice to not have them, or whether it "just happened" to be so done.07:05
jmlGPH-Laptop: any reason why they should?07:06
fullermdWell, there's "because it's conventional".07:08
jmlfullermd: only in some conventions :)07:08
fullermdWell, in the ones that are Right And Proper, of course.  ;)07:08
GPH-Laptopjml: There's no other way to differentiate between files and directories (ignoring file extensions, of course)07:09
jmlGPH-Laptop: not visually, no. but why is that useful?07:10
GPH-Laptopjml: Well, it prints out a list of everything in the branch... Wouldn't you want to be able to know which are files and which are directories, without having to look to see if there are files within that directory? (What if it's empty?)07:12
GPH-LaptopI would, particularly if I'm copying the list to paste it somewhere else.07:12
GPH-Laptopregular ls at least has a mode for that, if not the default action07:13
jmlGPH-Laptop: 'bzr ls -v' prints trailing slashes.07:14
* fullermd could really get to hate '-v' sometimes...07:14
GPH-Laptopbut it also prints "V" in front of every line... what does that even mean, anyway?07:14
fullermdIt's listed on every command, even those where it doesn't actually do anything.  There's never any indication of what it _does_.  And most of the things it does aren't what I considered "verbove" anyway.  Blah.07:15
fullermdGPH-Laptop: "Versioned" presumably.07:15
jmlGPH-Laptop: whether the file is versioned or not.07:15
jmlI still haven't come across a circumstance where I *care* whether a thing is a file or not.07:15
GPH-Laptopjml: But I didn't ask it that question. I just wanted a list of files and directories.07:16
jmlGPH-Laptop: which question?07:16
fullermd(which _will_ be the only option when ls is run on a branch without an [accessible] working tree)07:16
GPH-Laptopwhether the file is versioned07:16
jmlGPH-Laptop: are you using a Unix?07:16
GPH-Laptopjml: Mac OS X07:16
spivYes.  Other possiblities are 'I' for ignored, and '?' for unknown.07:16
jmlGPH-Laptop:  bzr ls -v -V | cut -c 10-07:18
jmlGPH-Laptop: I *think* cut on OS X is close enough for GNU cut to work07:18
GPH-Laptopwow... that was way too complicated07:19
GPH-Laptopbut yes, it did work07:19
spivGPH-Laptop: feel free to file a bug report or post to the mailing list to ask for this behaviour07:19
GPH-Laptopnot that I needed it... my file structure is currently small enough that I could just add the slashes myself (thanks, though)07:19
spivGPH-Laptop: I don't think anyone has wanted it before, so the current behaviour is just that way because that's all that was needed so far.07:19
GPH-Laptopspiv: OK. I just might do that.07:20
spivGPH-Laptop: it doesn't sound unreasonable, although it does sound like something that will inspire some bike-shedding...07:20
AfCbike shedding, hooray!07:20
GPH-Laptopspiv: I didn't mean to start any arguments. I'm just saying what _I'm_ looking for. ;)07:21
spivGPH-Laptop: sure.  I'm glad you're letting us know what you want :)07:21
GPH-Laptopspiv: I'm glad you're willing to listen. :)07:22
GPH-Laptopjml, fullermd, spiv: https://bugs.launchpad.net/bzr/+bug/30642407:29
ubottuLaunchpad bug 306424 in bzr "Add trailing slash to directories in `bzr ls` output" [Undecided,New]07:29
GPH-Laptopoh07:29
GPH-Laptopheh07:29
GPH-LaptopOK, another question07:32
GPH-LaptopIf I branch the bzr development branch, can I run the bzr script from that branch07:33
GPH-Laptopthat is, the modified one?07:33
jmlGPH-Laptop: yes.07:35
jmlGPH-Laptop: /path/to/that/bzr should just work07:35
GPH-Laptopjml: OK, thanks07:35
jmlGPH-Laptop: that's how bzr developers run unit tests and the like07:35
GPH-LaptopIs all the code just in that one bzr file?07:36
jmlhell no07:36
GPH-LaptopI didn't think so07:36
jmlbzrlib/ has all of the code in it.07:36
GPH-LaptopI guess I'm just looking at Launchpad wrong07:36
drew_sorry if this may sound elementary, but i stumbled across bazaar in looking for revision control, i just have a simple(hopefully) question.  Does Bazaar track revision numbers on a per file/per branch basis?07:38
GPH-Laptopdrew_: Per branch, I believe07:39
GPH-Laptopbut I'm nowhere near an expert yet ;)07:39
GPH-LaptopIs Launchpad acting up for anybody else?07:40
jmlGPH-Laptop: not for me.07:41
jmlGPH-Laptop: are you looking at the branch browser or at launchpad proper?07:41
GPH-Laptop" Sorry, there was a problem connecting to the Launchpad server. "07:41
GPH-Laptopfor example, http://bazaar.launchpad.net/~bzr/bzr/trunk/revision/388307:41
jmlright, the code browser07:42
GPH-Laptopyeah07:42
drew_GPH-Laptop: ty, guess it's time to actually figure out this whole version control thing :)07:44
GPH-Laptopdrew_: Yeah. fullermd patiently helped me when I first got started with bzr... not to put any pressure on him, though ;)07:45
fullermdIt's part of my clever scheme to build up a mass army of people indebted to me, for when I decide to remake the world in my own image.07:46
drew_:) nah i'll fight my way through(ofcourse i'm stil adjusting to linux in general here) but a peer of mine suggested i look into revision control at home and the only experiance i have is with PDMWorks07:47
RollyHm, never heard of THAT one07:47
drew_solidworks revision and workflow control07:47
GPH-Laptopfullermd: I suppose you can count me in on that one. ;)07:47
RollyAha07:47
GPH-LaptopNow I have to learn Python, too... :P07:48
drew_ty again, guess it's time to get a scotch and see what i can break :)07:48
* fullermd rubs his hands together and cackles.07:49
GPH-Laptoplol07:49
jmldrew_: excellent idea07:49
GPH-LaptopOK... first I have to figure out where the ls code is located...07:49
* jml goes off to consort with enemy languages.07:49
GPH-LaptopTHEN, I can learn Python :P07:49
jmlGPH-Laptop: you trying to fix that bug you just filed?07:49
GPH-Laptopjml: I was gonna look into it, yeah07:49
* fullermd keeps on working on some perl :p07:49
* GPH-Laptop does PHP07:49
fullermdThat's what I get paid for most of the time.07:50
jmlGPH-Laptop: feel free to ask me any questions07:51
GPH-Laptopjml: I kinda just did. ;)07:51
GPH-Laptop<GPH-Laptop> OK... first I have to figure out where the ls code is located...07:52
GPH-Laptop;)07:52
jmlGPH-Laptop: oh right.07:52
jmlGPH-Laptop: so, bzrlib/builtins.py has all of the built in commands07:52
GPH-Laptopah07:52
jmlGPH-Laptop: like 'ls'07:52
GPH-LaptopOK07:52
fullermdSearch in it for cmd_{whatever_command}07:53
jmlGPH-Laptop: there'll be a class called cmd_ls or something like that.07:53
GPH-Laptopugh... Launchpad is being naughty again07:53
* fullermd accidentally glances at the 'ls' code.07:53
fullermd                    if non_recursive and '/' in fp:07:54
fullermdThat's efficient   :p07:54
GPH-Laptopjml: Loggerhead is being stubborn again.07:54
jmlGPH-Laptop: I'll pass it onto the OSAs.07:55
GPH-Laptopjml: K, thanks.07:55
jmlGPH-Laptop: url please?07:55
GPH-Laptopjml: http://bazaar.launchpad.net/~bzr/bzr/trunk/annotate/3883?file_id=builtins.py-20050830033751-fc01482b9ca2318307:57
GPH-LaptopIt's on a URL-specific basis?07:57
jmlGPH-Laptop: well, it's working for me.07:57
mwhudsonannotating files with complicated history takes ages :/07:57
mwhudsonthis one is a bazaar problem not a launchpad problem, really07:58
jmlyeah.07:58
GPH-Laptopis there a way to view it non-annotated?07:58
mwhudsonyou can download it07:58
jmlGPH-Laptop: if you want to get a local copy of the whole branch, 'bzr branch lp:bzr'07:59
GPH-Laptop...without having to download it? ;)07:59
GPH-Laptopjml: Alright, I might do that07:59
mwhudsonthat said07:59
jmlGPH-Laptop: 'bzr cat http://bazaar.launchpad.net/~bzr/bzr/trunk/bzrlib/builtins.py' might get you the file though.07:59
mwhudsonannotating builtins.py locally takes a few seconds07:59
GPH-Laptopbut it would be useful to have the features of ViewVC07:59
mwhudsonso something funny is going on07:59
* GPH-Laptop <3 ViewVC07:59
GPH-Laptopjml: Nah, that's fine. I'll just do the whole branch.08:00
jmlGPH-Laptop: well, you can get all of those features with the bzr client08:00
jmlGPH-Laptop: although the colors are less pretty :)08:00
GPH-Laptopheh08:00
GPH-Laptopjml: Hmm... slow...08:01
GPH-Laptopshould I have run an init or something first?08:01
jmlGPH-Laptop: it's got a biggish history.08:01
jmlGPH-Laptop: no, not really.08:01
GPH-LaptopOK08:01
GPH-LaptopI have a feeling it's going to take a long while before I get the hang of this :P08:02
GPH-LaptopSo get used to me ;)08:02
jmlGPH-Laptop: once it's downloaded, you might want to do something like 'bzr init-repo bzr-branches'; 'bzr branch bzr bzr-branches/trunk'08:02
jmlGPH-Laptop: no worries.08:02
GPH-Laptopbzr-branches being my current directory, or what?08:03
jmlGPH-Laptop: bzr-branches being a new directory that will be a shared repository of all your branches of bzr itself08:03
jmlGPH-Laptop: you can call it susan if you really want.08:04
GPH-Laptophow is that related to the directory I just did `bzr branch lp:bzr`? Should I issue them in the same directory?08:04
GPH-LaptopHeh08:04
jmlGPH-Laptop: so, the directory that you're in now isn't special (unless you've already done init-repo)08:04
GPH-LaptopI may have a bit upstream... I don't recall08:05
GPH-Laptopwould that matter?08:05
jmlGPH-Laptop: what does 'bzr info' say?08:05
GPH-Laptopnot a branch08:05
jmlGPH-Laptop: ok. so it's just a boring old directory.08:06
jmlGPH-Laptop: you want to make a directory like ~/Projects/bzr or whatever you prefer08:06
jmlGPH-Laptop: that will hold all of the branches that you make of bzr itself08:06
jmlGPH-Laptop: but you make that directory using 'bzr init-repo'08:06
GPH-Laptop~/Development/bzr/bzr/08:06
GPH-Laptopis where it is08:06
GPH-LaptopAnd, of course, it just created another bzr08:07
jmlGPH-Laptop: so that the branches share their revision data.08:07
GPH-Laptopso ~/Development/bzr/bzr/bzr/08:07
fullermdOK, so you can make ~/Development/bzr/ the shared repo, and use reconfig to shuffle the branch you're making into it after it's done.08:07
jmlGPH-Laptop: heh. is that 'bzr branch' command finished?08:07
GPH-Laptopyeah08:07
fullermdSo, something like08:07
fullermdcd ~/Development/bzr ; bzr init-repo . ; mv bzr/bzr bzr.dev ; bzr reconfigure --use-shared bzr.dev08:08
fullermd(or call it 'trunk' instead if you prefer)08:08
jmlright. what fullermd said.08:08
fullermd(and then that extraneous 'bzr' dir can be tossed too)08:08
jmland then, to work on your bug fix, go 'bzr branch bzr.dev trailing-slash-bug-306424' (or whatever)08:09
GPH-Laptopwell... the first bzr directory hold more than just Bazaar stuff... it's actually a directory of code that uses bzr... so should I do that in bzr/bzr?08:09
fullermdAh, in that case, yah.08:09
GPH-Laptopso I should have ~/Development/bzr/bzr/bzr.dev/?08:10
* fullermd nods.08:10
GPH-LaptopOK08:10
fullermdThat'll be your local branch of the bzr trunk, using the shared repo in ~/Development/bzr/bzr/.  Then other branches like ~/Development/bzr/bzr/add-trailing-slash/ can share the repo.08:11
spiv"bzr/bzr/bzr" sounds a bit swedish chef-like!08:11
* fullermd swats at the fly.08:11
GPH-Laptoplol08:11
GPH-Laptopok08:11
jmlspiv: make a dvcs called "Shantih!" and make us all happy08:12
fullermdOr maybe "Beetlejuice"   :p08:14
GPH-LaptopAnd then I can run ~/Development/bzr/bzr/bug-306424-ls-trailing-slash/bzr to test?08:15
jmlGPH-Laptop: yep08:15
GPH-Laptopcool08:15
jmlGPH-Laptop: another thing you may be interested in...08:15
GPH-Laptopyeah?08:15
jmlGPH-Laptop: bzrlib has a lot of unit tests08:16
GPH-LaptopWill I need to change them?08:16
jmlGPH-Laptop: you might want to add one or two.08:16
GPH-LaptopOh, OK08:16
GPH-Laptopone step at a time, though ;)08:17
jmlGPH-Laptop: "./bzr selftest" will run all of them.08:17
GPH-Laptopalright, I'll keep that in mind08:17
jmlGPH-Laptop: and './bzr selftest test_ls' should run the ls ones08:17
GPH-Laptopcool08:17
jml(which live in bzrlib/tests/blackbox/test_ls.py)08:17
GPH-Laptopk, got it08:17
fullermdRunning all of them will take some time   :p08:18
GPH-LaptopIs there a good place for python docs (commands) like there is at php.net?08:20
* fullermd shrugs.08:21
GPH-Laptopheh08:21
fullermdStart from python.org and follow likely links.  There are some within a click or two.08:22
GPH-Laptopok08:22
GPH-LaptopWhat is PyQt4?08:23
jmlGPH-Laptop: it's Python bindings to Qt version 4. Qt is a graphical widget toolkit, used by KDE and others.08:25
GPH-Laptopthe unit test failed because I don't have it08:25
jmlGPH-Laptop: I'm sceptical.08:26
jmlGPH-Laptop: can you paste the command you ran and the output to paste.ubuntu.com (or the pastebin of your choice)08:26
GPH-Laptopjml: http://gphemsley.pastebin.com/d6a1a95dd08:28
jmlGPH-Laptop: ./bzr --no-plugins selftest test_ls08:29
igcnight all08:29
jmligc: g'night :)08:29
jmligc: good to see you back :)08:30
igcthanks jml08:30
GPH-Laptopjml: Yup, that did it. Thanks.08:30
GPH-Laptopigc: Good night stranger. :P08:30
jmlGPH-Laptop: one of your installed plugins requires PyQT08:30
GPH-Laptopinteresting... how come I didn't know that before?08:31
fullermdAlien mind control rays.08:31
GPH-Laptopand how come I don't have it?08:31
jmlGPH-Laptop: dunno.08:31
jmlGPH-Laptop: 'bzr plugins' will list the plugins that bzr can find that work08:31
GPH-Laptophmm... you think it's qbzr? :P08:32
vilaGPH-Laptop: ./bzr selftest -s bb.test_ls will be far quicker than ./bzr selftest test_ls (give it a try) and it may even works around your plugin problem08:32
GPH-Laptopvila: Indeed.08:33
vilaGPH-Laptop: the quicker part, the plugin part or both ?08:34
GPH-Laptopboth08:35
spivAdding --no-plugins will also work around the plugin problem.  (But I know vila gets sad when people do that...)08:35
vilaspiv: :-)08:35
GPH-Laptopheh08:35
vilaspiv: try writing a plugin that you want to use to run selftest and you'll quickly get sad too :-)08:36
jmlI'm sad about being hungry.08:36
fullermdDangit, you had to mention hungry...08:36
vilaspiv: like, for example, plugging a real hpss server in the test framework :-P08:37
vilaor even an instrumented one :)08:37
spivvila: I don't follow that example, currently there's both real and instrumented hpss servers in the test suite...08:37
vilaspiv: by the way, any idea about how to fix FAIL: branch_implementations.test_sprout.TestSprout.test_sprout_preserves_kind(BzrBranchLoomFormat6)08:38
vila    BzrBranch6('file:///tmp/testbzr-MSlMuJ.tmp/bzrlib.tests.branch_implementations.test_sprout.TestSprout.test_sprout_preserves_kind%28BzrBranchLoomFormat6%29/work/branch2/') is an instance of <class 'bzrlib.branch.BzrBranch6'> rather than <class 'bzrlib.plugins.loom.branch.LoomBranch6'>08:38
vilaspiv: say you want to test an older hpss server then08:38
spiv(too many real, really; most of the tests that start a TCP server and a thread don't really need to...)08:38
vilaspiv: right, that was just *one* example08:39
vilabut plugging *real* servers into the test framework is still the best way I know of to check bzr compatibility08:40
vila(even if I understand that you're referring to writing simpler tests)08:41
vilas/simpler/more focused/08:41
spivvila: possibly by deleting the clone method from loom.branch.LoomSupport ?08:41
GPH-Laptopjml: Oh... bzr files indent with spaces...08:43
spivvila: does that test even exist in current bzr.dev?08:43
jmlGPH-Laptop: these days, almost all Python does08:43
GPH-Laptopjml: Oh, really?08:43
jmlGPH-Laptop: well, all sane Python :)08:43
vilaspiv: isn't it the one you hack with jam ?08:43
spiv$ grep test_sprout_preserves_kind bzrlib/tests/branch_implementations/test_sprout.py | wc -l08:44
spiv008:44
jmlGPH-Laptop: indent with four spaces. there's a hacking guide in doc/developers/HACKING.txt08:45
jmlGPH-Laptop: (and lots of other juicy docs in the same dir)08:45
GPH-Laptopjml: Oh. Probably should have looked for that first.08:45
spivvila: there's not test_sprout_uses_bzrdir_branch_format08:45
spivs/not/now/08:45
vila8-)08:45
jmlGPH-Laptop: docs are for looking at second :)08:46
GPH-LaptopWhat do you think I should do... add the trailing slash by default or add another option?08:46
GPH-Laptopheh08:46
spivvila: and it passes08:46
fullermdI'd be in favor of it just being there always.08:46
jmlGPH-Laptop: add it by default.08:46
spivvila: (I'm still suspicious of LoomSupport.clone, though...)08:47
vilaspiv: great ! Looks like I should update the bottom thread in my loom !08:47
vilaThe comment talks about updating the nick too08:47
fullermdFor even extra fun and bikeshedding, add a * on executable files too   :p08:47
jml(why doesn't ubuntu ship with wireshark by default?)08:47
jmlfullermd: !08:47
fullermd(the lack of something like that has made me very cranky in the past)08:47
jmlfullermd: definitely would want that in an option08:47
vilafullermd, GPH-Laptop : Don't forget the '@' for symlinks !08:47
jmlfullermd: not in default behaviour08:48
fullermdSee?  Instant argument; just add fullermd!08:48
vila--decorated --color... definetly bikeshedding when color becomes an option :)08:48
spivjml: possibly because default installing software with a history of exploits that allow executing arbitrary code makes people nervous08:48
GPH-Laptopheh08:49
GPH-Laptopjml: so... anything besides slash in default?08:49
spiv"I want my bikeshed to be suffixed with the @ character!"08:49
fullermdAdding the / is probably a safe thing to have on it.  I can't offhand think of anything it would hurt...08:50
fullermdspiv: Don't be such a rogue   :p08:50
jmlGPH-Laptop: no.08:50
jmlGPH-Laptop: just '/'.08:50
spivAdding @ at least has some consistency with adding /; they are both signifiers of the inventory entry type.  * doesn't have that distinction.08:50
vilaThe only case I know of where *not* having the final '/' hurts is Apache08:51
spivAt some point the answer is "if you want a custom tree formatter, there's an API you can use..." :)08:51
fullermdTrue.  OTOH, (1) the '/' doesn't harm anything I can think of offhand ('cd', 'ls', etc) you'd paste it to, where '@' would.08:51
fullermdAnd (2) there's no case [on POSIX] where a trailing '/' could validly appear, so you could always sed it away if you wanted, whereas a trailing @ could be significant.08:52
fullermd[in the filename I means]08:52
jmlI'm using wireshark to track some machine-local traffic, how do I filter so I only capture one direction?08:52
spivjml: filter on src port?08:53
fullermdSpecify src/dest port.08:53
spiv(or dst port)08:53
jmlhow do I do that?08:53
spivThat's how the TCP stack distinguishes them, after all.08:53
spivWith much clicky-clicky.08:53
jmlspiv: yeah, there's a sense in which you just restated my question :)08:53
fullermd"and src 123"08:54
jmlhmm... I think I want a *capture* filter, not a display filter08:54
jml(they have different syntax, yay!)08:54
fullermdOh.  Display filter would work too...08:54
spiv"tcp.srcport == 1234" looks likely.08:54
spiv(I clicky-clicked on the "+ Expression..." button, expanded the "TCP" filters, etc etc...08:55
spiv)08:55
spiv(I'm sure you'd have been as distressed as me if I hadn't closed that paren)08:56
jmlspiv: good grief! I wonder what the alternative UI design was :)08:57
GPH-Laptopjml: Is there any special protocol for commit messages in my local branch/09:01
GPH-Laptop?09:01
vilaspiv: ./bzr selftest -s bt.branch_implementations.test_sprout -v not failing anymore ! Hurrah ! :-)09:01
jmlGPH-Laptop: not at all.09:03
jmlGPH-Laptop: generally, you just want to make them helpful.09:03
jmlGPH-Laptop: also, if you haven't used a dvcs before, you want to commit way more often than you are used to :)09:04
GPH-Laptopjml: I think I'm pretty much done09:07
GPH-Laptopit was pretty simple09:07
GPH-Laptopbut how come it seems like the unit tests aren't all being run?09:07
GPH-Laptopthat is,09:07
GPH-Laptopsome of the test lines don't give errors when I forgot to fix them09:07
jmlGPH-Laptop: 'bzr di -r submit:' should generate you a diff, I think. If you pastebin it I can take a look.09:07
GPH-Laptopjml: http://gphemsley.pastebin.com/d1454f2dd09:11
GPH-Laptopoh wait09:12
GPH-LaptopI think I have a little optimization to do09:12
GPH-Laptophang on09:12
jmlGPH-Laptop: looks fine to me. If you do 'bzr send' once you're done, that will prepare a merge directive (a patch on steroids) and attach it to a message, you can then send it to the mailing list.09:14
jmlGPH-Laptop: the HACKING guide has some more info about that.09:14
GPH-Laptopjml: http://gphemsley.pastebin.com/d2ef5b77109:15
fullermdI dunno if I'd reuse outstring like that...   but that's stylistic quibbling.09:17
GPH-Laptopfullermd: Well, it is the outstring... isn't it?09:19
fullermdNo, it's a filename.  It doesn't replace outstring, it replaces fp, so I'd call it 'fnstr' or something like that, and replace the requests for fp with it.09:19
jmlsend it to the mailing list!09:20
jmlthat way, stylistic quibbling will get the patch landed :)09:20
GPH-Laptopheh09:20
GPH-Laptopok09:20
fullermdHey!  We have to run the gauntlet of the IRC bikeshed before we can run the ML bikeshed!09:20
GPH-LaptopI edited the NEWS file... anything else I have to do before sending it?09:21
mwhudsonis there some way to force bzr to use paramiko over openssh?09:22
luksBZR_SSH=paramiko ?09:22
GPH-Laptopjml: Does the merge directive include my commit messages?09:23
jmlGPH-Laptop: yes, it does.09:23
mwhudsonluks: you are my hero09:25
GPH-Laptopjml: OK, so now I just e-mail it?09:27
GPH-LaptopOr should I attach it to the bug?09:27
jmlGPH-Laptop: yeah. put [MERGE] at the start of the subject, and include text that human beings will read09:27
jmlGPH-Laptop: (assuming you are using bzr send)09:28
jmlGPH-Laptop: and send it to the mailing list. Include a link to the bug as well.09:28
GPH-LaptopI did send -o09:28
GPH-Laptopis that OK?09:28
jmlGPH-Laptop: sure. just attach the output to your email09:28
GPH-Laptopand do I attach it to the bug?09:28
jmlGPH-Laptop: no09:29
GPH-LaptopOK09:29
jmlGPH-Laptop: if you want, push your branch to Launchpad (bzr push lp:<yourusername>/bzr/<branch-name>)09:29
jmlGPH-Laptop: and then link that branch to the bug.09:29
GPH-Laptopjml: It says invalid branch name09:36
spivGPH-Laptop: use a valid one, then *wink*09:36
spivWhat name did you try?09:37
luksGPH-Laptop: it's easier to just mail it :)09:38
GPH-Laptopspiv: bzr push lp:gphemsley/bzr/bug-306424-ls-trailing-slash09:38
luksmissing ~09:39
spivGPH-Laptop: your username needs to be prefixed with a ~09:39
GPH-Laptopoh09:39
spivso bzr push lp:~gphemsley/bzr/bug-306424-ls-trailing-slash09:39
* GPH-Laptop nudges jml 09:39
spivjml: tsk tsk :P09:39
* spiv wanders off09:39
luksbut really, isn't pushing the whole bzr just for one patch an overkill?09:39
* GPH-Laptop shrugs09:40
spivSometime soon we should update the branch format of bzr trunk so that pushing bzr branches to launchpad will use stacking.09:40
GPH-Laptopmay as well learn the process09:40
strkhow do I switch to a specific revno ?09:40
spivstrk: bzr pull --overwrite -r REVNO, usually09:41
jmlsorrry09:41
* spiv really wanders off09:41
GPH-Laptopjml: OK, posted to the mailing list, but awaiting moderation09:47
GPH-LaptopBranch available @ https://code.launchpad.net/~gphemsley/bzr/bug-306424-ls-trailing-slash09:49
strkspiv: thanks!09:50
jmlGPH-Laptop: thanks09:53
strkchefan: is09:53
jmlGPH-Laptop: I don't have moderation privileges, but I'll ping poolie or someone similar tomorrow.09:53
GPH-Laptopjml: OK09:54
GPH-Laptopthen I'll head off to bed09:54
jmlGPH-Laptop: ok. g'night.09:54
GPH-Laptopjml: g'night09:55
spivGPH-Laptop: moderated11:54
=== Mario__ is now known as pygi
lamontcan I safely remove .bzr/repository/obsolete_packs? or is there a command to prune the cruft from the repo?14:49
* lamont checks to see what bzr pack buys him14:50
Peng_lamont: You can empty the directory, but I don't think you can delete it.14:51
Peng_lamont: Anyway, there's no real reason to. It'll be cleaned out (and filled with new packs) the next time the repo is auto-packed or you run "bzr pack".14:52
lamontneat.  bzr pack brought me from 808MB clear down to 1150MB14:52
Peng_lamont: Right. When a pack is no longer needed, it's moved to obsolete_packs instead of being deleted outright, in case something goes wrong.14:53
luksif will be cleaned up and new obsolete packs will be added14:53
lamontotoh, .bzr/repository/packs went from 574920->574904 (woo!!) while obsolete_packs went from 233MB->574MB14:53
luks*it14:53
Peng_lamont: When it auto-packs, some packs will be compressed down into one, and the old ones will be moved to obsolete_packs. When you run "bzr pack", *everything* will be compressed down to one pack, so obsolete_packs will have a copy of the entire repo.14:54
lamontright14:54
lamontis there a way to tell bzr that I actually do backups of the machine and to quit saving me from myself by bloating said backups with extra copies of everyting?14:55
Peng_Heh.14:56
Peng_Can your backup software exclude obsolete_packs?14:56
lamontit could14:56
Peng_(I mean, exclude the contents of it. The directory itself needs to exist.)14:56
lifelesslamont: sounds like you'd just hit a extreeme autopack anyhow; obsolete_packs' contents are automatically pruned15:13
lamontlifeless: I manually did 'bzr pack' to see if it would help.15:13
lamontwhich, uh, not so much15:13
lifelesslamont: yes, I saw15:13
lifelessfor obsolete_packs to have been at 250MB it must ave already just packed 50% of your archive15:14
lamontwell... total of 11 files in the archive15:16
lamont42MB, 1.1MB, 1.1MB, and < 10k15:16
lamontso 575 MB of .bzr, and another 50MB total in the tree.15:17
lifelessyou're versioning a 422MMMB file?15:17
lamontsure.  iz histyory15:17
lamontot15:17
lamontit's also not very compressable, since it's already,uh, bit-indexed data15:18
lamontI stand corrected.  bzip2 takes it down from 42.2MB to 28.0 MB15:18
lamontthe tree has a whopping 36 commits, and no branches15:19
lifelessok15:20
lifelessso at the 30th commit it autopacked15:20
lifelessthat gave you te 250mb thing15:20
lifelessthen 6 more commits that didn't autopack15:20
lifelessthe 40th would have trimmed wiped obsolsete_packs and then moved the 10 most recent files into there when autopacking again.15:21
lamontok15:21
lamontevery 10 or so then?15:21
lifelesslamont: it allows no more than 10 packs with a given revision count, rounded up to the next base10 digit15:37
lifelesslamont: e.g. 10 of 1, 10 of 10, 10 of 100 etc15:38
lifelesslamont: so log backoff15:38
lamontah, ok15:38
lamonthrm.. why no bzrtools 1.10-1 backport for dapper?15:38
lifelessbecause you haven't done one yet?15:39
lamonts/you/poolie et al/15:39
lamontor will bzrtools 1.9.1-1~dapper1 "just work" with bzr 1.10-1?15:40
lifelessdunno, where did the dapper binary comefrom15:40
lamontlifeless: jam did the upload it would appear15:48
lamontbesides, I don't have write privs to the ppa :-p15:48
lifelesslamont: file a bug, surely you should be able to :)15:49
lamontheh15:49
lamontah.  iz funnier when read that I should surely be able to file a bug.15:49
jamlamont, lifeless: I haven't been packaging dapper because it needs different settings from all of the other packages15:53
jammost of them are just "dch && bzr commit && bzr builddeb"15:53
lamontjam: we still need/want dapper... and pushing it back to y'all is specifically because it requires a merge instead of a smack...15:54
lamontwc -l /home/lamont/bin/build-package15:54
lamont300 /home/lamont/bin/build-package15:54
lamont^ I already have a bitchslap script15:54
jamlamont: so why no concern over bzr-svn? Which has never been packaged for dapper15:58
lamontbecause that machine is running hardy.15:58
awilkinsOk, https://bugs.launchpad.net/bzr/+bug/30402316:03
ubottuLaunchpad bug 304023 in bzr "Autopack fails with err 17 "File Exists" on windows" [Undecided,New]16:03
awilkinsI've traced a fail and a success, and it looks like the success should be failing :-)16:03
lamontjam: and bzr should require more than just smackery for dapper, too.  py-support vs py-central16:04
jamlamont: that is already handled by someone else16:04
jam"has been handled"16:04
jamand yes it does16:04
lamontright16:05
jambuilding the "bzr" package is automated16:05
jambuilding bzr and bzr-svn still requires me to do a lot of manual steps16:05
jambecause they aren't built in the same way16:05
jambzrtools and bzr-svn are generally built from the debian package16:05
lamontyeah - bzr-svn just needs hardy, bzrtools needs dapper/hardy16:05
* awilkins has a roughly automated build script for either, maybe it could be done for both16:06
jamand the debian package doesn't support dapper16:06
awilkinsMy script is Powershell though, and rather specific to my environment at present16:06
jambecause of py-central versus py-support16:06
awilkins(on win32 at any rate)16:06
lamontyep16:06
jamalso, we run into weird problems with multiple-targets and "bzr builddeb" if you build from a bzr tree rather than from a tarball16:07
jambecause it rebuilds the tarball16:07
jamwhich causes the md5sum to change16:07
jamwhich causes it to fail to upload16:07
jametc16:07
jamwhich is partially why I do it manually16:07
jamas I build a tarball for the first time, and then re-use that tarball for all the others16:08
jamanyway, *right now* I'm on win32, which is a real pain for building packages :)16:08
jamIf you are stressing that getting bzrtools-1.10~dapper1  is very important for you I can do something about it16:09
jamlamont: What is your specific need/urgency/etc ?16:09
GPH-Laptopjml, fullermd: Are you around?16:27
=== barry is now known as barry-lunch
=== bac is now known as bac_uds
Peng_lifeless: brisbane-core uses more disk space right now, right? But that's because compression hasn't been optimized yet, and it will become significantly better than the current stuff, right?17:49
lifelessPeng_: yes, its more  disk space for the inventories17:59
Peng_Thanks for the confirmation.18:00
lifelessPeng_: massively less uncompressed18:00
Peng_What?18:00
Peng_That it's much smaller when not compressed?18:00
lifelessPeng_: the inventories inv development4 are about one 20th the size of the inventories in --1.9 *before compression*18:01
lifelessPeng_: but --development4 doesn't delta compress the inventories, just gzips, at the moment18:01
Peng_How good should they be when they're delta compressed?18:02
lifelessbetter than 1.9, but more than that I can't say18:02
lifelesswe have a feedback loop to do to tune them - the inventories may change to be more compressable, for instance18:03
pygipoolie, hey, could I poke for a sec? :)18:03
Peng_The inventories are much smaller when uncompressed, but what does that buy me as a user? On disk, they're always compressed.18:03
lifelessPeng_: bzr spends less time comparing the inventories between two revisions, so fetch, log -v, and other such commands have less work to do18:04
Peng_lifeless: Ah, that sounds good.18:04
pooliehello pygi18:04
Peng_Would memory usage be improved too?18:04
lifelessPeng_: yes18:04
seb_kuzminskyongoing svn->bzr switch saga...18:04
lifelessPeng_: e.g. mysql-server has a 1.7MB inventory, on average (in 1.9). So diff requires assembling 3.4MB of text, parsing it, then doing a full dict comparison between the objects18:05
seb_kuzminskyi've read the Bazaar User Reference, and i can see how to add a client-side post-commit email hook, but i'd prefer to do the email-sending via a single server-side post-commit hook i think18:05
seb_kuzminskythe developers all have login accounts on the server, and we use bzr+ssh to commit/push18:06
lifelessPeng_: in split-inv, we read a tree on demand, so we may only read 30 or 40 k of data - total.18:06
seb_kuzminskyis that possible somehow?  if so where's it documented?  ;-)18:06
lifelessseb_kuzminsky: it is possible; s piv made it so, I'm not 100% sure what-all is needed :)18:07
seb_kuzminskyhm18:08
seb_kuzminskyalso a post-commit hook to poke the buildbot would be nice18:08
lifelessseb_kuzminsky: spiv will be online in about 4 hours18:09
seb_kuzminskyok thanks lifeless18:09
lifelessseb_kuzminsky: but generally, try just insalling bzr-email on the server and see what happens :)18:09
seb_kuzminskyi tried that, now when i "bzr up" in my checkout (bound branch) i get this warning message:18:10
Peng_Errm, BTW, sorry about not getting around to the bzr search index thingy yet. I have been busier than usual, but mostly I'm just goofing off and being lazy. :\18:10
seb_kuzminsky/usr/lib/python2.5/site-packages/bzrlib/plugins/email/__init__.py:57: DeprecationWarning: bzrlib.branch.BranchHooks.install_hook was deprecated in version 1.5.18:10
seb_kuzminsky  Branch.hooks.install_hook('post_commit', branch_commit_hook)18:10
lifelessPeng_: no worries18:10
seb_kuzminskybzr 1.10rc118:10
lifelessseb_kuzminsky: did you install  bzr-email via package?18:10
seb_kuzminskybzr-email 0.0.1~bzr5 (Debian Sid's standard .deb)18:11
seb_kuzminskymaybe i should bypass debian and grab bzr & friends from lp18:11
seb_kuzminskyoops, typo, that' bzr-email 0.0.1~bzr25-1.118:11
seb_kuzminskywhatever that means ;-)18:11
seb_kuzminsky"bzr plugins" doesnt show a version number for email18:12
lifelessright the debian package is old18:14
lifelessfile a bug there asking for a new version to be packaged :P18:14
seb_kuzminskyok will do18:15
lifelessnow, for yourserver, you can probably just ap-tget source bzr-email18:16
lifelessgrab the bzr-email upstream (bzr branch lp:bzr-email)18:16
lifelessdrop the newer source on top of the debian source package, and rebuild it18:16
seb_kuzminskysorry, i had the "testing" version installed, there's a newer one in sid18:17
seb_kuzminskythe sid one is "bzr34"18:17
seb_kuzminskyfrom august sometime18:17
seb_kuzminskyi'll try that18:18
seb_kuzminskylooks like it's pretty close to top-of-tree bzr-email, it's just missing some test suite fixes18:21
=== evarlast_ is now known as evarlast
seb_kuzminskywith bzr-email r34 (from Sid) it no longer gives an error when committing :-)18:24
seb_kuzminskyhm, the "bzr help email" only talks about configuring client-side post-commit email-sending hooks18:27
seb_kuzminskyok i think i'm thinking about this wrong18:44
seb_kuzminskywe've been using subversion, but we're switching to bzr18:44
seb_kuzminskyi'm basically trying to replicate our existing svn infrastructure using bzr18:44
seb_kuzminskythe sticking points are server-side post-commit hooks18:45
seb_kuzminskyone for sending email on commit, and another for prodding the buildbot18:45
seb_kuzminskythis seems to be not well supported in bzr currently18:45
seb_kuzminskyso bzr admins must be using some other mechanism to accomplish something similar18:45
seb_kuzminskyin terms of workflow, we're using something like one of the "Centralized" flows, or "decentralized with shared mainline"18:46
seb_kuzminskyhow do others do this?18:46
lifelessseb_kuzminsky: how did you go?19:12
lifelessseb_kuzminsky: re: bzr-email docs, when the server runs the mail hook the *server* acts as the client19:13
=== RoninX341 is now known as etank
seb_kuzminskylifeless: i'm not there yet, but still trying :-)19:13
seb_kuzminskythe bzr-email hook runs in the server's copy of the branch, i get that19:14
seb_kuzminskybut where does it get its configuration from?  from the user who's running bzr, right?19:14
lifelessyou can configure it in branch.conf19:14
seb_kuzminskyhm19:15
* seb_kuzminsky is rereading the docs19:15
GPH-Laptopjml, fullermd: Are you around?19:18
seb_kuzminskyso it's ok to edit .bzr/branch/branch.conf?  the .bzr/README told me not to19:18
GPH-Laptopjam: What about you? You around?19:18
jamGPH-Laptop: absolutely not :)19:19
GPH-Laptopheh19:19
GPH-Laptopjam: Just wondering if you saw my response to your e-mail?19:19
jamI did19:20
GPH-LaptopI wasn't sure what poolie's response meant19:20
jamI would probably still be more in favor of writing out the plain fp if --null is given19:20
jamI don't think he fully understood19:20
jamI know I was wrong in thinking that it would give @, etc19:20
lifelessseb_kuzminsky: we're a little unclear about things; yes its ok to edit .bzr/branch/branch.conf19:20
seb_kuzminskyokay then :-)19:21
* seb_kuzminsky edits19:21
jamI'll go ahead and respond to the email so it is documented :)19:21
GPH-Laptopok, thanks :)19:22
GPH-Laptopjam: Also, any idea why I got an e-mail about not having voting rights?19:24
=== abadger19991 is now known as abadger1999
GPH-Laptopfrom Bundle Buggy19:24
jamI believe when you replied to me, it didn't properly "quote" my BB:resubmit vote.19:25
jamI'm not 100% sure ,though19:25
jamIt *looks* like your mail client is indenting the response, but not prefixing it with ">"19:26
GPH-LaptopAh19:26
GPH-LaptopAlright, I'll change to unformatted19:26
GPH-Laptopyou can thank Gmail for that ;)19:26
seb_kuzminskylifeless: now the server's .bzr/branch/branch.conf says this:19:26
seb_kuzminskypost_commit_to = seb@highlab.com19:27
GPH-Laptopjam: So, am I to make a change and resubmit?19:27
seb_kuzminskyand "bzr hooks" shows post_commit as bzr-email19:27
jamWe need 1 other person to approve it.19:27
lifelessseb_kuzminsky: that sounds good19:27
jamThe change is small enough that someone can do it for you19:27
seb_kuzminskyi'm not setting post_commit_mailer, so it should default to /usr/bin/mail19:27
jambut if you do it, it is easier on us :)19:27
lifelessseb_kuzminsky: yes19:27
seb_kuzminskyi can send myself email that way19:27
seb_kuzminskybut when i commit, i get nothing19:27
GPH-Laptopjam: Alright. Same way? bzr send -o?19:28
jamshould be fine19:28
GPH-Laptopjam: Can I just reply to that e-mail?19:28
jamas long as you attach a patch you can just reply19:28
GPH-Laptopokey doke19:28
jamBB should notice and mark the patch as superseding the previous one19:29
seb_kuzminskylifeless: my commits are happening (i can pull them)19:29
seb_kuzminskybut the mailserver logs on the bzr server machine show nothing going out, and the mailserver logs on the receiving side (highlab.com) see nothing coming in19:30
lifelessseb_kuzminsky: what bzr client and server versions do you have ?19:30
seb_kuzminskythe server is 1.6.1, with bzr-email r3419:30
seb_kuzminskyer, the server is 1.10rc1, with bzr-email r3419:31
seb_kuzminskysorry19:31
seb_kuzminskythe client is 1.6.119:31
lifelessI think you need a newer client19:31
lifelesslet me check19:31
seb_kuzminskylifeless: why should the client version matter?  isnt it the bzr on the server doing this work (the client commits on a bound branch)19:33
lifelessseb_kuzminsky: older clients do more things via the VFS than via RPC calls19:36
pooliehell jam19:36
jami'm sorry poolie, I didn't mean to upset you :)19:36
seb_kuzminskylifeless: gotcha19:36
lifelessseb_kuzminsky: so 1.6 looks like it should be ok19:37
lifelessseb_kuzminsky: I'm not sure whats wrong, digging19:37
mwhudsonso i have a bazaar install which is doing annotates (at least) REALLY slowly19:38
pooliehella jam dude19:38
mwhudsonall the c extensions are built now, though it's possible they're not being used for some stupid reason19:38
mwhudsonhow can i debug this?19:38
seb_kuzminskylifeless: i committed in a bound branch on the server, and it sent out the email19:39
jammwhudson: how slow is slow? And what version of bzr?19:39
jamWe had a fix recently19:39
pooliemwhudson: press C-\ in the middle of the annotate and look at where it is19:39
poolieand what he said19:39
jambzr 1.919:39
lifelessseb_kuzminsky: ah!19:39
mwhudsonjam: ah, maybe it's just relative age, indeed19:39
mwhudsonthe slow one is tiocsctty19:39
mwhudsonno19:39
mwhudson1.7.1rc119:39
mwhudson(fricking x clipboards)19:39
jammwhudson: so bzr 1.6 introduced a regression19:39
jamwhere we weren't using the stored values19:40
jamwe fixed that in bzr 1.919:40
mwhudsonjam: ok, that went easily then19:40
mwhudson(glad i asked!)19:40
seb_kuzminskyis there a preferred way to install a newer bzr on Intrepid?  backports doesnt have anything.  a PPA maybe?19:42
mwhudsonyes, the "bzr" ppa19:42
seb_kuzminskythanks mwhudson19:42
lifelessseb_kuzminsky: ok, its because bzr-email uses the post_commit hook19:43
pooliejam, i started on a namedtuple-like object19:43
poolieand am trying to get it to pass tests in dirstate.py19:43
pooliecurrently just written in python19:43
poolieit certainly looks better19:43
lifelessseb_kuzminsky: could you please file a bug, that it should support [optionally] using post_change_branch_tip as well, with an option to enable that19:43
seb_kuzminskylifeless: instead of the post-tip-change hook19:43
seb_kuzminskylifeless: ok will do19:43
pooliewe'll have to see if it's possible to make a C version comparably fast to Py_Tuple19:43
lifelessseb_kuzminsky: it can't just swithc over, because 'pull' locally shouldn't usually email :)19:44
jamsounds interesting19:44
GPH-Laptopjam, poolie: Any idea why all packages aren't available for 1.10 yet?19:45
jamGPH-Laptop: what packages are you looking for?19:45
jampoolie: I would imagine you could get close, with the exception of anything that is folded into the interpreter directly19:46
jampoolie: the other question would be what the overhead of using the named arguments instead of the offset19:46
seb_kuzminskylifeless: is it similar to this: https://bugs.launchpad.net/bzr-email/+bug/25093419:46
ubottuLaunchpad bug 250934 in bzr-email "bzr-email should support email on push" [Wishlist,Triaged]19:46
lifelessseb_kuzminsky: oh, identical - thats fine19:47
GPH-Laptopjam: Mac OS X 10.419:47
seb_kuzminskydomo arigato mr ubottu  ;-)19:47
poolieheh19:47
pooliejam, good question19:47
GPH-Laptopjam: Hey, by the way, looks like I made a boo-boo on my last commit message.19:48
jamSince i believe it will be implemented as "name => offset => get" there will obviously be *some* overhead19:48
pooliei might leave this angle of getting the python impl to pass and instead write up the C version and do some microbenchmarks19:48
jamGPH-Laptop: the Mac installers are built by the community, so someone just has to wake up and do it.19:48
GPH-Laptopjam: It kinda expanded my "`bzr ls`" to be the contents of the current directory.19:48
GPH-Laptopjam: Ah, OK19:48
pooliejam, what do you mean by "name => offset => get"19:49
* Peng_ points out that there are already namedtuple implementations out there.19:49
GPH-LaptopIs there a command to change the commit message?19:49
Peng_GPH-Laptop: No.19:49
jamGPH-Laptop: bzr uncommit; bzr commit -m "new message"19:49
Peng_I -- yeah, what he said.19:49
GPH-Laptopalright19:49
GPH-Laptopshould I resubmit again?19:49
jamyou can't really change one after-the-fact19:50
jambut you can regenerate the commit19:50
jamif it is important to you, you can email it to me19:50
Peng_If it's just a typo, it's not worth fixing (you should look at bzr.dev's history...)19:50
GPH-LaptopPeng_: It kinda contains the contents of the directory instead of just the name of the command ;)19:51
pooliePeng_: in C?19:51
GPH-LaptopAlright, I'll be back later.19:53
Peng_GPH-Laptop: Heh, nice.19:53
pooliePeng_, there is http://svn.python.org/projects/python/trunk/Objects/structseq.c but it's not exposed in python19:54
GPH-Laptopjam: Alright, new patch sent.19:54
GPH-Laptopadieu19:54
Peng_poolie: Ah... Never mind, then, I gues.s19:55
poolieit would be nice if there were19:55
pooliei thought that 2.6 namedtuples19:55
jamPeng_: IIRC 2.6 does have a namedtuple class19:55
jambut it is *really* crummy19:55
pooliewould do this directly, but in 2.6.0 they're slower than objects19:55
jamit is a pure-python class19:56
jamand does things *really* weird19:56
jamlike using "eval()"19:56
poolieafter thinking about this a bit more, i'm not convinced they should be tuple subclasses19:56
poolieor more precisely, "should provide the tuple protocol"19:56
Peng_jam: Yeah, it's pure Python, and uses exec.19:56
jamthe reason we *use* tuples is because they are very fast to create19:57
pooliebut we could use Py_StructSeq, unless we can do something faster19:57
jamso named tuple breaks that19:57
poolieso being able to index things by ints, or iterate them, or take the length, when they're not conceptually sequences, is a bit of a bug source19:58
seb_kuzminskylifeless: i installed bzr 1.10 on my client & still no email when i commit, is that expected from the bzr-email hook hooking in the wrong place?20:00
lifelessseb_kuzminsky: do you mean commit or push?20:01
lifelessjelmer: ping20:06
lifelessseb_kuzminsky: I've uploaded draft code to mail on push/pull for you, to http://bazaar.launchpad.net/~/bzr/bzr-email/trunk20:10
pygipoolie, ups, sorry, I was out to eat :)20:12
=== elmo_ is now known as elmo
poolienp20:26
seb_kuzminskylifeless: wow, thanks for the draft code!!20:33
seb_kuzminskylifeless: the client has a heavy checkout (a bound branch), and i did commit in there, and it didnt email me20:33
seb_kuzminskyi'll try again with your new code, thanks!20:33
seb_kuzminskylifeless: aww yeah!!20:43
=== thumper_laptop is now known as thumper
seb_kuzminskythank you20:43
lifelessseb_kuzminsky: my pleasure20:56
=== sdboyer is now known as sdboyer|finals
Oli``I'm currently using one big bzr repo for all my website projects. I'm a few days down the road now and 3 sites in and it's already pretty slow to work out commits. Is it possible to split these 3 directories into their own repos (keeping, if possible, ignore settings and revision info from the existing repo)21:34
luksis it a big repo or a big branch?21:35
Peng_I doubt the repo is making a significant difference.21:35
Peng_Well, some, but..21:35
Oli``yeah I'm probably using the wrong terminology... I typed bzr init. made 3 directories inside with all the site files in each of those and that's where I am =)21:36
Peng_Oh, one big branch.21:36
Oli``Peng_: does that make a difference to what you said?21:38
Peng_Oli``: Yes. Committing requires the entire working tree to be scanned for changes, so obviously the size of the branch matters.21:42
Peng_But that probably doesn't happen if you run "bzr commit some_file", and you might be experiencing slowness for other reasons too.21:42
Peng_Oli``: What version of bzr?21:42
Oli``1.1021:43
Oli``Ubuntu PPA, I believe21:43
Peng_Oh.21:43
Peng_I was hoping it was some really old version, so upgrading would make everything much faster. :P21:43
lifelessOli``: generally, we'd say one branch per project :)21:43
Oli``lifeless: yeah I was being lazy to see if I wanted to stick with bzr21:44
lifelessOli``: if they are all one website, one branch is fine, but if they are for different VHosts it reallu doesn't make sense to use one branch21:44
lifelessOli``: bzr commits should not slow down noticably under about 5000 files21:44
Oli``hmm.. they're each only about 30 files each =\21:44
Peng_Oli``: Would any of the files happen to be gigantic?21:45
lifelessOli``: are you committing .iso files or similar ? :)21:45
Oli``nope. python source files, jpeg images (small, sub-200k)21:45
Oli``css, javascript, nothing scary21:45
lifelessOli``: can you do 'time bzr st'21:45
LarstiQOli``: are you using a checkout against a remote machine, or a local branch?21:47
lifelessOli``: oh, also 'bzr inventory | wc -l'21:47
Oli``LarstiQ: both but --local seems pretty slow too22:01
Oli``sorry I had a phone call22:01
Oli``0.844s was the real result for time bzr st22:01
Oli``bzr inventory | wc -l = 15222:02
Oli``Perhaps I'm imagining things (or expecting things to run at light-speed) but for the sake of correctness, I probably aught to split things up while I'm only dealing with 3 projects...22:04
Oli``Is it going to be more hassle than its worth trying to keep the current history? Should I just juggle things around and create three new branches?22:04
Peng_Oli``: Well, you might be able to use "bzr split" to spin off each directory into its own branch, though they'll all contain the full history up until this point.22:07
Peng_I think.22:07
* jml beats combine-thread repeatedly22:08
lifelessOli``:22:18
lifelessOli``: 'time bzr commit -m 'unchanged' --allow-unchanged'22:18
Oli``no such option --allow-unchanged22:19
Oli``but --unchanged exists22:19
Oli``1.1s22:19
lifelessOli``: that is a bit slow. How did you install bzr?22:20
Oli``from the ubuntu repo.. then upgraded to the PPA version22:20
lifelessOli``: 'python -c "import bzrlib._dirstate_helpers_c"22:25
mark1igc: woohoo - welcome back :)22:33
=== mark1 is now known as markh
mwhudsonrevision-info should take a -d argument22:34
pygijml, in 10 minutes?22:58
jmlpygi: sure.22:58
=== beuno_ is now known as beuno
seb_kuzminskyi'm trying to use bzr 1.10rc1 to provide read-only anonymous access to my repo23:09
seb_kuzminskyi'm starting it from inetd like this:23:09
seb_kuzminskybzr stream tcp nowait nobody /usr/bin/bzr bzr serve --directory=/data/bzr --inet23:09
lifelessseb_kuzminsky: the easiest way is just to put the repo up on http ;)23:09
seb_kuzminskylifeless: i had a feeling you'd say that :-)23:10
lifelessseb_kuzminsky: easier for folk beind firewalls and so on23:10
seb_kuzminskyit's an internal server23:10
seb_kuzminskythe only user will be our buildbot23:10
seb_kuzminskyall the devs access it via bzr+ssh23:11
seb_kuzminskyso the firewall is not an issue for us23:11
seb_kuzminskywhen i telnet to the bzr port on the server, inetd starts bzr like i tell it to, but then the bzr server says:23:12
seb_kuzminskyNo handlers could be found for logger "bzr"23:12
Peng_That's just a warning..23:12
seb_kuzminskyif i say "bzr ls bzr://server", it says:23:12
seb_kuzminskyServer does not understand Bazaar network protocol 3, reconnecting.  (Upgrade the server to avoid this.)23:12
seb_kuzminskyServer does not understand Bazaar network protocol 2, reconnecting.  (Upgrade the server to avoid this.)23:12
seb_kuzminskybzr: ERROR: Generic bzr smart protocol error: Server is not a Bazaar server: Received bad protocol version marker: 'No handlers could be found for logger "bzr"\n'23:12
Peng_Heh.23:12
seb_kuzminskyboth client and server are 1.10rc123:12
Peng_Oh. I guess the warning gets in teh way.23:12
Peng_bzr likes to log to ~/.bzr.log. If it's being run as some user that can't, I guess it will emit the warning.23:13
seb_kuzminskyoh i see23:13
seb_kuzminskyi'm running it as nobody23:13
seb_kuzminskyi'll try running it as me, hold on23:13
Peng_Can you set the environment variable BZR_LOG (to a writable file, or /dev/null to suppress logging)?23:13
Peng_IMO, that's a bug that the logging warning breaks the smart server..23:14
seb_kuzminskysounds like a bug to me ;-)23:14
seb_kuzminskyif i run it as me it works fine23:14
seb_kuzminskyi'll see if i can convince inetd to do like you suggest23:14
seb_kuzminskydo you want me to open a bugreport?23:14
Peng_I think so (if there isn't already one!)23:15
seb_kuzminskyeven "bzr serve -q" gives that error23:15
seb_kuzminskyPeng: i think there's no way to tell inetd to doctor the environment of the programs it runs23:17
seb_kuzminskyi could write a wrapper...23:17
Peng_Ah. I don't know what you should do, then. It would be a really trivial wrapper.23:18
seb_kuzminskyhttps://bugs.launchpad.net/bzr/+bug/12903023:18
ubottuLaunchpad bug 129030 in bzr "Bzr inetd smart server requires write access on the user's home directory" [High,Confirmed]23:18
Peng_Oh, nice.23:19
Peng_Less than 1.5 years old! :P23:19
seb_kuzminskyhttps://bugs.launchpad.net/bzr/+bug/10611723:20
ubottuLaunchpad bug 106117 in bzr "bzr serve should log somewhere other than ~/.bzr.log" [Low,Confirmed]23:20
seb_kuzminskythose two look related to this problem, i dont see any other bugs that seem related23:23
jamlifeless: you may be interested to know that I've been able to tweak the old Inventory deserialization to the point that fetching 1.9 => chk for mysql  seems to be spending 78% of its time in CHKInventory.create_by_apply_delta23:24
jamalso, your page cache helps a *lot*23:26
lifelessjam: thats cool23:26
lifelessjam: how fast is it?23:26
jamif only apply_inventory_delta re-opens the base tree each time23:26
jamlifeless: I got to 34k revisions after 15k seconds23:26
lifeless2/sec?23:27
jamapproximately23:27
jamI just stopped it because I wanted to do an lsprof now that we are further along23:27
lifelessso, we need to make create_by_apply_delta faster :>23:27
lifelessjam: pick three reviews you need and link em here please23:27
jamI'm also seeing "52.009MB => 13.017MB"23:27
jammy update to your commit builder patch: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C493C0839.10808%40arbash-meinel.com%3E23:28
jamThe follow-on interdiffering serializer patch: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C493C0958.9010704%40arbash-meinel.com%3E23:28
jamThe rest of what I've been playing with is not in a mergeable state. But if you get those, then I have a patch which merges the new code from bzr.dev back into the chk branch.23:29
jamWhich resolves some conflicts, etc.23:29
jamSince you approved the FIFO code, I can go ahead and offer a bzr.dev patch using that for XML deserialization23:30
jamthat is at least worth reviewing for conceptual merit23:30
jamlifeless: Anyway... I'm thinking that flattening the trie will actually help the create_by_apply_delta a lot.23:31
jamI don't have much better answers, as the time is partially spent in "serialize"23:31
lifelessjam: k23:31
jamand I've already worked out that merge revisions are pretty much always going to get collisions23:31
lifelessjam: so, parameterised key-transforms ++23:32
lifelessI think that that is a good thing to do23:32
lifelessI think we should consider/do a C serializeer and parser very soon23:32
seb_kuzminskyPeng: works fine with the little wrapper we talked about, with BZR_LOG=/dev/null23:33
Peng_seb_kuzminsky: :)23:33
seb_kuzminskyi also added a comment to one of those bug reports, and suggested merging them23:33
jamlifeless: well, as significant amount of time is in the Index code23:34
jam100s / 300s for converting 100 revs23:34
jam(though from scratch, so nothing is paged in already)23:34
jam(under lsprof)23:34
lifelessjam: ok, index tuning to do too then23:34
lifeless:)23:34
jam279k calls to _KnitGraphIndex._get_entries23:35
jamwhich seems like a bit much versus only 100 revisions23:35
lifelessI'd add a tracer for that23:36
jam25k calls to get_parent_map => 194k calls to _get_entries23:36
lifelessmeep23:37
jam17k calls to get_build_details => 54k calls to _get_entries23:37
jamget_entries is an iterator, so that is how many records we are *reading* not the actual number of calls23:37
jambut even 25k calls to get_parent_map is 250 calls per revision23:38
jamI suppose some of that may be the "_walk_to_common_revisions" code23:39
jamwhich has to go pretty far back23:39
seb_kuzminskyaaahhhhh: https://launchpad.net/bzrbuildbot  :-)23:39
jambut there *are* 16.5k calls to "add_records" which hints that we are adding 165 pages per revision23:39
lifelessjam: what project?23:40
jammysql23:41
jamAnd I'm guessing 50-75% of those are collisions23:41
seb_kuzminskyhm, but they have no code or anything  :-(23:41
jamlifeless: oh and one more. http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C493EF306.6000906%40arbash-meinel.com%3E23:42
jamIt is a trivial update to the earlier LRUCache update23:42
Gwaihiris there a bzr 1.10 package for lpia architecture?23:46
lifelessGwaihir: I'm not sure, it will depend if the ppa builds lpia automatically I suspect23:47
jamGwaihir: should be23:47
jamit usually builds i386, amd64, lpia23:47
lifelessjam: all reviewed23:48
jamlifeless: thanks23:48
Gwaihirlooks like the package is present, but if I add the sources.list entry it complains that it's not possible to find the lpia architecture23:53
jamlifeless: quick question... if we are walking in topological order. will a merge revision actually usually follow the right-hand parent?23:53
Gwaihiranyway... thx, found the package23:53
lifelessjam: rephrease/more detail please23:54
jamputting together a paste, just a sec23:54
jamhttp://paste.ubuntu.com/83214/23:55
jamIf you have the simple merge graph23:55
jamand you topo_sort23:55
jamlifeless: the idea is that mysql is merging the 5.1 branch into 6.023:55
seb_kuzminskythanks again lifeless and Peng_, see you later23:55
jambut the InterDifferingSerializer code will see the 5.1 as the "basis" versus 6.023:56
jamwhich causes us to create a delta of all of 5.1 versus 6.023:56
lifelessjam: topo_sort has no preferennce between B and C23:56
lifelessDCBA and DBCA are both valid IIRC23:56
jamlifeless: what about: http://paste.ubuntu.com/83217/23:57
jamI'm also more concerned with the output of "tsort.topo_sort" than the definition of "topologically sorted" :)23:57
jamAnyway, my point is that C=>E and E=>G may be small changes, but B has lots of changes23:58
jamand if we use all of C, E, G as the base23:58
jamthen each delta includes the changes from B23:58
jamwhich is why we are getting so much redundancy in the conversion23:58
jamarg..... python2.4's collections.deque doesn't have a ".remove()" attribute23:59

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