[00:08] wow, thats *REALLY* odd. i killed off 4L-gui and a few defunct 4L-cli processes, and bzr works now. [00:08] WTF [00:12] i don't see any differences in /usr, /lib, or /bin that would indicate i was hacked. the only diffs are .gz files that are package documentation, and they pass gzip -t [00:12] has a later bzr been backported to lenny? [00:13] how come whenever I anonymously access launchpad, bzr works fine, but when I try to set up an account with SSH keys and all, it jus fails out? [00:13] ed-209: ssh -vvv and watch [01:38] lifeless: I'd welcome patches for news_merge (of course) [01:38] lifeless: it's pretty hackish in various ways [01:39] lifeless: Partly because of the stupidly simple parser [01:40] lifeless: partly because it uses Merge3.merge_regions, but it expects lines and I want to feed it other kinds of blocks of text [01:42] lifeless: or rather, it doesn't really want to feed Merge3 lines at all, but ideally two-tuples, e.g. [('section', 'Bug Fixes'), ('bullet', '* Fix crash in frobber.'), ...] [05:24] spiv: Activation energy is still too low; I may patch it in future [05:24] spiv: but if you can patch it in work time, we both win :) [07:05] \o/ test suite loop closed. [08:52] lifeless: you around? [08:52] thumper: hi, yeah, just making testr rock [08:52] lifeless: I'm starting a new python project [08:52] lifeless: and I want some test infrastructure [08:53] lifeless: what do you recommend? [08:53] lifeless: I have nothing right now [08:53] testrepository [08:53] and testtools [08:53] lifeless: automatic discovery if possible [08:53] is it packaged? [08:53] uhm, if you want that you can use the discover module [08:53] [I don't really like automatic discovery, but thats me :P] [08:53] I can register I suppose [08:54] I want a simple way to just run the tests... [08:54] can I show you something [08:54] sure [08:54] branch lp:testrepository [08:54] install python-testresources and python-testscenarios and python-testtools [08:56] python-testscenarios not found [08:56] you are running lucid, yea? [08:56] no [08:56] ah [08:56] add the subunit PPA [08:56] which is? [08:57] sudo add-apt-repository ppa:subunit/ppa [08:59] lifeless: got muffins in the oven [08:59] lifeless: got that installed [08:59] but the oven is calling [08:59] ok [08:59] I'll be here [09:00] thumper: oh, also you might like lp:commitfromnews; its verra useful :) [09:05] lifeless: not a branch [09:05] sorry [09:06] bzr-commitfromnews [09:06] which does? [09:06] diffs NEWS to suggest commit messages [09:07] oh, you'll also need python-subunit installed [09:07] sorry, you're getting a full stack here ;) [09:07] it better be worth it [09:08] I think you'll like it [09:08] I've just pushed rev 88 of testrepository, probably worth having [09:09] anyhow, there are two main things here [09:09] I want to show you the layout I used in testrepository, as I'm pretty happy with that [09:09] and I want to show you testrepository itself [09:10] as I think its an excellent workflow [09:10] brb in a couple of minutes, organising dinnery things. [09:10] have a poke aroun testrepository's code base; try 'make check' etc [09:17] thumper: ok, back [09:22] hey [09:22] what's new? [09:22] hi [09:22] stuff :P [09:22] nice [09:23] ummm, I am suprised this channel is still here [09:23] why? [09:23] Well, git has been pretty stable for the last few years now [09:23] so? Thats git, this is bzr. [09:24] We're gaining users faster than ever [09:24] RCS has been rock-stable for decades :p [09:24] yeah but git kind of makes bzr look like cvs [09:24] phix: I think that comparison is false [09:24] phix: no one likes trolls [09:24] ok ok, I will give you some credit, more like svn :P [09:24] hehe [09:24] thumper: aawwww [09:25] I m not trolling though [09:25] phix: Is that a considered opinion, or a joke? [09:25] no no no, bzr is the joke actually :) [09:25] well no, the fact that ppl still use it is I suppose [09:25] any way [09:25] I am off :) [09:25] see you guys in #git soon for sure [09:26] phix: thats either hostile or a troll, and neither is particularly friendly or encouraging. [09:26] oh [09:26] revert phix [09:26] Oh, sweet. Now I have the perfect answer to people who tell me I'm not funny! [09:26] :P [09:27] fullermd: I think you mean reset --hard -q --patch ./ [09:28] I... do? [09:28] fullermd: I picked a classic command new git users get confused by [09:32] Well, it apparently works, 'cuz I'm confused why I'd mean it :p [09:34] fullermd: its 'revert' spelt git style [09:36] Oh. [09:36] I didn't say 'revert'. [09:53] fullermd: what was your perfect answer then ? [09:55] Well, that I use bzr, so obviously I'm a joke. Presumably a good one, naturally. [09:55] ah [09:55] unless its dark humour [09:57] uhm [09:57] this is a wtf moment: [09:57] make docs [09:57] python -c "import shutil; shutil.copyfile('NEWS', 'doc/en/release-notes/NEWS.txt')" [09:57] I think if we have Make, we can surely assume 'cp' ? [10:03] That should be implemented with inline ASM, to be more optimized. [10:06] you're here all week right? So you might improve.. :) [10:06] Don't forget to tip your waitress! [10:08] <3 commitfromnews [10:17] hi igc [10:17] is there a bzr plugin to mark bugs in debbugs pending on commit to a bzr repo? (I can't imagine i'm the only person to wonder this, but i've not seen it asked before) [10:17] bzr builddeb would be a good place to put that [10:18] its really 'bzr-debian' :P [10:18] ok , I'll check to see what it does :) [10:18] hehe [10:25] hi bialix [10:25] Marco Polo is good codename, the first great explorer, right? [10:25] * bialix uploading installer now [10:27] igc: installer done [10:28] bialix: certainly one of the better known early explorers [10:29] bialix: thanks for the installer too [10:29] :-) [10:29] bialix: http://en.wikipedia.org/wiki/Exploration [10:30] igc: I have an theory that every "project" in human life takes about 9 months to get somewhere. your bzr-explorer is another confirmation ;-) [10:30] heh [10:30] I'm only just getting to where I want testing to be, after 14 years [10:31] bialix: I just hope it's stable enough to warrant 1.0 [10:31] lifeless: I don't say about maturity [10:31] :P [10:31] Ogod, I hope this project will be done in less time than that :( [10:32] the question is what this for you [10:32] * bialix waves hi to all [11:20] igc: grats on 1.0.0 [12:23] Hi, I'm using bzrlib in a piece of software of mine and I'm wondering if it's safe to keep a reference to a WorkingTree instance in multiple processes? [12:23] Am I not going to get hit by some weird race condition sooner or later? (Just wondering, not that I have seen anything like that so far) [12:24] I'm currently using 2.1.0 [12:28] Or, alternatively, can those subprocesses have their own separate WorkingTrees pointing to the same repository location? I guess that should be safe? [12:38] dsuch: do you mean 'are WorkingTree methods correctly locked' ? [12:38] dsuch: and the answer is 'we think so' ;) [12:39] yea, guess that was the question :) [12:39] thanks [12:41] lifeless: and if I don't share those objects, there sure will be no problems at all, right? [12:41] what do you mean by share [12:42] share as in multiple threads have the same WorkingTree instance assigned to them [12:43] but it's not that I really want it [12:43] in fact, I could as well have each thread/subprocess use its own WorkingTree object so there would be no sharing of a WorkingTree instance's state at all [12:44] so [12:44] and that, if I understand it correctly, should be perfectly safe? [12:44] on unix, os locks are not exclusive across threads [12:44] you can stomp on yourself trivially. [12:44] *processes* are safe. [12:45] *threads* are not. [12:45] mhm [12:46] even if you have separate WorkingTree objects, in different threads, you could zerg your dirstate file [12:46] got it [12:46] dirstate2, *when* we get to it, will not use OS locks at all, and won't have this risk. [12:47] I fear to ask what a dirstate is :) I take it it's some important internal repo structure? [12:47] yes [12:47] ok [12:47] .bzr/checkout/dirstate [12:47] it lists all the files in the tree [12:48] and their inode fingerprint [12:48] merge status [12:48] okay so it is important :) [12:48] semantic changes to this file are locked with a dir-lock, which is safe even in threads. [12:48] however, readonly locks can do cache-updates to this file [12:48] and they are only protected by an OS lock [12:49] which as I mentioned is not actually as safe as one might hope [12:49] I see. [12:53] gnight [12:53] if you have more questions, just ask, I'm sure someone will answer eventually :) [12:53] sure, thanks again lifeless [12:54] hope you get better ;-) [12:54] (sorry, couldn't resist) [13:30] hi! how would you put files under version control that belong to one project, but live in different directories scattered across the whole file system? [13:31] e.g. all hand-edited configuration files of a ubuntu box [13:32] felixhummel_: Generally the configuration files of a ubuntu box would be in /etc [13:32] felixhummel_: other than that, you should be able to use symlinks to a versioned directory [13:34] jelmer: so you would do ``cd /etc; bzr init .; bzr add hosts``? [13:34] felixhummel_: basically, yeah [13:34] felixhummel_: I'm using the etckeeper app to maintain my /etc [13:35] it wraps around bzr and takes care of e.g. invoking bzr commit when you upgrade or install packages [13:36] looks like etckeeper fits my use case perfectly. thanks, jelmer! [13:36] felixhummel_: you're welcome [14:42] maxb: the bzr-rewrite trunk should be fixed now [15:56] hello [15:57] I have a question about "./bzr selftest", and yahoo couldn"t find the answer for me [15:57] :) [15:58] ".bzr selftest" runs all the bzr unit tests (> 25000), what is the command to run one [15:59] (sorry) only one of the unit tests (e.g. tests contained in bzrlib/tests/test_osutils.py) ? [16:20] ajeans: Either giving it a substring as an argument, or using -s and a class prefix. [16:29] @fullermd: From the root, I am trying "./bzr selftest -s TestStatus" and also tried "./bzr selftest bzrlib/tests/test_status.py", with no success [16:35] @fullermd: Thanks for the information, you can pass the method name to only run it [16:35] ./bzr selftest --help had some information about it. [16:36] I was hoping to simply pass the Class name to execute all the tests within, but I can still list all the methods manually... thanks again === khmarbaise_ is now known as khmarbaise [16:52] ajeans: You can use -s to pass the class name, it just has to be fully qualified. e.g., "-s bzrlib.tests.test_foo.TestFoo....." [16:53] Or 'selftest test_foo'. The former is faster because it doesn't have to build the full list of all the tests then search through it. [16:57] long-term wishlist: automatic mirroring of my bzr branch [16:57] sort of like bzr bind or manual bzr push after each commit, but without having to wait for the push [16:58] let the push happen in the background, opportunistically === khmarbaise_ is now known as khmarbaise [17:14] if I do bzr merge lp:~ubuntu-manual/ubuntu-manual-screenshots/bg -r 0..-1 does that update the status of the branch in lanuchpad? [17:16] ubuntujenkins: it might mark a merge proposal as "merged" if there is a merge proposal for that merge [17:16] otherwise it won't affect the status of the branch [17:17] weird I the status has changed from devolpment to merged. I don't know why its anoying as I have to change it back on 47 branches now [17:23] thanks for your help jelmer [17:49] @fullermd: thanks for the explanation, it works perfectly :) [17:55] jelmer: Excellent! But, now there's a 'trunk', a 'rebase-trunk', and a 'trunk-mirrorred' ... it's a bit confusing [17:55] maxb: trunk is the right one [17:55] it's also registered as the development focus [17:56] Sure.. but why the others? [17:57] historical reasons [17:57] oh. stacked branches prevent deletion? [17:58] perhaps set them as 'Abandoned' if they are no longer relevant? [17:59] maxb: feel free to do so [18:00] jelmer: I'm pretty sure only the branch owner can [18:00] maxb: the branch status isn't really useful at the moment imho, and I have too much branches to set all of their statuses appropriately [18:02] I find the branch status quite useful - it would be nice to at least have ones with 'trunk' in their name which are no longer relevant hidden from the project's default branch listing [18:02] maxb: isn't that what the development focus is for though? [18:04] moin [18:05] maxb: I've changed the status for these two branches to abandoned, although I don't really see the problem tbh [18:05] hey lifeless [18:06] oh, looks like I could remove them after all [18:24] lifeless: if you could give some quick feedback on my named-branches patch, that'd still be much appreciated :-) [18:28] jelmer: ah yes, I knew I forgot something this weekend [18:28] jelmer: shall do === radoe_ is now known as radoe [19:45] maxb, if your merge request is still relevant, can you please resubmit it against lp:bzr-rewrite? [20:50] time bzr rocks on a Nokia N900 --> 1.72 seconds wall-clock time [20:50] seems a bit on the high-side [20:51] it's a 600 MHz ARM CPU [20:53] if you run it again? [21:19] lifeless, varies between 2.32s and 1.38s (I suspect cpufreq) [21:19] wow [21:19] this is 2.0.2, I should package a newer version... [22:24] hey all [22:25] anyone here used the bzrlib python module? [22:32] yes [22:33] bah [22:38] lifeless: hey [22:38] hi [22:38] lifeless: when we did stacking we decided that the server should hit to the bzr client to stack [22:38] lifeless: do you know if the --no-stacked (or similar) option can or does ignore the suggestion? [22:39] it should, it doesn't [22:39] s/hit/hint/ [22:39] lifeless: is there a bug? [22:39] I'm sure of it [22:55] is anyone here using pristine-tar for importing of upstream tarballs outside of LP? [22:56] aie aie [22:56] lifeless: I was trying to work off http://www.advogato.org/person/robertc/diary/130.html to do bzrification and debianization of a new source package, but import-dsc doesn't seem to have usefully imported the autotoolage [22:57] is there an undocumented step I'm missing? [22:57] rather, it imported it as part of a single commit with the Debian stuff [22:57] let me just see what post that is [22:57] rbtcollins.wordpress.com has better urls [22:58] ah yes [22:58] well, rbtcollins.wordpress.com is not what you have linked from Planet Debian :) [22:58] meh :P [22:58] ok, so import-dsc does two imports [22:58] a tarball, accessible from 'bzr tags' [22:58] and a debianised [22:59] look at 'bzr log -n0' or at 'bzr tags' [22:59] neither shows me what I'm looking for [22:59] the upstream-XYZ tag should be precisely the tarball contents [22:59] does it matter that this is 3.0 (quilt) ? [22:59] probably, AFAICT quilt-3.0 is a - [23:00] uhm [23:00] there's no 3.0 (bzr) format [23:00] and 3.0 (native) is n/a [23:00] and I have an upstream tar.bz2 [23:00] slangasek: pastebin bzr tags and bzr log -n0 somewhere [23:02] http://paste.ubuntu.com/385962/, http://paste.ubuntu.com/385963/ [23:03] ok, no upstream- tag [23:03] I'll mention that when following the directions as written, import-dsc first gave me an error about 'bzr add'ing debian/changelog first [23:03] and rather than doing this, I moved my debian/ dir aside [23:04] so if I'm meant to actually do the 'bzr add', I can go back and try that [23:04] do you have the session in history, so I can see it? [23:04] I can uncommit and do it again? :) [23:04] no [23:05] you can start from a fresh branch though [23:05] ok [23:05] *don't* branch from this branch [23:05] yep [23:06] lifeless: http://paste.ubuntu.com/385965/ [23:07] slangasek: and bzr+ssh://bzr.debian.org/bzr/pkg-samba/cifs-utils/trunk is an *upstream* branch - no packaging in it at all ? [23:08] slangasek: the debian dir shouldn't be present: the revert step in my instructions is to remove the packaging (because it said debianise as normal :P) [23:08] correct [23:08] morning [23:08] but 'bzr revert' doesn't delete new files [23:09] slangasek: heh [23:09] slangasek: anyhow, yes, you are right to not have the debian dir present [23:09] so I inferred, when I got the error, that this is what you wanted, so I moved debian/ away :) [23:09] ok [23:09] and what happens then [23:11] http://paste.ubuntu.com/385967/ [23:11] single commit, no upstream tag [23:11] can you paste the dsc [23:11] (this is with bzr-builddeb 22, btw; Debian unstable seems to be a version behind Ubuntu) [23:12] and check there is only one dsc in the dir above [23:12] slangasek: generally you will want bzr-builddeb trunk :P [23:12] http://paste.ubuntu.com/385968/ [23:12] no, generally *I* want to be dogfooding what's actually in the distro ;) [23:12] yes, there's only one .dsc [23:13] this is very strange [23:13] I'd like you to try trunk. [23:13] if it doesn't work, file a bug. [23:13] ok - url? [23:13] if it does, file a different bug [23:14] bzr branch lp:bzr-builddeb ~/.bazaar/plugins/builddeb [23:19] lifeless: yep, works with trunk [23:19] slangasek: so; you want a newer package ;) [23:19] (another wrinkle: had an out-of-date version of bzr in my Debian env, updated from bzr 2.0 to 2.1 to get builddeb trunk to work; and I can't seem to use the old builddeb in unstable with new bzr...) [23:19] jml: are you online? [23:20] looks like bzr-builddeb 2.3 is in experimental, I'll double-check with that also [23:21] 2.3 also works correctly [23:22] so someone needs to put 2.3 in unstable [23:22] jelmer: ^^ :) [23:26] mwhudson, around? [23:30] jono_: just about to have lunch, but can hang around a bit ... how can i help? [23:30] mwhudson, I am just starting hacking with bzrlib - is there a short example of checking out a branch? [23:31] mwhudson, actually, forget it [23:31] I figured it out :) [23:31] jono_: heh [23:31] thanks! [23:31] jono_: generally to find out how command 'foo' works [23:31] look for cmd_foo in bzrlib/builtins.py [23:31] * mwhudson afk for a few then [23:31] right thanks! [23:31] cheers pal [23:31] I will add some examples to python-snippets [23:32] would be awesome if you could submit some more :) [23:32] There is no stopping jono_ now! [23:32] Daviey, :) [23:32] just hacking Acire to check out the code directly from bzr [23:32] then no dailly PPA is needed :) [23:33] jono_: hi [23:33] hey lifeless [23:33] jono_: your mail server is naffed [23:33] hello jono, lifeless [23:34] lifeless, yeah, I know [23:34] jono_: I emaile you a week ago with the answer to this :P [23:34] 1and1 having troubles [23:34] lifeless, [23:34] ahhh [23:34] can you forward it to jono AT ubuntu DOT com? [23:34] when you pinged me, then disconnected ;P [23:34] hah [23:34] jono_: sure [23:34] thanks! [23:36] poolie: there is a gift for you in the tribunal review queue ;) [23:38] heh, thanks [23:39] btw did you see my grief on friday was due to a fsck bug? [23:39] poolie: I didn't see the resolution of it, no. [23:39] thats good news. [23:41] my machine is still down but at least the problem is known [23:41] it's actually fairly obvious where it must be [23:41] ironically similar to some bugs we had in dirstate [23:42] in this case, it incorrectly sorts things that are lexicographically before '.' i think [23:42] heh [23:42] so 'do not fsck and you will be fine' [23:42] ? [23:44] do not use -D [23:45] *afaik, there may be other problems [23:45] actually since the manpage says it may resort directories sometimes even without -D [23:45] i don't think that's enough [23:45] and you can't upgrade without fscking [23:58] mwhudson: is the link in http://doc.bazaar.canonical.com/bzr.dev/developers/#developing-using-bzrlib stale? (to the api docs)