Meld's Bazaar support

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jelmer Vernooij wrote:
> Hi Aaron,
> 
> While updating your bzr-gtk-meld branch to use an external meld, I
> noticed that meld is broken for bzr. It popens "bzr status --all", but
> the --all argument has been removed recently.

Yeah, it's a bit problematic.  For tools like meld, what we really want
is 'bzr ls -l', i.e. complete info info about the file, including
renames, conflicts, versioning status, etc.

> There are a couple ways to solve this: 
> 
>  * We could use a combination of "bzr ls --verbose", "bzr modified" and
> "bzr added" to figure out the tree state. This'll significantly slow
> down meld on large Bazaar trees though. (Very bad idea imho)

I think it's probably the best short-term solution.

>  * bzr status --all can simply be undeprecated (not sure how difficult
> this will be)

It's not just deprecated-- it's gone.  Adding it back wouldn't be
impossible, but the quickest thing would be a plugin that Meld could
explicitly load.

>  * Ideally, we could use bzrlib directly in meld. John mentioned on IRC
> that there were potential licensing issues because meld.vc is
> BSD-licensed. 
> 
> Is there any chance an exception can be made for the license to
> meld.vc.bzr ? Which solution would you prefer?

Stephen definitely prefers the vc implementations to be BSD-licensed,
but there might be some wiggle room.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFE6y+K0F+nu1YWqI0RAilGAKCEADZ0o5drV9CORryk0CJT2UTOSACcCAY7
3ZHlmnTkX9ccof/RNwRZD3U=
=UYkm
-----END PGP SIGNATURE-----