[12:07] so I think I can save another 10 seconds [12:07] robertc@lifeless-64:~/source/baz/misc-fixen$ python -m timeit -n 1 -r 1 -s 'from bzrlib.osutils import sha_strings' -s 'one_mb = ["A"*80] *800' 'for f in xrange(50000): sha_strings(one_mb)' [12:07] 1 loops, best of 1: 35.9 sec per loop [12:07] robertc@lifeless-64:~/source/baz/misc-fixen$ python -m timeit -n 1 -r 1 -s 'from bzrlib.osutils import sha_string' -s 'one_mb = "A"*80*800' 'for f in xrange(50000): sha_string(one_mb)' [12:07] 1 loops, best of 1: 22.3 sec per loop [12:24] lifeless, should i write my own toposort or use the existing one? [12:25] the existing one is fast [12:26] its a good starting point, if it doesn't fit the sort you need - if a different layout will be better, then we'll need to add another version of it or something to tsort [12:27] keir: ok looking at your code, one thing bzr requires is copyright assignment for non-trivial changes [12:27] theres a wiki page with the agreement, its referenced from HACKING [12:27] lifeless, i know, i'll do that later [12:28] ok [12:28] theres a few things that are truely trivial that jump out at me [12:28] we follow PEP-8 with a few extra guidelines === rokahn [n=email@static-70-19-125-6.ny325.east.verizon.net] has joined #bzr [12:28] your code doesn't currently do that [12:28] oh, let's not worry about code formatting [12:28] i'll cross that bridge when we're looking at integration [12:28] like I say, truely trivial ;) [12:29] a data point on performance for you [12:30] python -m timeit -s 'def foo(_, _2):pass' 'for f in xrange(50000): foo()' [12:30] python -m timeit -s 'def foo(_, _2):pass' 'for f in xrange(50000): pass' [12:30] erm [12:30] first one should be [12:30] python -m timeit -s 'def foo(_, _2):pass' 'for f in xrange(50000): foo(1, 2)' [12:30] anyhow, run those [12:31] this will tell you something about function call costs [12:31] for me its about 15ms per 50K calls [12:31] it's 12 for me [12:31] 2 for no function call [12:31] so you have a function that takes (int, size) and does an if [12:32] this is duplicate work - when you decide size you know the function that you need [12:32] so I'd be inclined to assign to a variable the serialiser for a given thing [12:32] e.g. when you determine key_length_size [12:32] ok [12:33] set pack_key = a_callable_that_takes_one_int [12:33] ah, right [12:33] this is just as clean but faster [12:34] the speed of packing and unpacking, i think will be slow [12:34] this is confusing [12:34] + # each row is (keysize key valsize val pads) such that is row_length bytes [12:34] + rows = (''.join((pack_sized_int(len(items[0] ), key_length_size), [12:34] + items[0] , [12:34] + pack_sized_int(len(items[1] ), value_length_size), [12:34] they are prime targets for c [12:34] + items[1] )) [12:34] + for items in items) [12:34] 'for items in items' [12:34] it only works because iter(items) is called before items is rebound [12:35] wow, i can't believe i wrote that [12:35] I need to go run a chore, back in about 20 === bac_afk is now known as bac [12:49] hello [12:49] hi [12:49] hi keir === cprov is now known as cprov-afk [12:57] hi poolie === nir [n=nir@moinmoin/fan/nir] has joined #bzr === Admiral_Chicago [n=FreddyM@st074039212101.monm.edu] has joined #bzr === grimeboy [n=grimboy@85-211-246-248.dsl.pipex.com] has joined #bzr [01:22] jelmer: ping, waiting on reply from you [01:23] lifeless, any other thoughts? [01:26] Peng: btw I have found your glitch from yesterday [01:27] Peng: some historical data in bzr.dev has changed (just in an index), its triggering a type error === orospakr [n=orospakr@bas4-ottawa23-1177561461.dsl.bell.ca] has joined #bzr [01:29] keir: on the code? yes, just tracking down a performance issue for a bit === ubotu [n=ubotu@ubuntu/bot/ubotu] has joined #bzr [01:34] wow, mem copies really hurt [01:35] 20 second difference in performance by introducing a single exra mem copy of the text of a file fo rinitial commit [01:36] this does not bode well for my index code [01:36] I was trying to use sha_string instead of sha_strings [01:37] which is 10 seconds faster or so overall [01:37] but the extra copy overrode [01:38] so I'm going to have to try a bit harder to avoid it === igc [n=igc@ppp59-167-96-213.lns3.bne1.internode.on.net] has joined #bzr [01:38] morning all [01:42] hiya [01:44] of course it could be something else, hard to be entirely sure ;) === grimeboy [n=grimboy@85-211-242-114.dsl.pipex.com] has joined #bzr === pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr [01:50] lifeless, there's a question about dapper packages === mw is now known as mw|out [01:56] hmm? [01:56] is it possible to build bzr debs for dapper? [01:56] can we automate that? [01:57] yes [01:57] did we not chat about this on thursday? [01:57] or was it friday? [01:58] i wanted to confirm that there was nothing special about dapper [01:58] as i recall it's just a matter of you setting up the right chroots? [01:58] its not different to say gentoo or redhat [01:58] the packaging has to be done to match [01:58] right, the python standards have changed [01:58] I have the chroots [01:59] so it's a different system [01:59] lifeless, sorry, just got back. will reply now [02:00] poolie: have you reconciled bzr.dev with abentleys patch or something ? [02:00] lifeless, in the mean time, did you see my pqm merge request and ping ? >-) [02:00] yes === jml [n=jml@ppp108-61.static.internode.on.net] has joined #bzr [02:01] no [02:01] thanks [02:01] something wierd going on [02:01] in my branch the revision robertc [02:01] meh [02:01] robertc@robertcollins.net-20070720032020-xiftpb5gqeebo861 [02:02] has two parents [02:02] parent: pqm@pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde [02:02] parent: pqm@pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx [02:02] but one of the files it altered [02:03] has different per-file graph for me and bzr.dev [02:03] ('robertc@robertcollins.net-20070720005841-xnu6um6vx0n41h0k',), ['robertc@robertcollins.net-20070720005841-xnu6um6vx0n41h0k', 'pqm@pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx'] [02:03] left is my index, right is bzr.dev's [02:04] whats strange is that this is a revision I created [02:05] so I'm not at *all* sure why my index could be different [02:05] lifeless, do you want me to merge aaron's patch or something? === grimeboy [n=grimboy@85-211-243-93.dsl.pipex.com] has joined #bzr [02:05] %254e%2545%2557%2553-20050323055033-4e00b5db738777ff is the file id [02:05] poolie: no [02:06] spiv and I have been reviewing it [02:15] oh, I know [02:15] abentley: ping [02:18] fyi, I'm looking into the commit bug reported by Alex now === latexer [n=peter@gentoo/developer/latexer] has joined #bzr [02:20] i can't find an open bug about it. [02:20] but I just managed to "bzr push" a local branch into the a base repository path, instead of a subdiretory there. [02:20] and it seems it blew away the repo info, as "bzr info my_repo" just reports the branch info. [02:20] thats a feature [02:21] uhh... [02:21] bzr info -v my_repo will show the repo details [02:23] lifeless: interesting... [02:23] you can get rid of the branch by deleting .bzr/branch (but be sure *not* to delete .bzr/repository, cause thats your repository right there) [02:23] lifeless: the feature being a repo and a branch in the same directory? [02:23] and now I'm seeing it. [02:28] lifeless: indeed. that worked wonders. [02:28] lifeless: thanks! === latexer [n=peter@gentoo/developer/latexer] has left #bzr [] === _logger [n=_logger@adsl-75-51-62-134.dsl.chcgil.sbcglobal.net] has joined #bzr [02:39] vila: ping [02:39] meh sorry vila [02:50] New bug: #140563 in bzr "unicode command line options cause unicodeencodeerror traceback" [Low,Triaged] https://launchpad.net/bugs/140563 === orospakr [n=orospakr@bas4-ottawa23-1177561461.dsl.bell.ca] has joined #bzr === gldnspud [n=gldnspud@72.171.93.139] has joined #bzr [03:24] poolie: see my latest comment on bug 140419 please [03:24] Launchpad bug 140419 in bzr "selective commit sometimes fails with `parent_id not in inventory` error" [Undecided,New] https://launchpad.net/bugs/140419 [03:24] poolie: do you want the fix reapplied just to bzr.dev or 0.92 as well? [03:25] I'll put the merge up in the next few minutes [03:48] igc, please do merge that for 0.92 [03:48] i mean, 0.91 [03:49] sure. I meant 0.91 as well. :-) === siretart [i=siretart@tauware.de] has joined #bzr === dirker [n=dirker@woosome.net] has joined #bzr [04:02] Some of the code around the patch for bug 115947 seems to have changed, but I'm not sure whether the problem is solved, still there, worked around elsewhere, etc... [04:02] Launchpad bug 115947 in bzr "DirState.set_state_from_inventory() fails when we have common prefix paths "foo" and "foo-bar"" [High,Fix committed] https://launchpad.net/bugs/115947 === siretart [i=siretart@tauware.de] has joined #bzr === cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr === welterde [n=welterde@trujillo.srv.pocoo.org] has joined #bzr [04:40] ok - the reapplication of that fix has been sent to pqm for both 0.91 and bzr.dev now === igc food [04:42] cool [04:43] we should check that nothing else got reverted by that merge === Starting logfile irclogs/bzr.log === ubuntulog [i=ubuntulo@ubuntu/bot/ubuntulog] has joined #bzr === Topic for #bzr: The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 and 0.91rc2 are out - http://bazaar-vcs.org/Download | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d === Topic (#bzr): set by poolie at Wed Sep 12 03:35:03 2007 === pete__c [n=pete@032-463-246.area7.spcsdns.net] has joined #bzr [05:19] http://bundlebuggy.aaronbentley.com/request/%3C46EF2B5C.3010208%40internode.on.net%3E [05:20] i think this looks reasonable but i'm not specifically sure why it's correct [05:20] s/why/that [05:20] actually i am pretty sure [05:21] which patc is it ? [05:21] - entries = work_inv.iter_entries() [05:21] + entries = work_inv.iter_entries_by_dir() [05:21] that's the heart of it [05:21] yup [05:21] oh is this from ian ? [05:21] yes [05:21] if so its just reinstating what jam reverted by mistake [05:22] bad merge === Admiral_Chicago [n=FreddyM@st074039212101.monm.edu] has joined #bzr [05:34] spiv, how's it going? quick call? === zbrown [n=rufius@unaffiliated/zbrown] has joined #bzr === mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr [06:27] is there a clever bzr trick to move uncommitted changes from one branch to another? [06:28] merge --uncommitted? [06:28] that's probably it :) [06:28] bzr rocks. [06:29] ok [06:29] bzr.dev has broken indices [06:30] abentley: ^ ping [06:30] abentley: I don't *know* that you ran reconcile, but its my best bet so far [06:43] spiv: ping [06:44] spiv: I'm going to ring you, hope thats ok [06:44] lifeless: ok. [06:52] lifeless: I have not deliberately run reconcile on my main bzr.dev [06:52] ok thats very interesting [06:53] *something* has added a parent though [06:53] I will run check. [06:53] It's possible I did it by accident, I suppose. [06:53] I would expect your parents-modified check to error on the new file graph for NEWS if something else introduced this [06:55] >>> from bzrlib.repository import Repository [06:55] >>> r = Repository.open('..') [06:55] >>> i = r.get_inventory('pqm@pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde') [06:55] >>> i2 = r.get_inventory('pqm@pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx') [06:55] >>> i.path2id('NEWS') [06:55] 'NEWS-20050323055033-4e00b5db738777ff' [06:55] >>> fid = i.path2id('NEWS') [06:55] >>> i[fid] .revision [06:55] 'robertc@robertcollins.net-20070720005841-xnu6um6vx0n41h0k' [06:55] >>> i2[fid] .revision [06:55] 'pqm@pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx' [06:55] >>> i2[fid] .revision in r.get_ancestry(i[fid] .revision) [06:55] True [06:56] just veriified again [06:56] that is, the per file change in my commit should have one parent only, as my mail said - I hadn't actually checked via the inventory before. [06:57] abentley: your reconcile is the only thing I can think of that would change a file graph like that [06:58] I'm not really understanding the scenario, and it's late here. [06:58] But I'm paranoid enough to run "reconcile" only against temp branches until it hits mainline. [06:59] abentley: ok. Well andrew has been looking at your patch anyway as its part of the hpss work [06:59] so leave it with us; someone else may have run that reconcile [06:59] e.g. vila or one of theother branches merged last night [07:00] I'll let you know about the "check" output, then off to bed. [07:00] thanks [07:00] sleep well [07:14] My home repository definitely has not been reconciled. [07:18] lifeless: hi, still drinking first coffee, but never run reconcile [07:21] lifeless: Both my home and work repositories have lots of unreferenced text ancestors, so it seems impossible that they've been accidentally reconciled. [07:21] this is bizarro [07:22] bzr.dev has a new entry for that revision in that file [07:22] as well as many others [07:23] (many other replacement index entries) [07:24] Well, perhaps we can check for the bogus entries on all the branches that have been merged into bzr recently? [07:24] yeah [07:24] I was about to start doing that :) [07:24] there's martin [07:24] Sorry I can't provide a shortcut by being at fault :-) [07:24] this happened sometime yesterday far as I can figure [07:25] vila [07:25] G'night. [07:25] lifeless: pong [07:25] dm watkins [07:25] abentley: night [07:25] jelmer [07:25] keir === BasicOSX [n=BasicOSX@fortress.tanners.org] has joined #bzr [07:30] hmm, bzr viz on http://bazaar.launchpad.net/~v-ladeuil/bzr/bzr.integration/ says pqm@pqm.ubuntu.com-20070917142923-f06edfgw1d0cvj4w was the tip when I merged my fix for #140055 [07:30] the commit message is 'Add reconfigure command' [07:34] igc: you haven't run the new reconcile have you ? [07:34] no - should I? [07:34] no [07:42] abentley: if you are still up, I've mailed the list a request for debug stuff; which you might like to do anyway - but no rush. I just won't merge bzr.dev for a bit. [07:48] igc, about docstrings [07:49] it seems hard to define ahead of time how much is enough [07:49] I think one per non test-case method and one-per-class and one-per-module is desirable always [07:49] because intent is rarely expressed in code [07:49] intent can be expressed in method names [07:49] to some degree [07:49] but I see docstrings as different to comments [07:49] lifeless, for example i've picked up, i think from you, the trend to have long test names [07:50] self documenting code can be comment ftree [07:50] since you only have to write them once [07:50] agree [07:50] yup :) [07:50] otoh i like more comments in test code [07:50] yes, that too [07:50] because it is often not obvious *why* something is there [07:50] I'm just saying that I support a policy of always having docstrings on code outside of .tests [07:50] and it's not like regular code where you can just remove such lines [07:51] and inside .tests where the code is not a test itself :) [07:51] i do to, but having a docstring that just repeats the method name doesn't count [07:51] right [07:51] poolie: Thinking of tests... http://martinfowler.com/articles/mocksArentStubs.html is the link I was talking about the other day, that talks about behaviour verification vs. state verification. [07:51] spiv: you have seen my interface skew 'paper' right ? [07:52] lifeless: yes [07:52] good :) [07:52] lifeless: but thanks for the reminder, it may be relevant to a blog post I'm slowly composing. [07:57] ok, thats my 9 1/2 hours [07:57] poolie: re "having a docstring that repeats the method name doesn't count" ... [07:57] it *is* sometimes useful [07:57] not for what it says, ... [07:57] but for the fact that it doesn't add anything else :-) [07:58] i guess it can represent two things: [07:58] igc: then it should just directly say "I'm a slack developer." ;) [07:58] "i thought about this and i'm sure there's no more to say" or "i didn't think very much" [07:58] :) [07:59] spiv: :-) [07:59] are we testing the developer's state or their behavior? :) [07:59] igc: because docstrings should express intent rather than just stating the obvious about the implementation ;) [07:59] both :-) [08:00] hello [08:00] how do you find the history of all files in a directory? [08:00] or one file, for that matter? [08:00] bzr log PATH [08:00] gives one file at a tie [08:00] *time* [08:00] "bzr log dirname" seems to only give revisions for the directory itself [08:00] right [08:01] there isn't a --recursive option for it yet [08:01] well I just want files in that dir [08:01] not necessarily subdirs [08:01] the obvious way to express that to me is 'bzr log dir/*' [08:02] (that doesn't work, I'm speculating on UI right now) [08:02] ah [08:02] yeah, it didn't work :) [08:02] also, can anyone explain why bzr is case sensitive on windows? [08:02] lifeless: that UI sounds good to me too. [08:02] You'd need a --no-recuse dir/* [08:02] Stevage: because windows is case sensitive [08:02] it's sort of bizarre [08:02] Since it's likely that * will encompass subdirs.... [08:02] lifeless: since when? [08:02] bleh [08:03] "dir pfx" works for a dir called PFX, so why doesn't "bzr log pfx"? [08:03] did I mention I'm about 6 hours past lunchtime with no food [08:03] (unless you make recursion non-default, but I think that would be Wrong(tm)) [08:03] Stevage: oh I see. Please file a bug, we can fix that. [08:03] Stevage, i'd say it's because we're case sensitive everywhere [08:03] coolies === pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr [08:03] well perhaps the UI could be case insensitive [08:03] it would be better if we were case-insensitive internally on platforms where the user would expect that [08:03] right [08:04] where's the bug tracker? [08:04] bugs.launchpad.net/bzr [08:05] i think 'state verification' is a really poor name, implying that it's for testing things that mutate state [08:05] something like 'result verification' would be better [08:06] lifeless: emailed you the results from my repo btw [08:07] it's a good system of naming in other regards though [08:07] spiv, what bothers me a bit about some of the remote tests is that they are very mock-based, [08:07] and i guess i am not a mockist [08:07] i would rather test against a fake object and observe the results [08:07] hm [08:08] also, even for a mock object they're one-sided in that they check only inputs, not results, or vice versa [08:13] i'd like to use http://martinfowler.com/bliki/ObjectMother.html in more tests [08:13] in particular it would be a neat way to make either everything or nothing use unicode filenames [08:13] for examlpe [08:20] hey can anyone tell me why bzr.exe is so slow? [08:20] what in particular is slow? [08:20] it takes on the order of 2 seconds just to return "bzr help" [08:20] it's a problem for me because I need to call it approximately 50,000 times [08:21] ! [08:21] yeah [08:21] this is for your importer? [08:21] yep [08:21] for comparison on my linux machin it's about 0.1s [08:21] sucks [08:21] so it's a windowsy thing [08:21] are you running it under cygwin? [08:21] i'm not sure [08:21] no [08:21] native [08:21] can you try it with bzr --profile-imports help [08:22] ok what to do with the output? [08:22] 281.0 it lists for 'cum' of bzrlib [08:23] hmm, seems when I run it a few times in a row it's quicker, but still close to a second maybe [08:24] Stevage: paste the output at http://rafb.net/paste and we can take a quick look at it [08:26] http://rafb.net/p/XMjBKk33.txt [08:32] Stevage: hmm, nothing jumps out at me except for that fact that all imports are pretty uniformly slow. [08:33] Stevage: I wonder if it's something to do with the way bzrlib is packed bundled into a zip file by the win32 installer? [08:33] Stevage, how long does it take to do [08:33] python -c "import bzrlib" [08:34] Stevage: I suppose you could compare running from the source distribution. (download and unpack the source tarball, install the standalone python if you haven't already, and run "python path\to\unpacked\bzr --profiled-imports help") [08:34] that would be good [08:40] python -c "import bzrlib" took about half a second. is there a way to time it? [08:42] poolie: the first two numbers are 219 and 172 (instead of 281 and 172). want me to paste it? [08:42] Even "import sys" takes 15ms according to your --profile-imports output! (Maybe that's just because the resolution of time.time() on win32 is so poor? time.clock() is better on win32) [08:42] yeah I tihnk it's resolution [08:43] all the times are listed as 0, 15, 16, 31... === spiv nods === hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr [09:01] Stevage, i suspect it's something windows-specific as it's so much slower than here [09:01] aside from anything else you should probably post to the list so alexander and co can look at it [09:01] also running from source as spiv says would be good [09:03] running from source is faster than running from precompiled? [09:04] I'm semi-running from source (due to my change) [09:04] or can I compile it myself, will that go faster? [09:05] there are two orthogonal things here - whether you have the extensions compiled [09:05] and whether you're using bzr from inside a zip file, or from separate files on disk [09:05] i think spiv was thinking that using a zip file might be much slower [09:06] ah [09:06] how do I check? [09:06] ok, bazaar\lib contains library.zip [09:06] if I unzip that will it be faster? [09:06] and if so, do I just dump the files in lib? [09:07] probably the best thing would be to download the 0.91rc2 tarball [09:07] extract that, then run from in there [09:07] i realize that won't have your changes but let's at least see how it compares [09:07] i assume this is a reasonably new machine? [09:08] not especially new, why? [09:09] it's a P4 2.4Ghz [09:09] i mean if it's an 800Mhz pentium [09:09] ok [09:09] heh yeah [09:10] ok, why do you do want me to download .91rc2? is it a lot faster than .90.0? [09:12] is that equivalent to bzr.dev? === pmezard [n=pmezard@dhcp26-226.enst.fr] has joined #bzr === g0ph3r [n=g0ph3r@p57A09BB1.dip0.t-ipconnect.de] has joined #bzr [09:20] New bug: #140614 in bzr "selftest noise re _http_start" [Undecided,New] https://launchpad.net/bugs/140614 [09:22] bzr.dev would also be ok [09:22] Stevage, it may be faster, but i think the speed problem may be something specific to your tree [09:22] i'm not familiar with the library.zip thing and i wonder if that's causing a problem [09:31] New bug: #140615 in bzr "get_reverse_tag_dict" [High,New] https://launchpad.net/bugs/140615 === Gacha [n=gacha@81.198.204.153] has joined #bzr [09:38] hi [09:38] I want to create a repository, like /repository then project1, project2 ... [09:39] I need to call "bzr init" in the repository or there is some more to know? [09:43] Gacha, init-repo for the repository, then init for each project [09:44] thanks [09:44] and how can I get a clean copy of a project, without the .bzr dirs? [09:44] with "bzr get"? [09:47] Gacha: you need the .bzr [09:47] unless you don't want to use bzr -- you could export in that case [09:47] but when I want to use my software for production, not for editing [09:48] that's usually done with your build tool [09:48] but if there's nothign to build you can 'bzr export ... ' or rsync --ignore=.bzr [09:48] thanks [09:49] er, that'd be rsync --exclude=.bzr (I was going from memory) [09:49] what scm/vcs did you use before bzr? [09:50] none [09:50] this is my first try to use versions :) [09:50] how did you deploy to production then? [09:51] just a copy? [09:51] with rsync [09:51] ah [09:51] I had test, production and bacula for safety [09:52] you could have a tiny Makefile or 'deploy' script which ensured that there were outstanding changes and no rubbish before you rsync'd === Zindar [n=erik@stockholm.ardendo.se] has joined #bzr [09:52] '' that there were NO outstanding changes ..' taht should read [09:54] I was coding alone so there was no problems, but now I feel the need for versions and branches [09:54] the hardest would be to lern this to my boss [09:55] I know exactly what you mean [09:55] he likes to open files as root, edit and thats it [09:55] and I cant say anything :) [09:56] :-) [09:56] Oh, don't say anything. Just overwrite his changes. [09:56] When he starts bitching, you look him in the eye and say "They weren't in version control, so they never happened." [09:56] hook up aide or tripwire with a script that copies changes to a bzr repo === grimeboy [n=grimboy@85.211.235.193] has joined #bzr === mlh thinks .. maybe that would the start of a good bzr plugin [10:00] now when I called "bzr init-repo repository" I need to create the projects. I should create them with mkdir and call "bzr init" in the project folder, and nothing in the repository folder? === mvo [i=egon@nat/canonical/x-f81d0ec91f3cc942] has joined #bzr [10:02] see the example in 'bzr help init-repo' [10:03] I did [10:03] I theeenk you almost always want --no-trees but I'm far from an experienced bzr'er [10:04] oh, and you did everything up to the 'cd trunk-checkout' ? [10:04] You always want --no-trees, except when you don't. Then you want --trees, which you always want, except when you don't. [10:04] right === mlh is grateful for fullermd's lucid explanation === fullermd overflows with topical advice. === fog [n=fog@debian/developer/fog] has joined #bzr [10:06] and whats the difference between --no-trees and trees? What would be the "working trees by default" ? === jml_ [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr [10:09] Gacha: for one project, the repo and the working tree are in the same place [10:09] I need repo for many projects [10:09] No you don't. [10:09] in the init-repo/checkout --lightweight model, they're in different places [10:09] repository/project1/trunk/..... [10:09] Gacha: it's not a problem to have a repo for each project [10:10] http://doc.bazaar-vcs.org/latest/en/user-guide/shared_repository_layouts.html#id4 [10:10] I want the 1.1 [10:10] There's no real gain in storing unrelated branches in a repository (there's not any real loss either, but there's no gain) [10:11] night all [10:11] You may be mislead by comparisons to other VCSen. [10:11] Gacha: right, note the separate repo for each project; this contrasts with the SVN layout [10:12] in 1.1 svn has 1 repo for 2 projects; bzr has a repo for each project [10:12] so, I need to create the repository with the --no-tree or without? The project dirs I can create with simple mkdir or there is some other way? [10:13] again, I think (but stand to be corrected) that all branches/trunks in a bzr init-repo repo should be closely related, i..e branches of one another [10:13] so, I need to do "init-repo" in each project dir? [10:13] Well, the answer is yes and no. It depends on how you want to work. [10:13] Gacha: don't sweat over no-trees [10:14] but I dont understand the difference [10:14] if you do the lightweight checkout, you're creating a working tree elsewhere and clearly don't need trees in the repo [10:14] from the one statement in docs [10:14] The difference is in where your working files are. [10:14] With --trees, your branches in the repository have working trees colocated in them. With --no-trees, they don't, and you have to check them out elsewhere to work on. [10:15] 2nd option looks better [10:15] the other thing is you don't have to decide now. === matkor [n=matkor@EUROCZESCI.wbs.ssh.gliwice.pl] has joined #bzr [10:15] Quite. You can always change your mind and shift stuff around later. [10:15] just mkdir proj1; cd proj1; bzr init [10:16] you can forget abotu init-repo for the moment [10:16] bzr is easy to start with [10:16] The question of repositories and where working trees are are pretty ephemeral; you can change all that around any time. [10:17] I have a remote server where I want to make the repository, but the editing will be on my work computer and home computer. [10:17] Are you sure you want the repo remotely? You end up having to go across the network every commit then. [10:18] how I understand, I need to use Heavyweight Checkout [10:18] indeed [10:19] I'm a web developer and the changes should be visible every time I commit them [10:19] Well, that won't happen regardless. [10:19] Commiting a new revision into the branch won't update some other working tree. === metze_away is now known as metze === allenap [n=allenap@80.187.145.193] has joined #bzr [10:20] if you want to do a checkout/export/deploy for every commit, that might be possible with a hook (don't know) or you can have a cron job os seomthing poll the repo [10:20] I'm pretty sure the SS doesn't exec any hooks, so you're down to manually or cronally triggered. [10:21] but having everything deployed the second it hits the repo is not the design use of a vcs [10:21] I will execute the pull every time is needed [10:21] you want to use bzr as a replacement for bacula/rsync/whatever [10:22] :D [10:22] I want to edit files on my local machine [10:22] then with small script push them to remote server [10:22] :-) which is a common but discouraged mode of use for any vcs. Certainly the svn and cvs mailing lsits get this kind of request all the time [10:23] In anything more than a one person shop, you should deploy to a demo/test/qa server and run some tests [10:23] and only deploy to production if they pass [10:23] there's also code review of course [10:23] anyway === RichardL_ [n=Skippy@78.32.35.169] has joined #bzr [10:23] enough of software engineering 101 :-) [10:24] Man, don't tempt me to go on a rant over testing web apps... I already did that this week. [10:24] I'm in the the thick of it now [10:24] what do you use? === mneisen [n=mneisen@141.13.16.222] has joined #bzr [10:24] jmeter and opensta look useful [10:24] What, for testing? Nothing, because I've never found a solution. [10:24] heh [10:24] Hence, the rant. [10:25] wel besides the above, selenium and watij/watir might be worth looking into as they drive a real brwoser [10:25] there's something in pythin around to, which I can't recall [10:25] Driving a browser sounds like throbbing pain... === fog [n=fog@debian/developer/fog] has joined #bzr [10:27] ah the python thing is 'twill' [10:27] so what should I use, the init or the init-repo? [10:27] fullermd: http://www.advogato.org/article/874.html [10:27] jmeter looks nothing like what I'd need... [10:27] Gacha: just init for now, make life easy for yourself === mvo [i=egon@nat/canonical/x-0abd8b7f884ccf3d] has joined #bzr [10:28] ok [10:28] Neitehr does opensta... these are just stress testers. [10:28] yeah stress testing is what I'm doing .. functional tests by others [10:29] but most stress testers don't udnerstand ajax which may or may not matter [10:29] Yeah, I need functional tests. [10:30] Manually stepping through multi-step processes trying various inputs to try and cover all the cases to test a change is a nightmare, and holey as hell. === mrevell [n=matthew@canonical/launchpad/mrevell] has joined #bzr [10:32] my mission is to force developers to write/add to the tests and test before they commit [10:32] fat chance === mrevell_ [n=matthew@82-47-122-108.cable.ubr05.wolv.blueyonder.co.uk] has joined #bzr === mrevell_ is now known as mrevell [10:34] That wsgi stuff in twill sounds like a load of crud I don't need. I'd just test it against a web server. [10:35] My problem is I fear any solution is just going to be miserable to use, since I have to define multi-stepping, then going to the right place to check stuff :| === jml_ is now known as jml [10:40] He surveyed the website, and all gladness left him and a deep melancholy settled down upon his spirit. Life to him seemed hollow, and existence but a burden [10:40] (misquoting tom sawyer) === mlh -> home [10:41] Mmm. Doesn't seem to do anything for the picking apart forms on the viewing side :| === NamNguyen [n=namnt@203.162.163.50] has joined #bzr === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr [11:24] ok that's it for me === RichardL_ [n=Skippy@78.32.35.169] has joined #bzr === hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr === herzel93 [i=herzel@gateway/tor/x-34412d02e9b2002d] has joined #bzr === RichardL_ [n=Skippy@78.32.35.169] has joined #bzr === elmo [n=james@83-216-156-21.jamest747.adsl.metronet.co.uk] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === allenap [n=allenap@80.187.145.193] has joined #bzr === Zindar_ [n=erik@stockholm.ardendo.se] has joined #bzr [01:12] Is there a command to give me the log --short info about a revision, and also the list of affected filepaths? [01:12] log --short -v ? [01:12] log --short -v ? [01:12] ciao [01:13] perfect, thanks [01:14] is there a way to specify the user as argument when commiting ? === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr [01:21] Gacha: Starting with the next vversion of Bazaar, there's a --author argument to bzr commit. [01:21] an. [01:22] nice [01:22] when it will be? === Peng points up at the 0.91rc2 link in the topic === gabe_ [n=gabriel@91.84.56.254] has joined #bzr === nir [n=nir@moinmoin/fan/nir] has joined #bzr === mrevell is now known as mrevell-lunch === marianom [n=marianom@ubuntu/member/marianom] has joined #bzr === herzel53 [i=herzel@gateway/tor/x-249aeca861227bfb] has joined #bzr === mw|out [n=mw@189.146.27.197] has joined #bzr === NamNguyen [n=NamNguye@cm103.delta195.maxonline.com.sg] has joined #bzr === mrevell-lunch is now known as mrevell === niemeyer [n=niemeyer@200-103-134-216.ctame705.dsl.brasiltelecom.net.br] has joined #bzr [02:29] Gacha: we release monthl [02:30] why the ubuntu package is so outdated? [02:30] it's not THAT outdated [02:30] it's like 1 version behind stable... [02:30] it would be safe to install from source the new version? [02:30] Gacha: there is a deb repository at bazaar-vcs.org [02:30] you can always get the latest bzr from there for your Ubuntu/Debian release [02:32] right, I forgot that already installed the newsest from your repository, sorry :) === mw|out is now known as mw === allenap [n=allenap@80.187.147.45] has joined #bzr === Zindar [n=erik@stockholm.ardendo.se] has joined #bzr === anandology [n=anand@59.92.138.185] has joined #bzr === marianom [n=marianom@ubuntu/member/marianom] has joined #bzr === anandology [n=anand@59.92.138.185] has left #bzr [] === fog [n=fog@debian/developer/fog] has left #bzr [] === ignas [n=ignas@office.pov.lt] has joined #bzr [03:57] hi [04:02] ignas: Hi. === hmeland [i=29578@klodrik.uio.no] has joined #bzr === tsuno [n=michael@ninthorder.com] has joined #bzr === orospakr [n=orospakr@132.213.238.4] has joined #bzr === metze is now known as metze_away === BasicOSX [n=BasicOSX@gatekeeper.real-time.com] has joined #bzr === mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr === alfborge [n=alfborge@bacchus.pvv.ntnu.no] has joined #bzr [04:55] Can anyone explain pending merges in an easy way? [04:56] And why do I have to merge when there are no conflicts? [04:57] you have to merge (instead of pull) when you have commited a revision of your own [04:59] thanks [05:00] ppl [05:00] what is the best way to backup a no-trees bzr repo? Just tar and bz2 it? [05:00] for example [05:00] i remember with svn i made a dumpfile...? [05:01] right. there is no such thing in bzr. [05:01] k tar and zipping is most straightforward === sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr [05:05] I think the simplest thing is to push it to another machine [05:05] bzr push = instant backup :) [05:05] (I know, that might not be what you want for a number of reason... but it's good enought for me) [05:05] Unless the bzr repo gets corrupted. :) [05:13] Zindar: that's a good idea [05:13] peng: yes :) [05:13] problem is I make copious use of sftp [05:13] Zindar: but bzr doesn't push over sftp properly [05:13] gabe_: bzr push sftp://path [05:13] what? [05:13] why not? [05:13] I use sftp all the time [05:13] never had any problems for at least a year [05:13] i use sftp all the time, it pulls [05:13] and checks out [05:14] but not push [05:14] gabe_: you're probably just misunderstanding what "properly" means :-) [05:14] gabe_: it does push quite fine over sftp [05:14] gabe_: what happens? [05:14] at least in the man it says it won't push working trees [05:14] never had any problems with it [05:14] yes [05:14] but you don't need that [05:14] gabe_: yes, it doesn't update the working tree, but all the data is there in the .bzr === Sigma [n=yann@pdpc/supporter/active/Sigma] has joined #bzr [05:14] right [05:14] aha that's ok then [05:14] you can always login and do "bzr update" to recreat then [05:14] it's true i don't need working tress [05:14] or just branch it back, etc [05:14] for example [05:14] exactly [05:15] if i push to another machine I will have a treeless repo... [05:15] if i log in to that machine and cd to the repo [05:15] how can i make trees from the .bzr? [05:15] bzr update [05:15] the reason is simply that working trees is something that can change.. so if you would want to update that, you would have to run diff and stuff like that over sftp.. which is not fun [05:15] you just run "bzr update" [05:16] and it updates from the local copy? [05:16] actually, you may need to run "bzr checkout ." if it's the first time? or maybe that's not necessary any more [05:16] that's awesome [05:16] gabe_: yes [05:16] i'll try it :P [05:16] cheers [05:16] ok :) [05:16] makes more sense than tarring and zippin [05:17] just today i moved the last of my projects over from svn [05:17] now i'm figuring out the best way to back it all up [05:20] I think it's a good idea to tar it up occasionally, just in case the repository gets corrupted or something. === cprov is now known as cprov-lunch [05:22] Peng: good idea, perhaps about once a week will be cool [05:26] Yeah. === sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr [05:43] ummm [05:43] not sure what to do... [05:44] I have a bzr repos, it is called 'bazaar' :) [05:44] i mounted a backup destination via NFS [05:44] bzr co /usr/var/bazaar/ /media/backup/ [05:44] bzr: ERROR: Not a branch: /usr/var/bazaar/.bzr/branch/ [05:45] it is a --no-trees repo with many branches beneath it [05:45] what is the easiest way to backup the entire thing? [05:46] gabe_: you can't 'co' a repo, only a branch. and since you presumably have several branches in the repo, you'd have to 'co' each of them. [05:46] so it's better to run tar+gz, or rsync [05:46] ah damn [05:47] rsync would work best if you have the old copy lying around (i.e. if you run it periodically over the same directory) [05:47] in any case, backuping .bzr is the same as backuping any other directory in the filesystem [05:48] ok so that makes it a bit easier [05:48] hmmm freebsd don't have rsync by default - cripple! === keir [n=keir@206-248-159-109.dsl.teksavvy.com] has joined #bzr [06:05] cheers, rsync worked a treat on all those thousands of knit files! [06:10] sup === gander [n=gander@agander.plus.com] has joined #bzr [06:13] sri: yo === cfbolz [n=cfbolz@p54AB9240.dip0.t-ipconnect.de] has joined #bzr === thatch [n=thatch@pool-71-96-248-177.dfw.dsl-w.verizon.net] has joined #bzr === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr === cprov-lunch is now known as cprov === michelp [n=michelp@166.129.164.223] has joined #bzr === mrevell is now known as mrevell-dinner [06:53] yo === gabe_ [n=gabriel@91.84.56.254] has joined #bzr === cpro1 [n=cprov@monga.dorianet.com.br] has joined #bzr === bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === hstuart [n=hstuart@0x503e9949.virnxx12.adsl-dhcp.tele.dk] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === mrevell-dinner [n=matthew@82-47-122-108.cable.ubr05.wolv.blueyonder.co.uk] has joined #bzr === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr === bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === MishaS [i=MishaS@a91-154-120-151.elisa-laajakaista.fi] has joined #bzr === radix [n=radix@70.91.133.157] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === fog [n=fog@debian/developer/fog] has joined #bzr === jnair [n=jayesh@203.123.188.10] has joined #bzr [08:12] could someone please get me the output of bzr info -v bzr+ssh://bazaar.launchpad.net/~bzr/bzr/trunk I don't have my ssh key around. [08:12] I just need the format lines really, in particular the branch. [08:14] ah, no need, grep saves the day again. === theuiguy [n=tpowell@seraphim.asbury.edu] has joined #bzr === theuiguy [n=tpowell@seraphim.asbury.edu] has left #bzr [] === grimboy_uk [n=grimboy@85.211.240.64] has joined #bzr === grimboy [n=grimboy@85.211.237.228] has joined #bzr [08:31] i'm trying to build a bzr-17 rpm with python2.4 setup.py bdist --fromats=rpm ...and it errors at /bzr-0.17.0/bzrlib/__init__.py", line 46 complaining of 'invalid syntax' [08:31] any ideas ? [08:32] line 46 is bzrlib.symbol_versioning import (deprecated_function, === ignas [n=ignas@ctv-213-164-108-111.vinita.lt] has joined #bzr [08:41] hi [08:41] hi : ) === grimboy [n=grimboy@85-211-250-118.dsl.pipex.com] has joined #bzr [08:43] my checkout weights ~70 mb, is there a way to make working with it through the network a bit easier? [08:43] i mean just pushing the branch to launchpad takes ages [08:43] makes me think twice before creating a public feature branch :/ === vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr === phanatic [n=phanatic@dsl5400C41D.pool.t-online.hu] has joined #bzr === beuno_ [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr === beuno_ [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr === beuno_ [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr === cr3 [n=cr3@200-171-140-32.dsl.telesp.net.br] has joined #bzr [08:55] when I bzr push, I get: No push location known or specified. So, where can I specify a push location? [08:55] bzr push [LOCATION] [08:56] can i get bzr tell me more information about progress of such looong operations as "bzr push"? [08:56] ignas: thanks, I wonder why that location wasn't preserved when branching [08:56] well, *pushing* a branch into the place which you branched from [08:57] is not what you want 90% of the time [08:57] usually you *branch* and then *merge* the changes back === beuno [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr [08:59] hmm, bzr push sftp://some-place-in-launchpad -v is not giving me anything more than the same old progress bar :/ === pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr [09:13] corporate_cookie: you need python 2.4, it looks like you are running python 2.3. [09:14] james_w: when I issue python2.4 -V ...it tells me i'm running Python 2.4 === grimboy [n=grimboy@85-211-247-238.dsl.pipex.com] has joined #bzr [09:17] corporate_cookie: ah, sorry, I missed you were explicitly running with 2.4 [09:17] corporate_cookie: does the line in question not start with "from"? [09:20] james_w: it dose indeed start with from [09:20] corporate_cookie: what is the previous line? [09:21] james_w: version_string = '%d.%d.%d%s%d' % version_info [09:21] __version__ = version_string [09:21] its an else clause [09:25] I'm not sure then. [09:25] alas ..that makes two of us [09:25] thanks for the help though === michelp [n=michelp@70.103.91.130] has joined #bzr === BasicMac [n=BasicOSX@216.243.156.81.real-time.com] has joined #bzr === BasicMac_ [n=BasicOSX@warden.real-time.com] has joined #bzr === jdong is now known as J-UNIT === hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr === Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr === cr3 [n=cr3@200-171-140-32.dsl.telesp.net.br] has left #bzr [] === J-UNIT is now known as jmillionator === jmillionator is now known as J-diddy === sverrej [n=sverrej@tul-1x-dhcp017.studby.uio.no] has joined #bzr === asak [n=alexis@201-1-200-114.dsl.telesp.net.br] has joined #bzr === BasicMac_ is now known as BasicOSX === cpro1 is now known as cprov-out === fog [n=fog@debian/developer/fog] has left #bzr [] === AnMaster [n=AnMaster@unaffiliated/anmaster] has joined #bzr === jamesh__ [n=james@canonical/launchpad/jamesh] has joined #bzr [11:37] I have been searching the website for info about the command "sign-my-commits" and how it is used but have been unable to find anything useful in the way of documentation [11:37] I would like some more info about how it works === Peng [n=mnordhof@fl-69-69-137-70.dyn.embarqhsd.net] has joined #bzr === grimboy [n=grimboy@85-211-251-188.dsl.pipex.com] has joined #bzr [11:44] AnMaster: it triggers the normal gpg signing for all revisions that match [11:45] and are not signed [11:45] lifeless, hm? and how does the normal gpg signing work [11:45] that is where I can't find any info [11:46] doc.bazaar-vcs.org/bzr.dev/en/user-guide/configuration.htm [11:46] sorry, http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/configuration.html [11:52] lifeless, hm, one problem, how does it select gpg key [11:52] I would have several that would match [11:52] it users your default, unless you override the signing command to supply it [11:53] ok [11:53] lifeless, I'm not sure what my default one is, as I use GUI frontends like kgpg [11:53] gpg --clearsign foo [11:53] wll probably tell you [11:54] if kgpg accepts gpg commands you can use kgpg from bzr [11:54] I use gnome-gpg for instance [11:54] which means I get a gui prompt [11:54] hm [11:54] gpg_signing_command = gnome-gpg [11:54] in my bazaar.conf [11:55] hm [11:56] now this is odd, I just checked against key server and some one I got no idea who it is has signed my key. hm [11:56] oh well doesn't belong in this channel