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

[Aaron Bentley]

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

Alexander Belchenko wrote:

> thank you very much for your efforts. You save my day.

The funny thing is, I think you were one of the first to complain that
bundle generation was slow and produced big bundles.  And now that I've
fixed that, you don't want to use it!

> 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:

The whole list is already indented:

    takes_options = [
        Option('no-bundle',
               help='Do not include a bundle in the merge directive.'),
        Option('no-patch', help='Do not include a preview patch in the
merge'
               ' directive.'),
        Option('remember',
               help='Remember submit and public branch.'),
        Option('from',
               help='Branch to generate the submission from, '
               'rather than the one containing the working directory.',
               short_name='f',
               type=unicode),
        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',})
        ]


We don't usually indent things inside indented lists.

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

iD8DBQFGuyAI0F+nu1YWqI0RAqWRAJ43ovFmt8gLO+QLqX4+U1hJNbklxQCggJT5
K2E3OYox2K4q2xFLgcV6HCQ=
=YOUd
-----END PGP SIGNATURE-----