[01:07] does 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 incomplete [01:09] Gilgad: last I checked that feature hadn't been worked on in a year [01:10] ouch [01:10] i guess thats why i can't find anything more recient than 0.15 [01:11] It sure would be nice to have :) [01:13] agreed, 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 organization [01:14] yep, svn:externals == nested trees [01:14] You could do something similar, sort of, by doing a lot of one-way merges. [01:14] What is a one-way merge? [01:15] Put the config modules in different branches, then merge each into host branches. It's not the greatest approach, but it can work. [01:16] but when happens when i want to commit a change [01:16] as in, isn't the merge a one time thing [01:16] Basically, commit on the module branch, then re-merg. [01:16] merge, even. :) [01:16] hmm [01:16] I really haven't found a good way to use bzr for $HOME. [01:17] what do you use? or nothing? [01:17] At least, if I want to share parts of a config across multiple hosts and have localized changes on each. [01:17] I'm using svn. [01:17] yea [01:17] mm, aparently svn would work, but i don't have a place to set up a server [01:17] i mean, i guess there are free services [01:18] but i like that i can have my repo be just files on another system [01:18] i just use my universities unix access to store it on my space there [01:19] Any host you have ssh access to should work. [01:20] for svn? [01:20] svnserve daemon would also work, no? [01:20] note my above admission that i know little about vcs in general [01:23] Heh, I just perked up because someone said my name. :) [01:32] jml, around or busy? [01:48] pygi: just having lunch === bla5362627 is now known as pygi [01:50] jml, when you come around, please poke ;) thx [01:50] hopefully I wont be sleeping [01:51] pygi: ok if I poke you tomorrow morning my time? [01:51] jml, probably, but we should finish it then :) [01:51] yes [01:51] because Douglas needs to work on contracts [01:51] *nod* [01:51] anyway, have fun :) [02:45] If 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:46] AfC, why not? :) [02:46] HI abentley [02:46] Hm. Or it could just be that their "server" is insanely slow and underpowered. [02:47] url? Perhaps I can try? [02:47] probably wont help tho :D [02:48] pygi: svn://svn.xmlroff.org/trunk/xmlroff [02:48] ups, no bzr svn here :/ [02:48] * pygi looks into it [02:49] * AfC has to run, but if works ok for you then I'll try again from a different uplink [02:49] kk [02:54] pygi: hi === mwhudson_ is now known as mwhudson [06:39] Is there a way to get a print out of the directory structure in a repository? [06:46] ls? 8-} [06:47] (which is to say, you're probably asking either too little or too much; what's the goal?) [06:48] Do 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:50] awmcclain: https://lists.ubuntu.com/archives/bazaar/2007q3/027560.html ? [06:51] I already set the repo branch to 2770 [06:51] repo dir [06:51] :-\ [06:51] ohhhh [06:51] let me try doing it one level down [06:52] fullermd: Oh, you're back. Yay! [06:53] fullermd: 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] Or am I asking too much [06:53] ? [06:54] Also, what's with the delay in packaging 1.10? [06:54] GPH-Laptop: possibly UDS? [06:55] spiv: drwxrwsr-x 14 clownfish dev 4096 Dec 8 16:22 andrew [06:55] jml: Sorry, UDS? [06:55] GPH-Laptop: the Ubuntu Developer Summit that's going on right now. [06:55] ah [06:55] wasn't aware of that [06:56] GPH-Laptop: I haven't been tracking the 1.10 release closely, so it might not be the case [06:56] fwiw, Gentoo Linux has got bzr 1.10 packaged. Great to see them so on top of things. [06:56] jml: Doesn't look to be much more than source and Mac OS X 10.5 [06:56] unfortunately, I'm on 10.4 ;) [06:57] GPH-Laptop: Do you actually mean the structure of a [shared] _repository_? Or do you mean of a branch? [06:58] For a branch, there's always `bzr ls` and its various options. [06:58] fullermd: Um... probably a shared repository, but either should do. [06:58] Yup, that does it. [06:58] Thanks [06:59] There's nothing in bzr to list _repositories_ as such (at least, not at the UI level), since they're not treated as semantic units. [07:03] Alright... but an up-to-date branch serves just as well. [07:04] fullermd: Any reason why directories don't have a trailing slash? [07:05] Well, the flip answer is "because that's how it was written" :) [07:05] I don't know if there was an intentional choice to not have them, or whether it "just happened" to be so done. [07:06] GPH-Laptop: any reason why they should? [07:08] Well, there's "because it's conventional". [07:08] fullermd: only in some conventions :) [07:08] Well, in the ones that are Right And Proper, of course. ;) [07:09] jml: There's no other way to differentiate between files and directories (ignoring file extensions, of course) [07:10] GPH-Laptop: not visually, no. but why is that useful? [07:12] jml: 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] I would, particularly if I'm copying the list to paste it somewhere else. [07:13] regular ls at least has a mode for that, if not the default action [07:14] GPH-Laptop: 'bzr ls -v' prints trailing slashes. [07:14] * fullermd could really get to hate '-v' sometimes... [07:14] but it also prints "V" in front of every line... what does that even mean, anyway? [07:15] It'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] GPH-Laptop: "Versioned" presumably. [07:15] GPH-Laptop: whether the file is versioned or not. [07:15] I still haven't come across a circumstance where I *care* whether a thing is a file or not. [07:16] jml: But I didn't ask it that question. I just wanted a list of files and directories. [07:16] GPH-Laptop: which question? [07:16] (which _will_ be the only option when ls is run on a branch without an [accessible] working tree) [07:16] whether the file is versioned [07:16] GPH-Laptop: are you using a Unix? [07:16] jml: Mac OS X [07:16] Yes. Other possiblities are 'I' for ignored, and '?' for unknown. [07:18] GPH-Laptop: bzr ls -v -V | cut -c 10- [07:18] GPH-Laptop: I *think* cut on OS X is close enough for GNU cut to work [07:19] wow... that was way too complicated [07:19] but yes, it did work [07:19] GPH-Laptop: feel free to file a bug report or post to the mailing list to ask for this behaviour [07:19] not that I needed it... my file structure is currently small enough that I could just add the slashes myself (thanks, though) [07:19] GPH-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:20] spiv: OK. I just might do that. [07:20] GPH-Laptop: it doesn't sound unreasonable, although it does sound like something that will inspire some bike-shedding... [07:20] bike shedding, hooray! [07:21] spiv: I didn't mean to start any arguments. I'm just saying what _I'm_ looking for. ;) [07:21] GPH-Laptop: sure. I'm glad you're letting us know what you want :) [07:22] spiv: I'm glad you're willing to listen. :) [07:29] jml, fullermd, spiv: https://bugs.launchpad.net/bzr/+bug/306424 [07:29] Launchpad bug 306424 in bzr "Add trailing slash to directories in `bzr ls` output" [Undecided,New] [07:29] oh [07:29] heh [07:32] OK, another question [07:33] If I branch the bzr development branch, can I run the bzr script from that branch [07:33] that is, the modified one? [07:35] GPH-Laptop: yes. [07:35] GPH-Laptop: /path/to/that/bzr should just work [07:35] jml: OK, thanks [07:35] GPH-Laptop: that's how bzr developers run unit tests and the like [07:36] Is all the code just in that one bzr file? [07:36] hell no [07:36] I didn't think so [07:36] bzrlib/ has all of the code in it. [07:36] I guess I'm just looking at Launchpad wrong [07:38] 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:39] drew_: Per branch, I believe [07:39] but I'm nowhere near an expert yet ;) [07:40] Is Launchpad acting up for anybody else? [07:41] GPH-Laptop: not for me. [07:41] GPH-Laptop: are you looking at the branch browser or at launchpad proper? [07:41] " Sorry, there was a problem connecting to the Launchpad server. " [07:41] for example, http://bazaar.launchpad.net/~bzr/bzr/trunk/revision/3883 [07:42] right, the code browser [07:42] yeah [07:44] GPH-Laptop: ty, guess it's time to actually figure out this whole version control thing :) [07:45] drew_: Yeah. fullermd patiently helped me when I first got started with bzr... not to put any pressure on him, though ;) [07:46] It'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:47] :) 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 PDMWorks [07:47] Hm, never heard of THAT one [07:47] solidworks revision and workflow control [07:47] fullermd: I suppose you can count me in on that one. ;) [07:47] Aha [07:48] Now I have to learn Python, too... :P [07:48] ty again, guess it's time to get a scotch and see what i can break :) [07:49] * fullermd rubs his hands together and cackles. [07:49] lol [07:49] drew_: excellent idea [07:49] OK... first I have to figure out where the ls code is located... [07:49] * jml goes off to consort with enemy languages. [07:49] THEN, I can learn Python :P [07:49] GPH-Laptop: you trying to fix that bug you just filed? [07:49] jml: I was gonna look into it, yeah [07:49] * fullermd keeps on working on some perl :p [07:49] * GPH-Laptop does PHP [07:50] That's what I get paid for most of the time. [07:51] GPH-Laptop: feel free to ask me any questions [07:51] jml: I kinda just did. ;) [07:52]

