[05:10] <RenatoSilva> jelmer: hi
[10:46] <jimis> emacs diff-mode is very interesting, thanks vila
[10:56] <jelmer> rehi
[11:03] <jimis> jelmer: thanks for working on fixing the lp:gcc issues! Any ideas why it's broken?
[11:03] <jimis> is it just the hugeness of the tree that makes life hard for bzr?
[11:04] <jimis> or something deeper?
[11:06] <jelmer> jimis: it's the number of tags (and the fact that they are not on mainline revisions) in particular
[11:07] <jimis> interesting :-)
[11:07] <jimis> how many tags are we talking about?
[11:08] <jelmer> jimis: I think it was a couple of thousand
[11:08] <jimis> :-o
[11:09] <jimis> doing even basic work with this tree had given me trouble in the past
[11:09] <jimis> but all is well now with 2.4, at least for me
[11:10] <jimis> ofcourse it could be faster, but at least it's fast enough to do some basic work :-)
[11:11] <jelmer> yeah, jam did a lot of work to improve the performance on trees that are gcc-sized
[13:46] <Anteru> Hi
[13:47] <jelmer> hi Anteru
[13:47] <Anteru> I'm trying to write a plugin, and I'm somehow can't get started.
[13:47] <Anteru> I have created a plugins/binstore folder in my home
[13:47] <Anteru> and put an __init__.py as wel as binstore.py in there
[13:47] <Anteru> Which are completely bare-bones
[13:48] <Anteru> bzr plugins -v tells me
[13:48] <Anteru> No module named binstore
[13:48] <Anteru> Unable to load plugin u'binstore' from u'C:/Users/Anteru/AppData/Roaming/bazaar/
[13:48] <Anteru> 2.0/plugins'
[13:48] <Anteru> err, that last line-break shouldn't be there
[13:48] <Anteru> __init__.py is: http://pastie.org/2263571
[13:48] <jelmer> Anteru: what's in the __init__.py file?
[13:48] <jelmer> ah
[13:48] <Anteru> binstore.py: http://pastie.org/2263572
[13:49] <jelmer> Anteru: that looks like incorrect python syntax
[13:49] <jelmer> what does "python __init__.py" say?
[13:49] <Anteru> I have only python 3.2 installed, let me try anyway ...
[13:50] <Anteru> ah I have 2.6 too
[13:50] <jelmer> (the import on line 6 of __init__.py seems incorrectly formatted to me)
[13:50] <jelmer> .bzr.log should also have some details
[13:51] <Anteru> indeed
[13:51] <Anteru> yeah, the import was wrong, now python __init__.py complains about missing bzrlib
[13:51] <Anteru> Hm, bzr plugins -v doesn't work though
[13:52] <jelmer> Anteru: any details in ~/.bzr.log ?
[13:52] <jelmer> how does bzr plugins blow up?
[13:53] <Anteru> just the error message
[13:53] <Anteru> bzr log: http://pastie.org/2263596
[13:53] <Anteru> encoding issue?
[13:56] <Anteru> I don't understand what exactly is missing? binstore is a symlink under /plugins/, but that should be transparent for bzr ...
[13:57] <Anteru> I'm on Win7/bzr 2.3.3 fwiw
[13:57] <jelmer> it looks like you have invalid information in your version_info
[13:58] <Anteru> hm?
[13:58] <jelmer> Anteru: can you comment out version_info and try again?
[13:59] <Anteru> new __init__.py: http://pastie.org/2263612 bzr.log: http://pastie.org/2263615
[14:02] <Anteru> I also tried to replace binstore with blahstore to check if the from bzrlib.plugins. ... line is the problem, but it fails earlier
[14:09] <jelmer> Anteru: have you tried with an empty __init__.py ?
[14:09] <Anteru> hm, doesn't work either -- something is fishy here
[14:09] <Anteru> Do I have to do anything besides putting a folder into my plugins directory?
[14:10] <jelmer> putting it into the plugins directory should be sufficient
[14:10] <jelmer> that said, I don't really have a lot of experience doing development on windows
[14:11] <jelmer> are you using the python-based installer or the standalone installer?
[14:12] <Anteru> I used the normal standalone installer
[14:13] <Anteru> Everything "stock" as much as possible
[14:14] <jelmer> Anteru: I think you might have to use the python based installer if you want to add plugins
[14:14] <jelmer> IMBW
[14:17] <Anteru> hm putting keywords there works
[14:18] <Anteru> ah
[14:18] <jelmer> ah?
[14:18] <Anteru> hm
[14:18] <Anteru> Well, I did a branch of lp:bzr-keywords to plugins and that works
[14:19] <Anteru> after removing setup.py from there, it works still
[14:19] <Anteru> if I copy and paste the __init__.py, I get the same error
[14:21] <Anteru> So it's not my bazaar installation, but something specific to my binstore plugin
[14:21] <Anteru> Ah
[14:21] <Anteru> It does not work if binstore is a symlink
[14:22] <Anteru> I.e. if I symlink something from elsewhere to plugins, bazaar can't find it
[14:24] <Anteru> Uah, that's weird at best.
[14:24] <Anteru> (me wonder what the heck bzr does that it breaks on symlinks on Windows)
[14:24] <jelmer> Anteru: what do you mean by symlinks here?
[14:25] <jelmer> Anteru: NTFS symbolic links?
[14:25] <Anteru> the folder plugins/binstore was a symlink to V:/Dev/Current/Testing/binstore
[14:25] <Anteru> Yes, NTFS symlink
[14:25] <jelmer> Anteru: bzr just uses python's import
[14:25] <jelmer> so presumably that has troubles with symlinks
[14:26] <Anteru> yes but it somehow sees the folder "binstore" but fails afterwards.
[14:26] <Anteru> Oh well, first hour of plugin development spent  :)
[14:32] <Anteru> Thanks!
[14:34] <jelmer> Anteru: yeah, that's annoying
[14:34] <jelmer> Anteru: are you working on a big file store of some sort?
[14:38] <Anteru> Yeah, the one I wrote on the mailing list
[14:38] <Anteru> I'll be back in ~ 1.5 hours, gotta go
[14:38] <jimis> how can I see a what changes a "bzr merge" will do, but without merging yet?
[14:39] <jimis> or how can I "bzr diff" current branch with another branch?
[14:41] <jelmer> jimis: bzr diff should work
[14:43] <jimis> jelmer, I was expecting the following to diff "mytrunk" to current branch:
[14:43] <jimis> bzr diff --old=mytrunk
[14:43] <jimis> it outputs nothing
[14:45] <jelmer> jimis: bzr diff -rbranch:mytrunk
[14:45] <jelmer> though --old should do the same thing
[14:45] <jelmer> it seems odd that mytrunk would be a subdirectory of the current branch though
[14:46] <jimis> thanks jelmer
[14:47] <jimis> -rbranch:mytrunk immediately reported that there is no such branch
[14:47] <jimis> --old=mytrunk just returned silently, with 0 return value
[14:47] <jimis> jelmer: Indeed mytrunk is a subdirectory of parent dir, but I thought it would find it :-)
[15:20] <jimis> let's say I want to merge 5 commits from another branch, but I want to commit them separately using the same commit messages used in that branch.
[15:20] <jimis> How can I do that?
[15:24] <jelmer> jimis: bzr merge will preserve the commit messages
[15:27] <jimis> jelmer: thanks, I understand now. The message that "bzr ci" requests after that, does not erase the separate messages
[15:34] <jelmer> (if you merge and commit, it will show in e.g. "bzr qlog" or "bzr log -n0")
[16:37] <Anteru> re
[16:37] <Anteru> jelmer: Yes, I want to do this "store large files on the server only" thing
[16:44] <Anteru> bye
[17:39] <jimis> how can I commit selectively some of the changes I've made?
[17:44] <jelmer> jimis: "bzr shelve" the changes you don't want
[17:50] <jimis> jelmer: then the question is how to shelve selectively? :-p
[17:50] <jimis> for example I have one file, changed in two places that I want to commit separately
[17:52] <jelmer> jimis: shelve is interactive - it'l prompt you for what chunks to shelve
[17:52] <jimis> hah! I just read the wishlist: http://wiki.bazaar.canonical.com/BzrWishlist
[17:52] <jimis> bzr commit --interactive should run shelf's hunk-selection script.
[17:53] <jimis> jelmer: that will do thanks
[17:57] <jimis> should I submit some bug report? I'd be very interested in interactive commit feature
[17:58] <jelmer> jimis: please file a bug about it
[17:58] <jimis> will do, thanks
[18:05] <jimis> was already there: https://bugs.launchpad.net/bzr/+bug/307285
[18:05] <jelmer> jimis: in that case, please use the "This affects me too" thing
[18:07] <jimis> jelmer: I did, and posted a comment too :-p
[18:40] <Anteru> hm, the content filter gets a chunk, where's the documentaton of what a chunk is?
[18:40] <Anteru> can't find it in the bzrlib documentation
[18:40] <jelmer> Anteru: it gets chunks
[18:41] <jelmer> Anteru: which are basically strings which contain a part of the file. the size of each chunk varies (it depends on the way the file was stored)
[18:41] <Anteru> oh ok, but its for one file?
[18:41] <jelmer> in other words, "".join(chunks) will get you the full file content as a string
[18:42] <Anteru> hm, that doesn't sound too good, as the return value is chunks, too. Which means I must have the whole file in memory once there if I want to have it in a single file.
[18:42] <Anteru> Ok, I'll try using two files first then
[18:42] <jelmer> Anteru: that's true - this is a limitation of the current API
[18:43] <Anteru> i.e. foo.meta stores the hash, and when retrieved, it produces a foo file with the actual contents
[18:43] <jelmer> and one of the harder challenges in adding support in bzr core for large files
[18:43] <Anteru> which will require manually touching of foo.meta if you update foo.bin
[18:43] <jelmer> you can have a post-commit hook of some sort that does that automatically
[18:43] <jelmer> uhm, sorry, a pre-commit hook
[18:43] <Anteru> and a pre-commit too which checks
[18:44] <Anteru> yeah I wonder if that's not easier than a content filter?
[18:44] <Anteru> i.e. have a pre-commit/post-commit hook which checks the file stamps and be done with it?
[18:44] <jelmer> you'll need the content filter to create the file on checkout
[18:44] <Anteru> pre-commit post-update
[18:44] <jelmer> I'm not sure if there is a post-tree-update hook at the moment
[18:44] <jelmer> other than the content filter stuff
[18:45] <jelmer> but I wouldn't be surprised if there was one
[18:45] <Anteru> hmpf
[18:45] <Anteru> implementation wise, it seems pretty simple, but getting into actually into bzr is going to be fun :)
[18:51] <RenatoSilva> how to run selftest in Ubuntu? it complains module testtools is missing
[18:52] <mgz> aptitude install python-testtools
[18:53] <RenatoSilva> mgz: ok, but shouldn't it come with bzr or bzrtools?
[18:53] <RenatoSilva> mgz: it'll be a standalone installation now, related as orphaned package
[18:55] <mgz> it's like a build-depend, as you don't actually need it to *use* bazaar, just to run the test suite, it's not in the dependancy list
[18:56] <RenatoSilva> ok
[18:56] <RenatoSilva> thanks
[18:58] <jelmer> mgz: hi
[18:58] <mgz> hey jelmer!
[18:58] <jelmer> mgz: did you see my bug report about some of the other failures I was seeing?
[18:58] <mgz> I've just commented on one that looked like it was about jml's latest testtools changes
[18:59] <mgz> your first failure from the mp still mystifies me, it might help with that if you can set BZR_TEST_PDB and go up untill you get to the KnownFailure/_ExpectedFailure instance and have a look at it
[18:59] <jelmer> ah, I must've missed that
[18:59] <jelmer> mgz: the MP is about some different issues
[19:00] <mgz> it was just this second, you may have not got the mail yet
[19:16] <jelmer> mgz: still haven't seen it
[19:16]  * jelmer looks at ze web
[20:23] <whitelynx> is there any version of bzr-svn available that works with bzr 2.3.x? the newest i've been able to find only works with 2.2.x
[20:37] <jelmer> whitelynx: only snapshots
[20:38] <whitelynx> aah ok... could you point me at the bzr branch that has the latest? the one used by the bzr-svn-bzr package in AUR seems older than 1.0.4
[20:39] <jelmer> lp:bzr-svn
[20:39] <whitelynx> cool, thanks
[20:41] <whitelynx> I get 'bzr: ERROR: Unsupported protocol for url "lp:bzr-svn"' when i try branching that... does that require an LP ID to branch?
[20:41] <lifeless> no
[20:41] <lifeless> but it does need the launchpad protocol
[20:41] <lifeless> s/protocol/plugin/
[20:41] <whitelynx> aah, ok... so --no-plugins is the issue
[20:47] <whitelynx> sweet, it works now!
[20:47] <whitelynx> jelmer, lifeless: thanks for the help :)
[23:59] <spiv> Good morning folks.