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

[Alexander Belchenko]

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

(This time with correct BB: prefix, I guess)

BB:approve

>Aaron,
>thank you very much for your efforts. You save my day.
> 
> I only want to propose small tweak:
> 
> === modified file bzrlib/builtins.py
> --- bzrlib/builtins.py
> +++ bzrlib/builtins.py
> @@ -3823,21 +3827,29 @@
>          Option('output', short_name='o', help='Write directive to this file.',
>                 type=unicode),
>          'revision',
> +        RegistryOption.from_kwargs('format', 'Output format',
> +        **{'4': 'Bundle format 4, Merge Directive 2 (default)',
> +           '0.9': 'Bundle format 0.9, Merge Directive 1',})
>          ]
> 
> 
> ^-- may be it worth to indent **kwargs here? Like this:
> 
>         RegistryOption.from_kwargs('format', 'Output format',
>             **{'4': 'Bundle format 4, Merge Directive 2 (default)',
>                '0.9': 'Bundle format 0.9, Merge Directive 1',})
> 
> 
> [µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGuvejzYr338mxwCURAplqAJ9xCV52XKl7IpE3Iuz1YLf5dFIKqACfWVyR
MMTexadmtkMts0PU5Ls7cW8=
=vdNH
-----END PGP SIGNATURE-----