/srv/irclogs.ubuntu.com/2009/02/13/#bzr.txt

jelmerlifeless: thanks, much appreciated!00:00
poolielifeless: could you repaste to me or point me to the numbers for gc performance on bzr.dev please?00:03
lifelesshttp://paste.ubuntu.com/116333/ <- these?00:04
lifelesspoolie: or the usertest ones ian did?00:05
pooliethat looks right00:07
pooliethat's the first 1000 commits of bzr?00:08
Odd_BlokeSo I'm using looms for something at the moment.  I have two looms currently, and I have a change to make which belongs between them.  Can I do that in any sensible manner?00:08
lifelesspoolie: thats more00:08
lifelesspoolie: I have the first 1000 stats , one sec00:08
poolieif this is more that's fine00:08
poolieso it's something more than 1000 commits of bzr? all of them?00:09
lifeless741000:09
lifelessnot sure of the revno00:09
lifelesshttp://paste.ubuntu.com/117486/00:11
pooliethanks00:12
lifelessspiv: woo00:15
lifelessspiv: no new failures, just that one test I discussed with John to tweak, and a 1200 line patch to eyeball :P00:15
spivHeh.00:17
spivHmm, overdue for breakfast.00:17
lifelessspiv:00:29
lifeless# branch.sprout(bzrdir) is defined as using the branch format selected00:29
lifeless# by bzrdir; format preservation is achieved by parameterising the00:30
lifeless# bzrdir during bzrdir.sprout, which is where stacking compatibility00:30
lifeless# checks are done. So this test tests that each implementation of00:30
lifeless# Branch.sprout delegates appropriately to the bzrdir which the00:30
lifeless# branch is being created in, rather than testing that the result is00:30
lifeless# in the format that we are testing (which is what would happen if00:30
lifeless# the branch did not delegate appropriately).00:30
spivlifeless: +100:31
mwhudsonwhich reminds me of something00:31
mwhudsonwhat's the difference between clone and sprout?00:31
lifelessmwhudson: push and branch00:31
lifelessmwhudson: identical copy vs new line of development00:31
lifelessspiv: so with that explanation, it seems reasonable to me, to say, if (remote), parameterise bzrdir with [arbitrary non-source branch format]00:32
mwhudsonok00:32
lifelessspiv: and otherwise leave well enough alone00:32
igclifeless, spiv: pull is giving me grief in brisbane-core saying ...00:33
igc"must end write group before releasing wrote lock"00:33
lifelessigc: that means that its breaking in a @write_locked decorator00:34
igcI've spent 30 minutes trying to find the problem but no luck so far :-(00:34
lifelessand the code path isn't aborting the write group [generally a bug]00:34
lifelessigc: disable that assertion, you'll see another one pop up; I thought we logged the real one or something, but perhaps not yet00:35
igcI've looked at the changes to fetch.py, repository.py and pack_repo.py but nothing stands out to my untrained eye00:35
lifelessspiv: ^ does my plan scan for you ?00:35
igclifeless: ok, I'll try that00:35
lifelessigc: or even (if its nt a blackbox test) a pdb call inside the point that that is raise, would let you look at sys.exc_info00:36
spivlifeless: yes, that sounds good00:37
spivigc: ah yeah, as lifeless says that's typically like TooManyConcurrentRequests — there's an underlying exception being lost by the failure to abort the write group.  If you can change abort_write_group or something to log the current exception first, or just reraise, that might help.00:39
lifelessspiv: ok thats done and passing00:42
lifelessspiv: suggstion: in those acceptance tests we have00:45
lifelessspiv: put a ratchet now on the hpss call count00:45
* spiv nods00:46
lifelessspiv: bombs away, putting up a bundle - you can pull that to get the final code00:52
spivOk.00:54
lifelessspiv: I think you didn't pair with me on enough of this that you can review it with clear conscience:)00:55
lifelessin the meantime, I'm going to eat, then look at record_stream().next().get_network_bytes conceptually for a bit00:57
lifelesspossibly by walking, I think this is a thinking time00:57
jelmerhmm, activity reporting works on svn transports but I'm not sure it should be kept in, it makes svn look slow :-P01:05
lifelessjelmer: why?01:06
jelmerlifeless: average speed is < 100kb/s01:07
jelmerI'm getting much more than that for "native" bzr01:08
jelmerlifeless: I was kidding, it works well01:08
fullermdHey, maybe there'll be an entirely new and original statement made in this thread about explicitly-vs-not tracking renames...01:08
jelmerI guess I should just do some more optimization01:08
mtaylorhey all you wonderful people...01:10
mtayloranybody gonna update the bzrtools package in the PPA?01:10
mtaylorI'd like to upgrade my bzr but I can't because it'll uninstall bzrtools, and I use those too much ... :(01:11
igclifeless, spiv: so disabling that exception didn't work, nor did looking at exc_info() via pdb ...01:11
igcit does have an exception there about NotABundle but it's a red herring caused by ..01:11
igcan attempt to read the location as a bundle early in cmd_pull01:12
igccomment that bit out and exc_info is (None,None,None)01:12
jmlmtaylor: I don't know the answer to your question.01:13
mtaylorjml: oh well.01:13
jmlmtaylor: but many people are in the same boat as you. perhaps the things that are in bzrtools that everyone uses should be pushed into bzr proper01:13
mtaylorjml: yes. perhaps so.01:13
mtaylorjml: or, a release policy that ensures bzrtools goes to the ppa at the same time as bzr - I'd be fine with either01:14
igclifeless, spiv: it might be something dumb on my end - let me keep looking01:14
jmlcdiff, cbranch & clean-tree are about all I use from it.01:14
jmlpatch sometimes01:14
mtaylorshelve01:15
jelmermtaylor: shelve is in bzr itself these days01:15
mtaylorshelve is my savior in many case01:15
mtayloris it?01:15
mtaylorcool01:15
jelmerthere was also agreement about having clean-tree in bzr itself, but nobody has stepped up yet and actually done it01:16
mtaylorheh01:16
* jml adds a personal todo01:16
jelmerpoolie: what are your plans for backports exactly?01:22
lifelessigc: hi01:22
jelmerpoolie: addition to PPA or replacement?01:22
lifelessigc: so unlock was being called and no exception had occured?01:23
lifelessigc: what specifici test is doing this?01:23
pooliejelmer: in addition to the PPA01:24
pooliemaybe not updated immediately when we release, and maybe not done for every release01:24
lifelessigc: (I will run it and give it a shot)01:25
poolie> jml: mtaylor: but many people are in the same boat as you. perhaps the things that are in bzrtools that everyone uses should be pushed into bzr proper01:25
pooliei agree with jml01:25
poolieif "everyone has it" as seems to be the case why keep it separate01:25
lifelessso network delta reuse01:29
lifelessI think a sensible approach is:01:29
lifelesseach record in a stream has a network representation01:30
lifelesswe assume that a stream recipient can use any part of a stream they have seen before, for text extraction01:31
lifelesswe assume a stream recipient *will* extract every text, to validate them01:31
lifelessa delta which needs data not introduced as a diff by that delta just includs that in its network representation01:32
lifelessand the stream knows what to include/not include01:33
lifelessfinally, we have graph data seperate, but offer a single api call to get the right bytes for serialisation01:33
lifelessthis lets compressors like knits and gc which don't embed graph data not have to grow graph data foo01:34
lifelessbut lets compressors like weaves which do embed graph data just use the embedded data01:34
lifelessa minor tweak would be to say that record.get_bytes_as(record.storage_kind) if record.storage_kind not in ('chunked', 'fulltext') will return something with inline bytes for graph and raw data01:35
spivI'm not clear on what you mean by "a delta which needs data not introduced as a diff by that delta just includs that in its network representation"01:35
lifelessspiv: a knit-delta-gz01:36
lifelessspiv: with include_delta_closure == True01:36
lifelesswould just include its parents transitively up to a full text in the blob you get when you ask for the bytes01:37
spivOk.01:37
lifelessso a naive implementation which never recompresses might include the same external parent several times01:38
spivSo the network representation for record can vary depending on the stream's include_delta_closure flag, and what has gone on the stream prior to that record.01:38
lifeless(when we have include_delta_closure ==True)01:38
lifelessspiv: yes01:38
spivOk.01:38
lifelessspiv: should I start a branch that aims to test this and get it working with knits and weaves?01:39
spivYes please :)01:39
lifelessok01:39
spivHmm, I need caffeine, but I'm out of beans.01:40
lifelessI have one remaining 'this may be bad' bit - which is that we may need (given this structure) to stash the stream of inventories during a rich root upgrade01:40
lifelessbecause of the 'can use anything seen before' constraint01:40
lifelessbut I think writing a temporary versioned files to disk isn't really so bad01:40
spivUgh.01:40
lifelessalternatively, we window it01:41
lifelesswe say 'anything in the last 256 items', and the generator knows that it has to track what parents are available in that window01:41
spivLet's just kill non-rich-root already ;)01:41
* spiv nods01:41
lifelessspiv: well it still applies with xml -> bbc01:41
spivI know :)01:41
lifelessspiv: or even bbc-flavour-A to bbc-flavour-B01:41
spivAnd I'm sure we'll be varying the inventory format again one day, we're good at doing that ;)01:42
lifelessbecause we may need random access to data from the source which is at the far end of the wire01:42
lifelessso we need a contract where the sender can say 'you need these texts to read my shit', here they are01:42
lifelessand the recipient can then access them all01:42
igclifeless: I'm about to grab some food so here's a brain dump ..01:43
igcto trigger it ...01:43
igcbzr-gcchk init --gc-plain-chk xx01:43
igccd xx01:43
lifelessigc: there isn't a test case that dies?01:44
igcbzr-gcchk pull ../some-pack-branch01:44
igcbzr-gcchk is brisbane-core with the latest groupcompress plugin01:44
igcusertest is dying01:44
igcit gets pass 900 revisions being pulled so my theory is ...01:45
igcit's something in groupcompress/repofmt.py, around auto-packing say01:45
lifelessbzr.dev is the test branch ?01:46
igcI added -Dpack and looked at bzr.log ...01:46
lifelessigc: oh, packing is broken01:46
lifelessigc: I was discussing this with jam01:46
igcbtw, groupcompress/repofmt.py needs to import trace and use trace.mutter for -Dpack to work :-)01:46
lifelessprobably need to disable autopack at the moment01:47
igcbzr.log had a message about autopacking to 1000 revs but it wasn't the very last message fwiw01:47
igclifeless: so what's the easiest way to disable autopack?01:48
lifelessbzrlib.repofmt.pack_repo - in there somewhere ;)01:48
igclifeless: np. I disable it in fastimport so I'll do the same thing I do there :-)01:48
jelmerpoolie: thanks01:48
doozer__112hi - apologies for what's probably a basic question... ;)  But - I'm testing bazaar on XP and the tortoise? integration into the explorer shell works fine - but the only major task it doesn't seem to do is rolling back between versions of a file.  I can do it from the command line if necessary, but was wondering if I'm just missing something?!01:48
* igc grabs some lunch01:49
igclifeless: a quick update ...01:52
igcI tried the same thing with bzr.dev+groupcompress using gc-plain01:53
lifelessigc: it should break the same way, if you do multiple write groups to it; fetch from a compatible repo won't do that though01:53
igcit falls over as well, but in a different place - insert_record_stream inside the group_compress plugin01:53
lifelessdoozer__112: I'm not sure, perhaps you could file a bug? (If its not obvious, thats a bug, if its not there, thats a bug too :P)01:53
lifelesspoolie: re: performance figures, the insertion time includes disk read IO02:04
lifelesspoolie: so its not a reliable figure yet. My observation is that its not wildly off, as each pass thrashes on the same content :P02:05
lifelessigc: a backtrace, and the exception would be good02:05
=== RAOF_ is now known as RAOF
doozer__112lifeless: heh, thanks, just playing with some of the other GTK based GUI's too..02:16
lifelessspiv: please paste your knit modem code :)02:17
victory747I'm having troubles with bzr-svn - I am pulling into an existing repostiory, and since upgrading to jaunty (bzr 1.11, bzr-svn 0.5.0), all my revision-ids used to have blahblah:Dir%2Ftrunk: and now they have blahblah:Dir/trunk:02:22
victory747So it sees the branches as having diverged02:22
lifelessvictory747: bzr-svn 0.5 is a fairly big upgrade, I suggest reading the release notes02:25
spivlifeless: you mean http://people.ubuntu.com/~andrew/bzr/streaming-push ?02:29
igclifeless: the backtrace from pulling into a gc-plain branch has just been emailed to you02:29
lifelessspiv: just the bencode bits :)02:29
spivlifeless: http://rafb.net/p/rIAqn353.html02:30
victory747lifeless: Thanks - I think I understand now02:40
lifelessigc: ugh, uhm02:42
lifeless=== modified file 'repofmt.py'02:43
lifeless--- repofmt.py  2009-02-10 22:08:17 +000002:43
lifeless+++ repofmt.py  2009-02-10 22:47:37 +000002:43
lifeless@@ -300,6 +300,8 @@02:43
lifeless         self._reconcile_does_inventory_gc = True02:43
lifeless         self._reconcile_fixes_text_parents = True02:43
lifeless         self._reconcile_backsup_inventory = False02:43
lifeless+        # Tell fetch what we require.02:43
lifeless+        self._fetch_order = 'topological'02:43
lifeless 02:43
lifelessigc: ^ try that02:43
lifelessigc: it shouldn't be needed, but if you have a broken source repo it may help02:43
lifelessspiv: thanks02:45
kenichiwhat's bzr for "up -r NN" where NN is a few revisions ago?02:47
lifelesskenichi: currently the closest is 'bzr revert -r NN'02:47
kenichilifeless: that doesn't seem to work the way i'm thinking...  i want revert the whole working copy to rNN.02:49
lifelesskenichi: thats what it does02:50
lifelesskenichi: after doing that, 'bzr diff' shows the change from NN to -102:50
kenichiugh.. sorry, i should stop working now... yes, thanks it works.02:51
poolieigc, the display of merges in the commit template is a good idea but not a post-rc thing i think03:13
igcpoolie: ok03:14
igcpoolie: did you see markh's email re tortoise docs?03:14
igche'll like them in 1.1203:15
igcapparently, it was ready for 1.11 but hasn't been landed by anyone03:15
pooliei landed something related to that...03:20
trois ther an external api reference? http://starship.python.net/crew/mwh/bzrlibapi-oe/ seems down03:21
lifelesstro: you can run pydoctor locally03:22
lifelessmwhudson: ^03:23
poolieah i see it03:23
poolietro, lifeless, i'll see if we can run it on escudero03:23
tro:)03:23
mrooneyWill upgrading my bzr in Intrepid fix this: "Selected-file commit of merges is not supported yet"?03:36
mrooneyor, is there a way to merge just one file03:36
fullermdNo, and not if you want merge tracking of it.03:36
mrooneyCrap. Okay, thanks03:37
lifelessmrooney: you can merge just one file, but it becomes a cherrypick: 'bzr merge branch/FILENAME'03:37
fullermdYou can fling around single file changes or the like, but history-wise it's indistinguishable from doing the same thing manually.03:37
mrooneylifeless: will merging again in the future (a full merge) work fine then?03:37
lifelessmrooney: probably03:37
mrooneyokay that is what I need then, thanks I'll give it a try!03:38
mwhudsontro: http://starship.python.net/crew/mwh/bzrlibapi/ ?03:39
poolietro: where is the -oe version linked?03:40
poolieour main doc server is apparently too old to have a packaged version of pydoctor03:41
lifelessspiv: ping03:41
spivlifeless: pong03:42
lifelessspiv: how do you bdecode 'the first item from this long bytestream'03:42
spivYou don't.03:42
lifelessah-ha!03:42
lifelessno wonder it was seeming difficult03:42
spivAt least, not with any bencode.py that anyone has written.03:42
poolieyou could write one fairly easily03:42
spivYou could in principle do it.03:43
spivBut honestly, I've written enough network stuff like that in recent times :)03:43
pooliemwh: should i remove the link to the editable copy?03:43
mwhudsonpoolie: yes, i think so03:44
lifelessspiv: so heres my structure03:46
lifelessI have a NetworkRecordStream calss03:46
lifelesswhich takes a bytes_iterator03:46
lifelessand has a read() method that returns a generator which reconstitutes the input stream03:47
lifelessI want to dispatch to some code that isn't written yet03:48
lifelessso I want the generating code to output enough data that I can dispatch on it03:50
lifelessspiv: is _length_prefix in bzr.dev?04:46
spivlifeless: no, but it's trivial:04:49
spivdef _length_prefix(bytes): return struct.pack('!L', len(bytes))04:49
lifelessspiv: its ok for now I'm just handwaving, we can tune Monday04:56
lifelesspoolie: spiv: I'm calling it, have a good weekend05:23
lifelessspiv: I have good progress at pushing that down to the VF interface05:23
lifelessspiv: we'll still have to do the ugly vis-a-vis delta closures and so on05:23
poolienight ll05:25
spivlifeless: cool05:26
spivlifeless: the write group stuff is looking good too05:26
=== poolie changed the topic of #bzr to: Bazaar version control system | 1.12 released 13 Feb | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | http://planet.bazaar-vcs.org/
spivpoolie: woo05:26
pooliespiv, can we have a really quick call?05:34
AfCpoolie: I thought you were aiming for the 1234567890 timestamp :)05:36
poolienot precisely05:36
AfCAnyway,05:40
AfCCongratulations to the Bazaar hackers on your continued persistence.05:40
spivAfC: even in the face of lengthy mailing list threads? :)05:44
fullermdIf it goes on long enough, somebody will say something that hasn't been said the last 50 times the topic was discussed.05:47
fullermdSurely.  Statistics alone...05:47
fullermdHm.  The tarball for the 1.12 release is called bzr-1.12rc1.tar.gz ?06:38
vilahi all06:58
vilamtaylor: Are you having a problem with bzr/bzrtools getting out of sync ? Where are you getting them from ?07:00
mtaylorvila: from the ~bzr ppa07:00
vilaBoth will be upgraded today to 1.12 if poolie finish the 1.12 release (which he should ;-)07:00
mtaylorvila: deb http://ppa.launchpad.net/bzr/ppa/ubuntu intrepid main07:00
mtaylorcool07:00
vilaIn the mean time the bzr-beta-ppa contains both 1.12rc107:00
vilamtaylor: which TZ are you in ?07:01
mtaylorvila: Pacific US07:02
vilamtaylor: then you should have then when you wake up tomorrow :)07:03
mtaylorvila: yay! (although you are assuming I will go to sleep at a reasonable time...)07:03
mtaylorvila: so I _might_ have it before I go to bed!07:04
vilamtaylor: now *you're* assuming I can produce them before you go to sleep :)07:04
fullermdSleep?  Didn't we do that LAST week?07:05
igchi vila. Thanks for the review. I'll take a look next week.07:14
vilaigc: sure, enjoy your week-end, and remember that I like the overall direction, I just disagree on details :)07:14
igcvila. cool. today was lost fixing fast-import bugs and trying to get the groupcompress stuff working under usertest07:16
vilaigc: and don't forget that failing test in usertest :-)07:16
igcvila: which one is that? can you email me the details please?07:17
vilaI think I did in the past, but I'll mail a fresh one anyway :)07:17
vilalog from bzrlib.plugins.usertest.tests.test_blackbox.BlackboxTests.test_usertest_strict07:18
vilawith a ~440 line output totally opaque to me :-/07:18
vilaigc: still there in revno 13707:19
=== kiko-afk is now known as kiko
hnoHmm.. 1.12 released but tarball not on launchpad?08:12
hnoseems 1.12rc1 got uploaded again instead..08:13
YoussefHi al!!!!08:33
=== thumper_laptop is now known as thumper
igcnight all - have a good weekend08:39
LarstiQlifeless: it seems so08:44
radixis someone going to add bzrtools to the bzr PPA09:23
radixso that my update-manager stops telling me I need to do a partial upgrade09:23
radix(and so that I can upgrade bzr without removing bzrtools)09:24
=== mvo__ is now known as mvo
vilaradix: as soon as poolie fix the source upload, I'd build the ppas for both bzr and bzrtools09:45
radixvila: cool, thanks09:45
vilaI jsut can't upload it myself being currently blocked by a failing test (apparently due to some weirdness in my install as ./bzr selftest bzrlib.tests.tree_implementations.test_path_content_summary.TestPathContentSummary.test_unicode_symlink_content_summary fails for both bzr.dev and bzr-1.12 >-/09:47
* fullermd gets a failure there too.09:50
fullermdFAILED (errors=1, known_failure_count=2)09:51
vilalet's kill a chicken, how can pqm left that pass ?09:51
fullermdI don't even know what it means  :p09:54
vilafullermd: what python version are you using ? What os version ? 32/64 bits ?09:55
vilait suceeds on hardy inside a 32 bits VM but failed on intrepid in 64 bits native09:55
fullermd2.5.2 FreeBSD/i38609:56
vila32 bits ?09:56
fullermdYah.09:56
* fullermd can't imagine word size has much to do with it though...09:56
vilaOf course... just when I thought word size couldn't have anything to do with it you confirm that 32bit works :-(09:56
fullermdHm?  It _fails_ for me.09:57
vilaOh ! Thanks09:57
vilado you have a python-2.4 handy ?09:58
fullermdIt would take a lot of sit-around-and-compile.09:58
vilafullermd: nevermind, thanks anyway09:59
vilaUrgh, python-2.5.2 disagree with itself about encondig strings between my two tests 8-(10:00
fullermdFWIW, 1.12rc1 out of the tarball "passes" (via SKIP'ing that test) on 2.5.2 FreeBSD/amd6410:01
vila2.5.2 on hardy/32bits says: '\u03b2-path', where 2.5.2 on intrepid/64bits says: '\xce\xb2-path'10:01
fullermdOh, wait, I've got LANG=C on that box...10:02
fullermdYah, it fails there too with the UTF-8 locale.10:02
=== Youssef is now known as UbuntuBoy
UbuntuBoylol10:29
=== thekorn__ is now known as thekorn
Lo-lan-dojelmer: I don't know if you committed the fix you mentioned earlier, but a bzr update I did just now took one minute and a half instead of the previous five minutes.  Thanks :-)10:54
vilajelmer: ping10:59
UbuntuBoybrb11:02
=== kiko is now known as kiko-afk
nielsbom(I'm a n00b), what's the correct way to stop having a simple local bzr repository?11:15
nielsbomI just deleted the .bzr dir, that worked, but seemed wrong11:15
KinnisonDepends what you mean11:15
nielsbomCan you elaborate?11:16
KinnisonWell, if all you wanted was to abandon your revision control then removing .bzr works11:19
nielsbomKinnison: Yeah, that answers my question :)11:19
KinnisonIf you wanted something with more complex semantics then it wasn't necessarily the right thing to have done11:19
nielsbomKinnison: is there a bzr command for that?11:19
nielsbomKinnison: or is just ok to rm .bzr?11:19
Kinnisonpersonally I'd use bzr export to create a non-controlled copy11:20
Kinnisonand then tar up and backup the version with the .bzr11:20
Kinnisonbut that's because I don't abandon revision control, if I can help it11:20
fullermdMe, I'd...   well, not do it in the first place   ;p11:20
nielsbomKinnison: ok clear, thanks11:21
Kinnisonsometimes I have to translate from one RCS to another, where importing the history isn't an option11:21
glade88what would be the equivalent of "svn update" in bzr? "bzr update" doesnt seem to do the same11:21
glade88..neither "bzr upgrade"11:21
fullermdbzr update does the same thing svn update does.  That may not be quite what you want in a given case, though.11:21
Kinnisonglade88: In a checkout, bzr update ought to work11:21
fullermdPerhaps you want 'bzr pull'.11:21
Kinnisonglade88: in a branch, you may want bzr pull11:21
Kinnisonsnappish11:21
glade88it is a Launchpad branch.11:22
glade88bzr pull LP:ideatorrent ?11:22
Kinnisonsimply 'bzr pull' will pull from the last location IIRC11:22
glade88damn this "ssh passphrase". can I make it not to ask each time? "ssh add URL" doesnt seem to work for some reason..11:24
glade88URL=bzr+ssh://sayakb@bazaar.launchpad.net/~ideatorrent-developers/ideatorrent/devel/11:24
glade88^in my case11:24
* fullermd didn't know there WAS a 'ssh add'...11:24
glade88fullermd: any other way to save the passphrase?11:24
Kinnisondo you mean your ssh password, or your ssh key passphrase?11:25
fullermdbzr doesn't have anything to do with that, TTBOMK.  That's all in your ssh client.11:25
fullermdWell, it has to be passphrase where LP is concerned.11:25
fullermdThere's a ssh-agent or something like that.11:25
glade88its my ssh passohrase11:25
glade88and yes, bzr has nothing to do with that :)11:25
Kinnisonssh-add ~/.ssh/id_rsa11:25
Kinnisonthat kind of thing11:25
glade88since it is the same for svn11:25
glade88Kinnison: fullermd: thanks, bzr pull works. I'll pondermore on the passphrase thing.11:27
glade88cheerio11:27
* Kinnison 's suggested ssh-add commandline is what glade88 wants11:28
fullermdWell, only once you have the agent running.11:28
nielsbomJust found this in the user guide (d'oh!): If you accidently put the wrong tree under version control, simply delete the .bzr directory.11:28
fullermdAnd you need that ancestrally to all your terminal creations (or manual hackery in each)11:28
Kinnisonfullermd: typically, linux systems start ssh agents as part of the X session11:29
Kinnisonfullermd: As for other systems, dunno :-(11:29
* fullermd always has a hand-crafted .xinitrc, so nothing gets started he doesn't order :p11:30
glade88Kinnison: w00t! yes, darn me I was using "ssh add" not "ssh-add". worksformenow (tm) . ty11:30
Kinnisonfullermd: How retro :-)11:30
fullermdOh, that's not retro.  What's retro is how the last line starts the window manager, ctwm  :p11:31
KinnisonOh dear11:32
* Kinnison pats fullermd gently on his clearly damaged head :-)11:32
fullermdBut it's ctwm with a few of my own local hacks applied, of course.11:32
fullermdSorta like the web browsing is firefox with my local hacks, and the mail reading is mutt with my local hacks, and...11:32
* fullermd . o O ( If the world would just cater to me more, things would be so much easier... )11:33
fullermdOh dear.  Somebody actually _likes_ $Log$?11:38
vilafullermd: some even likes log --forward :-)11:38
fullermdlog --forward is almost as cool as missing --reverse!11:39
vilaDon't start *me* on --reverse :-)11:40
* fullermd reverses vila on --start.11:40
vila--start is good :-)11:40
fullermdHey, we should add stat --backward, to show the merge revs in the opposite order, too.11:40
fullermdThen we'll cover the gamut better!11:41
Kinnisonurf11:43
UbuntuBoyHi guys!11:53
UbuntuBoyI would like to know how I can launch bazaar as windows service when i execute "BZR SERVE" please11:54
=== bac_afk is now known as bac
nielsbom(noob question) is it possible to co-develop a website using 2 computers which can't be connected through SSH (or something like it) using bzr? (Something like sending a whole repositorie as a file and merging it locally, and vice versa?)12:21
Lo-lan-donielsbom: Yes, with merge requests sent by email.12:22
santagadaactually  you can save a bundle to a file and transport it anyway you fell like it12:27
santagadafor example a pen drive12:28
Lo-lan-doYeah, or a floppy disk or a punched card.  I sort of assumed the two computers still had access to *some* net :-)12:29
=== bac is now known as bac_afk
UbuntuBoyLo-lan-do!?13:10
UbuntuBoyI would like to know how I can launch bazaar as windows service when i execute "BZR SERVE" how can I do that please?13:11
santagadaLo-lan-do: you are not paranoid enough :)13:11
Lo-lan-doUbuntuBoy: I don't even know what a windows service is...13:12
UbuntuBoylol13:12
UbuntuBoya deamon i u want13:12
UbuntuBoyif13:13
UbuntuBoysry13:13
UbuntuBoya deamon if u want13:13
santagadaUbuntuBoy: you know a service is not really a daemon right?13:13
UbuntuBoy:p13:13
UbuntuBoyyep13:13
santagadaUbuntuBoy: so I'm guessing that if there is no service plugin and windows services are not mentioned on bazaar manual it is not supported13:14
UbuntuBoymmmhhhhh...13:14
santagadaUbuntuBoy: but maybe there is a way to use unix tools or something from microsoft to use a daemon as a service13:15
santagadaUbuntuBoy: why not use IIS and fastcgi?13:16
UbuntuBoybecause I prefer use directly bzr://13:16
UbuntuBoyits more easy13:17
UbuntuBoyit's sry13:18
santagadaUbuntuBoy: I don't really agree... but ok13:20
UbuntuBoy:)13:20
santagadaUbuntuBoy: use the unix daemon tools or unix tools that came with your windows server to do it13:20
UbuntuBoyunix daemon tools ?13:21
santagadaUbuntuBoy: with IIS you can easily integrate with AD also13:21
UbuntuBoyI dunno13:21
UbuntuBoyhow13:21
santagadaUbuntuBoy: I think it is unix tools13:21
santagadadaemon tools is that thing to run .iso images13:21
santagadaUbuntuBoy: as an Ubuntu boy you probably know how to link LDAP and apache... with IIS is probably even easier to connect to AD for authentication13:22
santagadaauthorization will be left as an exercise :D13:22
UbuntuBoyhmmm13:22
UbuntuBoyhmm...13:23
UbuntuBoyi'm not really an ubuntyboy I took this nick becoz i didn't find anything else looooooooool13:23
UbuntuBoyor my name13:24
=== UbuntuBoy is now known as Youssef
Yousseflike this13:24
Youssefhihi13:24
* Youssef put back his deguisment13:24
=== Youssef is now known as UbuntuBoy
santagadaYoussef was cooler13:25
UbuntuBoyReally?13:25
UbuntuBoyokay13:25
=== UbuntuBoy is now known as Youssef
Youssefhihi13:25
Youssef^^13:26
Youssefhmmm13:26
santagadaYoussef: windows services for unix is deprecated I think, and don't do what you want13:30
Youssefabout what?13:30
=== bac_afk is now known as bac
Odd_BlokeYoussef: I would suggest a post to the ML.13:32
YoussefML?13:33
Youssefwhat is it?13:33
Youssefsorry guys im a windows user I try my best to learn the linux world13:33
Youssefit's a bit hard for me the please use full words13:33
Youssefnot only those characters lol13:34
Youssefsantagada! You said -> and don't do what you want <- what does it means?13:34
Odd_BlokeYoussef: Mailing List.13:34
Youssefloooooooooooooooool13:34
Youssefokay okay13:34
Youssefand why would you suggest me to post to the mailing list?13:35
santagadaYoussef: I don't see a way to run a daemon as a service13:35
Youssefhhoo okay okay13:35
santagadaYoussef: because them more people can see your question13:35
santagadaYoussef: and can give you a more complete answer13:36
Youssefooohhh13:36
santagadaYoussef: or just because your question might become a feature request for a future version of bazaar :D13:36
Youssefokay13:36
Youssefmmhhhh...13:36
santagadaGood luc13:36
Youssefinteresting hehe13:36
santagadaluck13:36
Youssefthankyou very much13:37
Youssefguys13:37
Youssefthanks a lot hehe13:37
Youssefbut one last question13:37
Youssefwhere is the mailing list?13:37
Odd_BlokeYoussef: https://lists.ubuntu.com/mailman/listinfo/bazaar13:40
nielsbomLo-lan-do: thanks!13:42
xtian_Can anyone tell me how to prevent bzr on windows from using plink for sftp (and get it to fall back to paramiko)?13:51
xtian_I can force it to fallback by renaming plink, but I need plink on my path to edit remote files in emacs.13:53
xtian_whoa, tumbleweeds, huh?13:56
Lo-lan-doAnd crickets.13:57
Odd_BlokeI don't know.13:57
Odd_BlokeAnd I can't think who here uses bzr on Windows.13:57
xtian_Fair enough! I might try the mailing list.13:58
Odd_BlokeProbably wise13:58
xtian_Cheers!13:59
Takeh, I use bzr on windows, but not with sftp14:03
xtian_do you just use it with launchpad?14:04
Takno, I use it with bzr-svn and smb14:08
verterokxtian_: try with set BZR_SSH=paramiko14:20
xtian_aha! Thanks!14:20
xtian_Trying now.14:20
xtian_Is there any reference where I could find that kind of thing in future?14:21
xtian_That worked! Thanks heaps.14:22
verterokxtian_: I found it the mail list archive, but I'm sure it's in the official docs14:22
verterokxtian_: if you can't find it in the official docs, please file a bug about it14:23
xtian_Wilco14:23
xtian_Just looking now14:23
xtian_Gah - there it is - I was looking for the wrong keywords. I could find mention of restoring auto-detection of plink in some bug threads, but not that.14:24
xtian_Thanks again!.14:25
verterokxtian_: np, glad to hlep14:26
hnoYoussef: There is a tool in the windows resource kit for creating services of arbitrarily programs not having builting service capabilities.14:29
KinnisonWhat's the status of tracking cherrypicks in bzr?14:33
vilaverterok: that was short :-)14:43
verterok_vila: me netwokr is flaky, hopefully be back at home during the weekend :)14:43
verterok_/me/my14:44
=== verterok_ is now known as verterok
vilas!/me/my!s/me/my/! :-)14:44
verterok:)14:45
Odd_Blokes,s!/me/my!s/me/my/! :-),s!/me/my!s/me/my/!,14:45
Odd_Bloke:)14:45
* fullermd hopes you don't try that in csh...14:45
yenzenzhi14:51
Odd_Blokeyenzenz: Hi. :)14:52
yenzenzis this a known issue: download link to tgz of 1.12 release is broken at http://bazaar-vcs.org/Download14:52
Odd_Blokeyenzenz: I wasn't aware of it.14:53
fullermdYes, it's known.14:53
yenzenzfullermd: ok, thnaks. so just a matter of time :)14:54
nielsbom{noob} I start a local repository on my pc (bzr init, bzr add, bzr commit), then I want to send the whole branch including all files to a colleague so he can start development on his own pc and then send patches my way. How do I export my whole dir, incl repository to him? Should I do that with bzr? Or just copy it?14:54
Lo-lan-doYou can copy the .bzr dir14:55
nielsbomLo-lan-do: yes, I understand that, and also copy all the files in the dir in which my files reside.14:56
Lo-lan-doYou don't *need* to copy those, since they can be regenerated from the .bzr dir.14:57
nielsbomEven if he hasn't had the repo before?14:58
Lo-lan-doThe .bzr dir contains the full history.  So he can just bzr reconfigure --tree and get the working files from that.14:59
Lo-lan-do(Or just bzr checkout)14:59
fullermdWell, if you send the .bzr from a dir with a checkout, you'd use revert...15:00
jelmervila: hi15:00
=== thunderstruck is now known as gnomefreak
vilajelmer: hi15:01
vilajelmer: did you see my mail about 1.1215:01
vilajelmer: did you see my mail about 1.12  ?15:01
jelmervila: Yeah15:01
jelmervila: Strange it's failing for you :-/ Does it fail both with dirstate C extensions and without?15:01
vilaIt fails *with* C extensions15:02
jelmerdoes it work without?15:02
vilalet me check15:02
fullermdIt works for me without, and fails with.15:04
vilaworks without15:04
vila...15:04
vilagha...15:04
nielsbomLo-lan-do: ok, I'm starting to understand, I think (we're testing it now)15:05
Lo-lan-donielsbom: Maybe you could use the bzr-fast-export.py script from plugins/fastimport if you don't feel comfortable copying a .bzr dir.15:05
vilajelmer: does it make sense to you ?15:06
jelmervila: Not entirely yet, but at least more15:06
nielsbomLo-lan-do: I'm ok with that for starters15:06
vilajelmer: with my patch, that's the opposite, fail without extensions, works with15:08
nielsbomLo-lan-do: So I have a local repository, I committed to it, then I copy the .bzr directory to another directory, say example/. I then go to that dir and give the command bzr reconfigure --tree. I get the error "example is already a tree"15:11
nielsbomLo-lan-do: "example/ is already a tree15:12
jelmervila; Looks like there's an inconsistency in dirstate C extensions / Python15:12
Lo-lan-donielsbom: Try "bzr revert" instead.  Apparently the .bzr contains info on what's supposed to be outside itself :-)15:12
vilajelmer: yup, we need more tests parametrized on C extension availability or not15:15
jelmervila, i.e. one already provides unicode, the other provides ascii15:15
nielsbomLo-lan-do: cool, that worked thanks!15:17
vilaWhat are the consequences if we revert your patch ? Is bzr-svn impacted ?15:17
jelmervila: No, bzr-svn is not impacted, but some repositories will be impacted (as it'll break symlinks with unicode names)15:18
jelmervila, Do you really need to revert it though? Only newly added tests seem to fail15:19
vilajelmer: well, I came across it just before a release... I don't think it should block it, but that's for the RM to decide...15:20
vilajelmer: plus, it fails only under unclear circumstances...15:21
vilajam: ping15:21
jelmervila: I mean, the alternative would be to just remove the tests added by my patch15:21
jamhi vila15:21
vilauntested code is broken code :-)15:21
jelmervila, well, that seems to be what's breaking for you15:22
vilajelmer: Only because I came across it via the test but I presume I can reproduce it from command line, so our users can too15:23
jelmervila: this was already broken from the command-line15:25
jelmermy patch was meant to address it15:25
vilajelmer: I understand that, don't get me wrong.15:25
vilaBut it the fix seems incomplete then, even if you can't trigger it yourself (or so it seems) because, well, your setup is different15:26
vilaI can't reproduce it either under hardy/32bits inside a VM,15:26
vilaI reproduce it only under intrepid/64bits on a real host15:27
vilaSame python version: 2.5.215:27
vilaI fail to understand why the word size has an impact though....15:27
jelmerI'll see if I can reproduce on my 64bit machine15:28
jelmerit seems strange indeed that the word size would affect the type of a field in dirstate..15:28
fullermdIt happens for me on i386 and amd64 both.15:30
jamfullermd: are you on BSD?15:32
* jam seems to remember that BSD has different ideas about fs_enc15:32
fullermdWhat's the thing that makes bzr spit its fs_enc out?15:33
jamfullermd: um... python -c 'import bzrlib.osutils; print bzrlib.osutils._fs_enc" ?15:35
jelmerthe problem seems to be that the dirstate C extensions call _read_link() with a str argument15:36
jelmerand the native Python code calls it with a unicode argument15:36
fullermdUTF-815:36
jamso the dirstate code should be using a UTF-8 string (always), which is probably incorrect on some situations15:36
fullermdI note that (if it matters) it's the (PreviewTreePost) variant that fails.  (DirStateRevisionTree) and the other options work.15:36
fullermdWell.  I assume pass == work.15:37
jelmerjam: the dirstate code should always use unicode internally?15:37
jelmers/unicode/utf815:37
jamjelmer: generally, yes15:39
jamThe paths stored *in* the dirstate file should all be utf-815:39
jamAnd 90% of all processing is done via utf-8 strings15:39
jamonly when finally yielding them to upper layers do we decode it back to Unicode15:40
jelmerand when reading from the OS encoding as _fs_enc?15:40
jamjelmer: right15:41
LarstiQevening15:41
jamhi LarstiQ15:41
jambeuno: ping15:41
LarstiQhey jam15:41
jelmerHey LarstiQ15:44
jelmerhi emmajane15:44
LarstiQhi jelmer, emmajane :)15:44
emmajanejelmer, hello :)15:44
emmajaneLarstiQ, hello as well15:44
jelmeremmajane, thanks for the report wrt the docs on samba.org, btw15:44
emmajanejelmer, no problem.15:44
emmajanejelmer, I wasn't sure if it was meant to work with local files, but not online. Or something.15:45
jelmeremmajane, it's supposed to work, but seems to break from time to time as it's updated automatically15:46
emmajaneheh. Yeah. There's 'supposed to' and then there's 'output from scripts' :)15:46
jamDoes anyone else know if 'loggerhead' is fully plugin-ized now?15:47
LarstiQjam: yes, fsvo fullu15:48
jamwell, is "bundling it with the win32 installer" going to work15:48
LarstiQjam: I don't think it does the fancy decorating of 'bzr serve' yet15:48
jamI guess is the question15:48
jelmeremmajane, :-)15:48
LarstiQjam: ooh, goed question.15:48
jamI think it will take a few steps15:48
jamas it would also require extra dependencies15:48
jamlike we have to do with bzr-svn, etc.15:48
jamI think I need to put together a spec15:48
jamfor handling setup issues with bundling plugins15:48
* LarstiQ cries as selftest slows his netbook to a crawl15:49
jamas I'm tired of having to edit bzr's setup.py for each plugin15:49
jelmervila, jam: So the problem seems to be that py_update_entry() calls _read_link() with a unicode string15:49
jelmervila, jam: Whereas the C extensions call it with a utf8 string15:49
jamhmm... something odd here15:51
jamas the C extension just passes through the "abspath" it was given15:51
jamwhich is also what "py_update_entry" does15:51
jamSo I'm guessing it isn't the 'update_entry' code15:52
jambut the _process_entry code15:52
jamwhich is getting something wrong15:52
emmajaneAnd now for something completely different: an on-topic comment! :)15:57
emmajaneNext weekend I'm giving a bzr talk at SCaLE. I'm giving essentially the same talk as I gave before.15:57
beunojam, pong15:58
emmajaneThe slides are at: http://www.slideshare.net/emmajane/version-control-for-mere-and-freelance-mortals-presentation if anyone has comments for add/modify/deletes.15:58
jambeuno: on bug #328860, Martin mentions wanting to bundle loggerhead with the win32 installer15:58
ubottuLaunchpad bug 328860 in bzr "Win32 Loggerhead installer wanted" [Medium,Confirmed] https://launchpad.net/bugs/32886015:58
jamI was just curious if loggerhead has been fully turned into a "plugin"15:58
emmajaneThe talk description is at: http://scale7x.socallinuxexpo.org/conference-info/speakers/emma-jane-hogbin (It's just an intro talk)15:58
jamso that it would be bundled in the same fashion that bzr-svn, etc. would be15:59
beunojam, poolie actually did turn it into a plugin during our sprint16:00
beunolet me find the merge proposal..16:00
beunohttps://code.edge.launchpad.net/~loggerhead-team/loggerhead/loggerhead-plugin/+merge/309516:01
beunojam, ^16:01
beunoI'll merge that in today16:01
jambeuno: well, I won't change anything for 1.1216:02
jamjust thought I'd check where things were at16:02
jamDoes that also decorate "bzr serve" ? Or is it just "bzr loggerhead-commands"?16:02
beunoit decorates serve16:02
beunowhich is what prompted jml's work on it16:02
=== Nicke_ is now known as Nicke
jelmeremmajane, do you have some other format than flash? gnash is not cooperating with me atm16:06
fullermdOoh look, a 1.12 tarball...16:06
emmajanejelmer, is there an option to download the ODP from that page?16:07
emmajanehttp://www.slideshare.net/emmajane/version-control-for-mere-and-freelance-mortals-presentation/download ?16:08
emmajaneit gives a PDF, I think.16:08
Lo-lan-dobeuno: Will you also merge the init script for daemon-like operation?16:08
jelmeremmajane, that seems to require login :-/16:09
Lo-lan-do(You did ask me to pester you :-)16:09
* fullermd keeps waiting for the day flash joins java applets in the dustbin...16:09
emmajanejelmer, boo to slideshare.16:09
beunoLo-lan-do, I may put up a merge proposal for someone with a working brain to review  :)16:09
jelmerbeuno, and will you remove start-loggerhead ? (-:16:09
beunojelmer, not until I get config working with serve-branches  :/16:10
emmajanejelmer, http://bazaar-vcs.org/Talks?action=AttachFile&do=get&target=bzr-intro-template.odp16:11
jelmeremmajane, thanks16:11
emmajanejelmer, thanks for looking! :)16:11
fullermdThings you notice when updating packages:16:13
fullermdbzrtools 1.12.0 is 1 'larger' than bzrtools 1.11.0.  Thus, it's fitting that the tarball is also 1 byte larger.16:13
jama single byte, that is quite intriguing16:13
Lo-lan-do"Well, it's one louder, innit?"16:14
fullermdBut why not make each byte bigger?16:14
* fullermd nods at jam.16:14
fullermdI thought so.16:14
fullermd-SIZE (bzrtools-1.11.0.tar.gz) = 6976516:14
fullermd+SIZE (bzrtools-1.12.0.tar.gz) = 6976616:14
jamwell, also of interest:16:15
jam3.8M Feb  9 04:42 bzr-1.11.tar.gz16:15
jam3.9M Feb 13 09:53 bzr-1.12.tar.gz16:15
jam1 (100kB) bigger16:15
fullermdWell, not really.  It's 39807 bigger.16:16
Odd_Blokes/bigg/loud/16:17
fullermdOf course, if you subtract that from the curent bzrtools, you get 29959.  Subtrace that from the previous bzrtools, you get 9848.16:19
ToksyuryelWould Stackless provide any measurable speed improvements to bzr?16:19
fullermdSum those digits, you get 29, which starts the pattern.  The next digit is the 9 again from the start of 9848.  The 59 is one more than the trailing 48.16:19
fullermdSo it all works out anyway.16:19
* fullermd wanders off to smoke some more crack...16:20
Toksyuryelseems to have done a lot for EVE Online, am wondering if bzr can achive similar performance gains16:20
Toksyuryelhttp://en.wikipedia.org/wiki/Stackless_Python16:21
Odd_BlokeToksyuryel: Without really knowing anything more, I would note that EVE and bzr are fairly different apps. ;)16:23
ToksyuryelGranted, but still :)16:23
jelmeremmajane: seems good to me :-) simple, and quick16:23
Odd_BlokeEssentially, I doubt it, because bzr isn't multi-threaded.16:23
jfroyMorning!16:23
jelmeremmajane, why does "bzr tags --sort=time" need special attention? The other commands mentioned seem much more common16:24
jelmerhi jfroy !16:24
ToksyuryelIs threading planned for a future development?16:24
Odd_BlokeToksyuryel: I don't know.16:24
emmajanejelmer, it's just one that I use a lot myself (tagging what versions I send to the client). I talk a bit about it.16:24
ToksyuryelPerhaps implimenting threading and moving to stackless coule provide performance improvements over the current model?16:25
Toksyuryel*could16:25
fullermdI would tend to doubt it, certainly in the near or mid term.16:25
jfroyjelmer: congrats on 0.5 final16:25
emmajanejelmer, thanks for taking a look. Much appreciated.16:25
Toksyuryelfullermd: I see16:26
jelmerToksyuryel, what would the benefit of threading be exactly?16:27
Toksyuryelpotential speed increases? I'm just wondering and asking. someone's gotta actually answer the question with "yes that would make it faster" or "no it would not make it faster" :D16:28
jamToksyuryel: currently I think our big bottlenecks are stuff like graph walking16:29
jamit is pretty hard to come up with efficient walking code16:29
jamand even harder to do something that is also parrallel16:29
jamOne possible place would be text insertion, I guess16:29
Toksyuryellike I said... I am just asking. I am not saying "this would definitely be faster and you should do it right now".16:29
jamif you are trying to insert 100 different texts, you could probably farm a couple of those out to different threads16:30
Toksyuryelplease stop trying to spin my words to your own ends :)16:30
ToksyuryelI understand that it's not a high priority compared to other things which need to be done16:30
santagadajam: sorry to botther you but isn't this kind of stuff io bound?16:31
jamsantagada: some is, some is 'diff' bound16:31
fullermdI expect the place we're most likely to pick up parallelism would be from python-level stuff, really.16:31
jamstuff like 'annotate' could benefit16:31
fullermde.g., list comprehensions are inherently parallelizable.16:32
jelmerToksyuryel: You're talking about specifics, parallelism can be achieved through more than just threading16:32
jfroyI was just asked by a friend if bzr had an equivalent to git add -p. He tells me it lets you commit a subset of all the changes in the branch, even from the same file. I've never done that in bzr, so I'm not sure.16:42
fullermdYou can specify files, you can use shelve to set aside bits before you commit, or...   I think somebody wrote a plugin to do a darcs-style record?16:43
fullermd(I don't know if/how well it works)16:43
Odd_Blokejfroy: Yeah, shelve is probably what he's looking for.16:45
Odd_BlokeYou use it put some of your changes on the 'shelf', commit, then use unshelve to pull them back off.16:46
Odd_BlokeIt has the advantage of allowing you to confirm that you haven't broken anything with the subset of changes you're committing before you commit them.16:46
jamjfroy: it is sort of the "inverse" of add -p, in that you are taking off things you don't want to commit, rather than explicitly listing the things *to* commit16:46
jamhowever, it leaves the tree in a state that you can run "make test" on16:46
jamwhich is generally beneficial16:46
lbieberCan someone tell me how to modify the 1200 second timeout limit in bzr? I'm experiencing a problem on several of our machines where they occasionally time out, not sure if it is because they are behind a firewall or not16:49
jfroyThank you all.16:50
LarstiQlbieber: do you have a .bzr.log of when that happens?16:50
lbieberLarstiQ:  one minute let me see if I can dig it up16:51
jamlbieber: you can set bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS16:52
jamthough if you are hitting that16:52
jam(default is 5 min)16:52
jamI'm guessing it is something else.16:52
lbieberLarstiQ: ummmm, where would I find .bzr.log, I'm not seeing it anywhere?16:52
jam~/.bzr.log16:53
jamOr if on windows $My Documents/.bzr.log16:53
jambzr --version spells it out for you16:53
lbieberahhhh -  let me fix this first and see if it helps, from the log file - 0.120  WARNING: using slower ElementTree; consider installing cElementTree and make sure it's on your PYTHONPATH16:57
MyrttiI was wondering if http://paste.ubuntu.com/117733/ this is an error of bzr, launchpad or me?16:58
Odd_BlokeMyrtti: That looks like a bzr problem.  Is there any chance you could try with a newer version of bzr?16:59
jamMyrtti: that is a known bug with bzr 1.6.1 when using -Dhpss17:00
jamwhat bug happened that caused you to try and use -Dhpss17:00
jamas that is the real issue17:00
jam(that said, if you upgrade your bzr, it probably all goes away anyway)17:01
Myrttiwhat I did was I removed some of the launchpad projects and tried to rebranch them17:02
Myrttibzr pull worked while the launchpad project working copies were there17:02
Myrttibut now http://paste.ubuntu.com/117739/17:03
jamso that looks more like you don't have you ssh keys set up properly17:05
jamit may have been working before because you didn't do "bzr launchpad-login"17:05
jam(so we were using anonymous http access, rather than authenticated bzr+ssh access)17:05
Odd_BlokeMyrtti: OK, so you probably did the inital lp:foo branch before running 'bzr launchpad-login'.  So the branches had the http:// location stored (because currently we store the resolved URL, not just the 'lp:foo' bit).  Then you ran launchpad-login, and it's now trying to use bzr+ssh.  But you haven't set up SSH keys with Launchpad.17:06
Myrttiwell that's funny, because it gave me that even before I had logged in17:06
Myrttiand now that there is a proper ssh key at launchpad, it still doesn't work.17:06
Myrttior that's what I think17:07
Odd_BlokeMyrtti: What does 'ssh <username>@bazaar.launchpad.net' give you?17:07
MyrttiAgent admitted failure to sign using the key.17:08
MyrttiPermission denied (publickey).17:08
jpdsAh, the seahorse-agent bug.17:08
Myrtti<sarcasm>great</sarcasm>17:09
jpdsbug 32812717:11
ubottuLaunchpad bug 328127 in gnome-keyring "gnome-keyring-daemon returns Agent admitted failure to sign using the key." [Low,Triaged] https://launchpad.net/bugs/32812717:11
Myrttithat's funny17:12
MyrttiI'm on intrepid.17:12
Myrtti>___<17:12
jpdsSo am I, I have the same problem :/17:13
* Myrtti checks17:13
Myrttignome-keyring: Installed: 2.24.1-0ubuntu117:14
jpdsReally odd.17:15
MyrttiI'm on xfce4 though17:15
Myrttiand I know about these things about as much as my guinea pigs know about particle physics17:16
Odd_BlokeMyrtti: Try "SSH_AUTH_SOCK= ssh <username>@bazaar.launchpad.net".17:19
Myrttiand presto it works17:19
MyrttiOdd_Bloke: thanks17:22
LarstiQabentley: from the standup reports you're not yet in nested territory?17:23
abentleyLarstiQ: No.  Hopefully next week.17:23
Odd_BlokeMyrtti: :)17:25
Odd_BlokeMyrtti: Adding a comment on the bug with your version details might be helpful. :)17:25
LarstiQabentley: k, I'm paging through a full test suite run log now, deferring most things for later, almost got myself convinced to commit/push the current status17:26
abentleyLarstiQ: Great.17:26
MyrttiOdd_Bloke: done :-) thanks17:28
pickscrape1Is bzr-1.12 compatible with bzr-loom 1.4?17:29
pickscrape1I'm getting this when running bzr status: bzr: ERROR: exceptions.TypeError: run() got an unexpected keyword argument 'verbose'17:30
pickscrape1The backtrace refers to /usr/lib/python2.5/site-packages/bzrlib/plugins/loom/commands.py17:31
Odd_Blokepickscrape1: Could you pastebin a more complete error?17:31
pickscrape1sure17:31
pickscrape1Is there one for this channel, or should I just paste anywhere?17:31
LarstiQany pastebin works17:32
pickscrape1http://pastebin.ca/133623517:33
vilapickscrape1: try updating your plugin I'm pretty sure it has been fixed on trunk17:33
pickscrape1I was running it direct from apt... I'll uninstall that and grab it manually17:33
vilapickscrape1: yup, seeing the traceback I'm even more sure :)17:33
pickscrape1Is bzr-loom available in a PPA anywhere?17:35
vilaI don't  think so17:36
vilaDo you get 1.12 from bzr-ppa ?17:36
vilaDid you get 1.12 from bzr-ppa ?17:36
pickscrape1vila: yes17:36
vilapickscrape1: did you get bzrtools too ?17:36
pickscrape1I had to uninstall bzrtools because 1.11 was never uploaded to the PPA, so currently I have that installed manually17:37
vilapickscrape1: could you try to install bzrtools from bzr-ppa ?17:38
pickscrape1vila: yes, I will once I've fixed etckeeper, which has also just started complaining :)17:38
vilapickscrape1: argh, no wait, the builds aren't finished yet :-/17:38
pickscrape1OK, using loom trunk has fixed the problem: thanks :)17:40
pickscrape1etckeeper needed BZR_COMMIT_OPTIONS="--unchanged"17:40
=== bac is now known as bac_lunch
LarstiQwoops, unlocking other_tree once too many18:11
vilapickscrape1: bzrtools-1.12 available in bzr-ppa, can you try it ?18:36
pickscrape1vila: I just did, and it seems to work fine :)18:37
pickscrape1Thanks for your help18:37
vilapickscrape1: great, thanks for your test :)18:37
vilapickscrape1: which os/version/arch are you using ?18:37
pickscrape1vila: jaunty amd64 and intrepid x86 (tested on both)18:38
vilapickscrape1: you're my man, two birds with one stone :)18:39
pickscrape1:)18:39
=== serg_ is now known as serg
=== NfNitLoo` is now known as NfNitLoop
jfroy|workjelmer: I was wondering if you had some experience to share with setting up bi-directional bzr-svn syncing.19:23
=== bac_lunch is now known as bac
ronnyjelmer: sup?19:55
jfroy|workronny: I believe he's away ATM.19:57
ronnyhmm19:58
ronny-9 to 1234554321 ( 1234554330 19:45:30 UTC )19:58
ronny[20:45]        MinceR | A4Tech: no u19:58
ronnyops19:58
ronnytouchpads + broken syndaemon are hellish19:58
Lo-lan-dojfroy|work: I'm usung bzr-svn, maybe I can be of help?20:02
jfroy|workLo-lan-do: ok, so here's the use case. Project A is hosted in a Subversion repository over which I have little or no control. I want to introduce a Bazaar bridge, of sort, to allow some developers to use Bazaar as their main VCS. However, it is likely some other will continue using Subversion.20:04
jfroy|workI'm only interested in syncing one branch, the trunk,20:04
jamvila: ping20:05
jfroy|workThat is, the Subversion trunk with a Bazaar branch, from which Bazaar-using developers would pull and push from.20:05
miracle2kwhen I init-repo after I already have branches checked out, can I make them part of the repository, or they I need to re-clone?20:05
jammiracle2k: check 'bzr reconfigure' I think it has some flags for that20:05
Lo-lan-dojfroy|work: I think it's simpler for everyone if people just use bzr as a Subversion client then.20:06
jamjfroy|work: I believe doing:20:06
jfroy|workmiracle2k: AFAIK you need to branch into the repo to get the branch to store its history data in it20:06
jambzr co svn+ssh://path/to/trunk20:06
jamShould "just work"20:06
jamas in, the developers can commit there, and it will update the subversion trunk20:06
Lo-lan-doThat's exactly what I'm doing, and it seems to works well.20:07
jfroy|workLo-lan-do: I see. So each developer would maintain their own Subversion trunk checkout.20:07
miracle2kjam, jfroy|work: There's a reconfigure --use-shared which I'm gonna try. Thanks.20:07
jfroy|workmiracle2k: ah, good to know, didn't know that existed :)20:07
jfroy|workjam: thanks for the tip20:07
jamjfroy|work: it is certainly the easiest way20:07
jamthere are always others20:07
jamyou can also20:07
jamcd my-local-trunk20:07
jambzr pull ../my-branch20:08
jamand if that succeeds (branches aren't diverged)20:08
jamit should be the same as doing "bzr push svn://...."20:08
pickscrape1Was a release email sent out for 1.12?20:35
jampickscrape1: I don't think so20:42
jamOr it was sent, but Martin forgot to approve his email20:43
jamLet me check20:43
pickscrape1I just enjoy reading the release notes is all :)20:43
jampickscrape1: http://doc.bazaar-vcs.org/bzr.1.12/en/release-notes/NEWS.html#bzr-1-12-1234567890-2009-02-1321:08
jamOr to see the on-going one: http://doc.bazaar-vcs.org/bzr.dev/en/release-notes/NEWS.html21:08
pickscrape1jam: thanks21:08
jamlifeless: to your earlier question, "groups" do not get +junk branches:21:28
jambzr: ERROR: Permission denied: "/~bzr/+junk/bzr-groupcompress": : +junk branches are only available for individuals. Please consider registering a project for collaborating on branches: https://help.launchpad.net/Projects/Registering21:28
zsquarepluscbzr 1.12 and olive? i get errors on my ubuntu box. for example the log windows are shown, but the log itself is never shown21:29
jamas such, I went ahead and created: https://edge.launchpad.net/bzr-groupcompress21:30
jamsince I needed to do a couple patches to the plugin21:31
=== kiko is now known as kiko-afk
jelmerronny: hi22:44
jelmerjfroy|work: hi22:44
jfroy|workhey22:45
jfroy|workAs you can read in your history, my question was mostly answered, unless you have something to add to Lo-lan-do's recommendation.22:45
jelmerjfroy|work: ah, sorry, hadn't seen that22:54
jelmerjfroy|work: yeah, his answer seems to cover it all - just pretend the svn branch is a bzr branch and all should be well22:54
ronnyre22:55
jfroy|workjelmer: just need to make sure the other developers who wish to use bzr understand they really need to not use a bound branch for daily work, because operations on that branch will be *slow*.22:56
jfroy|workYour standard "train them a bit" situation, I suppose.22:56
ronnyjelmer: im at the final point of vcs unhappyness, all reasonable vcs's have at least one major pain point i dont want to be brothered with22:58
jelmerjfroy|work: just tell them to use 0.5.1, which will be lightning-fast23:16
jelmerronny: yeah, it's tricky to get right :-/ a task-specific API is probably easier than a generic one like anyvc23:16
ronnyjelmer: nah, also all common vcs's have at least one fail that makes me hate them23:17
jfroy|workjelmer: is that so?23:23
jfroy|work(this is a worst case scenario, the svn server is still 1.4 with no plan to upgrade to 1.5 anytime soon :p )23:24
sriso..23:41
sriis there a irc hannel for paramiko?23:41

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