OK... first I have to figure out where the ls code is located... [07:52] ;) [07:52] GPH-Laptop: oh right. [07:52] GPH-Laptop: so, bzrlib/builtins.py has all of the built in commands [07:52] ah [07:52] GPH-Laptop: like 'ls' [07:52] OK [07:53] Search in it for cmd_{whatever_command} [07:53] GPH-Laptop: there'll be a class called cmd_ls or something like that. [07:53] ugh... Launchpad is being naughty again [07:53] * fullermd accidentally glances at the 'ls' code. [07:54] if non_recursive and '/' in fp: [07:54] That's efficient :p [07:54] jml: Loggerhead is being stubborn again. [07:55] GPH-Laptop: I'll pass it onto the OSAs. [07:55] jml: K, thanks. [07:55] GPH-Laptop: url please? [07:57] jml: http://bazaar.launchpad.net/~bzr/bzr/trunk/annotate/3883?file_id=builtins.py-20050830033751-fc01482b9ca23183 [07:57] It's on a URL-specific basis? [07:57] GPH-Laptop: well, it's working for me. [07:57] annotating files with complicated history takes ages :/ [07:58] this one is a bazaar problem not a launchpad problem, really [07:58] yeah. [07:58] is there a way to view it non-annotated? [07:58] you can download it [07:59] GPH-Laptop: if you want to get a local copy of the whole branch, 'bzr branch lp:bzr' [07:59] ...without having to download it? ;) [07:59] jml: Alright, I might do that [07:59] that said [07:59] GPH-Laptop: 'bzr cat http://bazaar.launchpad.net/~bzr/bzr/trunk/bzrlib/builtins.py' might get you the file though. [07:59] annotating builtins.py locally takes a few seconds [07:59] but it would be useful to have the features of ViewVC [07:59] so something funny is going on [07:59] * GPH-Laptop <3 ViewVC [08:00] jml: Nah, that's fine. I'll just do the whole branch. [08:00] GPH-Laptop: well, you can get all of those features with the bzr client [08:00] GPH-Laptop: although the colors are less pretty :) [08:00] heh [08:01] jml: Hmm... slow... [08:01] should I have run an init or something first? [08:01] GPH-Laptop: it's got a biggish history. [08:01] GPH-Laptop: no, not really. [08:01] OK [08:02] I have a feeling it's going to take a long while before I get the hang of this :P [08:02] So get used to me ;) [08:02] GPH-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] GPH-Laptop: no worries. [08:03] bzr-branches being my current directory, or what? [08:03] GPH-Laptop: bzr-branches being a new directory that will be a shared repository of all your branches of bzr itself [08:04] GPH-Laptop: you can call it susan if you really want. [08:04] how is that related to the directory I just did `bzr branch lp:bzr`? Should I issue them in the same directory? [08:04] Heh [08:04] GPH-Laptop: so, the directory that you're in now isn't special (unless you've already done init-repo) [08:05] I may have a bit upstream... I don't recall [08:05] would that matter? [08:05] GPH-Laptop: what does 'bzr info' say? [08:05] not a branch [08:06] GPH-Laptop: ok. so it's just a boring old directory. [08:06] GPH-Laptop: you want to make a directory like ~/Projects/bzr or whatever you prefer [08:06] GPH-Laptop: that will hold all of the branches that you make of bzr itself [08:06] GPH-Laptop: but you make that directory using 'bzr init-repo' [08:06] ~/Development/bzr/bzr/ [08:06] is where it is [08:07] And, of course, it just created another bzr [08:07] GPH-Laptop: so that the branches share their revision data. [08:07] so ~/Development/bzr/bzr/bzr/ [08:07] OK, 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] GPH-Laptop: heh. is that 'bzr branch' command finished? [08:07] yeah [08:07] So, something like [08:08] cd ~/Development/bzr ; bzr init-repo . ; mv bzr/bzr bzr.dev ; bzr reconfigure --use-shared bzr.dev [08:08] (or call it 'trunk' instead if you prefer) [08:08] right. what fullermd said. [08:08] (and then that extraneous 'bzr' dir can be tossed too) [08:09] and then, to work on your bug fix, go 'bzr branch bzr.dev trailing-slash-bug-306424' (or whatever) [08:09] well... 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] Ah, in that case, yah. [08:10] so I should have ~/Development/bzr/bzr/bzr.dev/? [08:10] * fullermd nods. [08:10] OK [08:11] That'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] "bzr/bzr/bzr" sounds a bit swedish chef-like! [08:11] * fullermd swats at the fly. [08:11] lol [08:11] ok [08:12] spiv: make a dvcs called "Shantih!" and make us all happy [08:14] Or maybe "Beetlejuice" :p [08:15] And then I can run ~/Development/bzr/bzr/bug-306424-ls-trailing-slash/bzr to test? [08:15] GPH-Laptop: yep [08:15] cool [08:15] GPH-Laptop: another thing you may be interested in... [08:15] yeah? [08:16] GPH-Laptop: bzrlib has a lot of unit tests [08:16] Will I need to change them? [08:16] GPH-Laptop: you might want to add one or two. [08:16] Oh, OK [08:17] one step at a time, though ;) [08:17] GPH-Laptop: "./bzr selftest" will run all of them. [08:17] alright, I'll keep that in mind [08:17] GPH-Laptop: and './bzr selftest test_ls' should run the ls ones [08:17] cool [08:17] (which live in bzrlib/tests/blackbox/test_ls.py) [08:17] k, got it [08:18] Running all of them will take some time :p [08:20] Is there a good place for python docs (commands) like there is at php.net? [08:21] * fullermd shrugs. [08:21] heh [08:22] Start from python.org and follow likely links. There are some within a click or two. [08:22] ok [08:23] What is PyQt4? [08:25] GPH-Laptop: it's Python bindings to Qt version 4. Qt is a graphical widget toolkit, used by KDE and others. [08:25] the unit test failed because I don't have it [08:26] GPH-Laptop: I'm sceptical. [08:26] GPH-Laptop: can you paste the command you ran and the output to paste.ubuntu.com (or the pastebin of your choice) [08:28] jml: http://gphemsley.pastebin.com/d6a1a95dd [08:29] GPH-Laptop: ./bzr --no-plugins selftest test_ls [08:29] night all [08:29] igc: g'night :) [08:30] igc: good to see you back :) [08:30] thanks jml [08:30] jml: Yup, that did it. Thanks. [08:30] igc: Good night stranger. :P [08:30] GPH-Laptop: one of your installed plugins requires PyQT [08:31] interesting... how come I didn't know that before? [08:31] Alien mind control rays. [08:31] and how come I don't have it? [08:31] GPH-Laptop: dunno. [08:31] GPH-Laptop: 'bzr plugins' will list the plugins that bzr can find that work [08:32] hmm... you think it's qbzr? :P [08:32] GPH-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 problem [08:33] vila: Indeed. [08:34] GPH-Laptop: the quicker part, the plugin part or both ? [08:35] both [08:35] Adding --no-plugins will also work around the plugin problem. (But I know vila gets sad when people do that...) [08:35] spiv: :-) [08:35] heh [08:36] spiv: try writing a plugin that you want to use to run selftest and you'll quickly get sad too :-) [08:36] I'm sad about being hungry. [08:36] Dangit, you had to mention hungry... [08:37] spiv: like, for example, plugging a real hpss server in the test framework :-P [08:37] or even an instrumented one :) [08:37] vila: I don't follow that example, currently there's both real and instrumented hpss servers in the test suite... [08:38] spiv: by the way, any idea about how to fix FAIL: branch_implementations.test_sprout.TestSprout.test_sprout_preserves_kind(BzrBranchLoomFormat6) [08:38] 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 rather than [08:38] spiv: say you want to test an older hpss server then [08:38] (too many real, really; most of the tests that start a TCP server and a thread don't really need to...) [08:39] spiv: right, that was just *one* example [08:40] but plugging *real* servers into the test framework is still the best way I know of to check bzr compatibility [08:41] (even if I understand that you're referring to writing simpler tests) [08:41] s/simpler/more focused/ [08:41] vila: possibly by deleting the clone method from loom.branch.LoomSupport ? [08:43] jml: Oh... bzr files indent with spaces... [08:43] vila: does that test even exist in current bzr.dev? [08:43] GPH-Laptop: these days, almost all Python does [08:43] jml: Oh, really? [08:43] GPH-Laptop: well, all sane Python :) [08:43] spiv: isn't it the one you hack with jam ? [08:44] $ grep test_sprout_preserves_kind bzrlib/tests/branch_implementations/test_sprout.py | wc -l [08:44] 0 [08:45] GPH-Laptop: indent with four spaces. there's a hacking guide in doc/developers/HACKING.txt [08:45] GPH-Laptop: (and lots of other juicy docs in the same dir) [08:45] jml: Oh. Probably should have looked for that first. [08:45] vila: there's not test_sprout_uses_bzrdir_branch_format [08:45] s/not/now/ [08:45] 8-) [08:46] GPH-Laptop: docs are for looking at second :) [08:46] What do you think I should do... add the trailing slash by default or add another option? [08:46] heh [08:46] vila: and it passes [08:46] I'd be in favor of it just being there always. [08:46] GPH-Laptop: add it by default. [08:47] vila: (I'm still suspicious of LoomSupport.clone, though...) [08:47] spiv: great ! Looks like I should update the bottom thread in my loom ! [08:47] The comment talks about updating the nick too [08:47] For even extra fun and bikeshedding, add a * on executable files too :p [08:47] (why doesn't ubuntu ship with wireshark by default?) [08:47] fullermd: ! [08:47] (the lack of something like that has made me very cranky in the past) [08:47] fullermd: definitely would want that in an option [08:47] fullermd, GPH-Laptop : Don't forget the '@' for symlinks ! [08:48] fullermd: not in default behaviour [08:48] See? Instant argument; just add fullermd! [08:48] --decorated --color... definetly bikeshedding when color becomes an option :) [08:48] jml: possibly because default installing software with a history of exploits that allow executing arbitrary code makes people nervous [08:49] heh [08:49] jml: so... anything besides slash in default? [08:49] "I want my bikeshed to be suffixed with the @ character!" [08:50] Adding the / is probably a safe thing to have on it. I can't offhand think of anything it would hurt... [08:50] spiv: Don't be such a rogue :p [08:50] GPH-Laptop: no. [08:50] GPH-Laptop: just '/'. [08:50] Adding @ at least has some consistency with adding /; they are both signifiers of the inventory entry type. * doesn't have that distinction. [08:51] The only case I know of where *not* having the final '/' hurts is Apache [08:51] At some point the answer is "if you want a custom tree formatter, there's an API you can use..." :) [08:51] True. OTOH, (1) the '/' doesn't harm anything I can think of offhand ('cd', 'ls', etc) you'd paste it to, where '@' would. [08:52] And (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] [in the filename I means] [08:52] I'm using wireshark to track some machine-local traffic, how do I filter so I only capture one direction? [08:53] jml: filter on src port? [08:53] Specify src/dest port. [08:53] (or dst port) [08:53] how do I do that? [08:53] That's how the TCP stack distinguishes them, after all. [08:53] With much clicky-clicky. [08:53] spiv: yeah, there's a sense in which you just restated my question :) [08:54] "and src 123" [08:54] hmm... I think I want a *capture* filter, not a display filter [08:54] (they have different syntax, yay!) [08:54] Oh. Display filter would work too... [08:54] "tcp.srcport == 1234" looks likely. [08:55] (I clicky-clicked on the "+ Expression..." button, expanded the "TCP" filters, etc etc... [08:55] ) [08:56] (I'm sure you'd have been as distressed as me if I hadn't closed that paren) [08:57] spiv: good grief! I wonder what the alternative UI design was :) [09:01] jml: Is there any special protocol for commit messages in my local branch/ [09:01] ? [09:01] spiv: ./bzr selftest -s bt.branch_implementations.test_sprout -v not failing anymore ! Hurrah ! :-) [09:03] GPH-Laptop: not at all. [09:03] GPH-Laptop: generally, you just want to make them helpful. [09:04] GPH-Laptop: also, if you haven't used a dvcs before, you want to commit way more often than you are used to :) [09:07] jml: I think I'm pretty much done [09:07] it was pretty simple [09:07] but how come it seems like the unit tests aren't all being run? [09:07] that is, [09:07] some of the test lines don't give errors when I forgot to fix them [09:07] GPH-Laptop: 'bzr di -r submit:' should generate you a diff, I think. If you pastebin it I can take a look. [09:11] jml: http://gphemsley.pastebin.com/d1454f2dd [09:12] oh wait [09:12] I think I have a little optimization to do [09:12] hang on [09:14] GPH-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] GPH-Laptop: the HACKING guide has some more info about that. [09:15] jml: http://gphemsley.pastebin.com/d2ef5b771 [09:17] I dunno if I'd reuse outstring like that... but that's stylistic quibbling. [09:19] fullermd: Well, it is the outstring... isn't it? [09:19] No, 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:20] send it to the mailing list! [09:20] that way, stylistic quibbling will get the patch landed :) [09:20]