[MERGE] [0.19] preserve old `bundle` UI, add format selection

[Aaron Bentley]

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

Martin Pool wrote:
> I don't care much about the old implementation; if it was ugly then
> I'm happy to get rid of it too.  However, I don't think we should just
> suddenly change the meaning of the command.  People are accustomed to
> writing 'bzr bundle ../OTHER > FILE" and that should still work.
> Ideally that can be just syntactic gloss on the current
> implementation.

Here is a patch that allows "bundle" to emit the merge directive to
stdout.

It also provides a --format option for 'send' and 'bundle', with two
values: 0.9 and 4.  0.9 will select merge directive format 1, with
bundle format 0.9 as its bundle.  4 will select merge directive format
2, with bundle format 4 as its bundle.  4 is the default.

I cleaned up a reference to the old "submit" command in "merge-directive".

I also fixed the per-option help for RegistryOption.from_kwargs.

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

iD8DBQFGuqbM0F+nu1YWqI0RAioaAJ9F7KWTtVfD9pozd5uN68GaBHL0ygCfWch4
hTEtC9l6yuKUnrf/37wJr08=
=TaAa
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: send-bundle-updates.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070809/276d8b37/attachment-0001.diff