Merge lp:~parthm/bzr/non-standard-null-option into lp:bzr

[Parth Malwankar]

Fix the type of the recently introduced null option - it should have been global, not standard.

Due to an unfortunate error in the fix[1] for bug #181124 the --null/-0 option ended up as a _standard_option rather than a _global_option due to which it shows up as a valid option for commands like version and branch. This mp is a trivial fix for this.

[1] https://code.launchpad.net/~parthm/bzr/181124-ls-short-opts/+merge/24414

[Robert Collins (lifeless)]

Its a bit redundant to say this as well as clicking approved, but +1

review: Approve

[Martin Pool (mbp)]

i too would have thought standard_option and global_option had the opposite meaning of what they apparently do.

review: Approve

[Robert Collins (lifeless)]

sent to pqm by email

[Robert Collins (lifeless)]

This failed on PQM but the reason is unclear (and not just PQM being
very verbose :- querying losas to see if I can ascertain a cause).

-Rob

[Parth Malwankar (parthm)]

> This failed on PQM but the reason is unclear (and not just PQM being
> very verbose :- querying losas to see if I can ascertain a cause).
>
> -Rob

Sorry about that. I see some bt.test_help failures. I will fix
it and try to land it.

=== modified file 'bzrlib/option.py'
--- bzrlib/option.py	2010-05-05 04:08:11 +0000
+++ bzrlib/option.py	2010-05-24 04:29:26 +0000
@@ -506,9 +506,6 @@
 # Declare the standard options
 _standard_option('help', short_name='h',
                  help='Show help message.')
-_standard_option('null', short_name='0',
-                 help='Use an ASCII NUL (\\0) separator rather than '
-                      'a newline.')
 _standard_option('usage',
                  help='Show usage message and options.')
 _standard_option('verbose', short_name='v',
@@ -533,6 +530,9 @@
                short_name='m',
                help='Message string.')
 _global_option('no-recurse')
+_global_option('null', short_name='0',
+                 help='Use an ASCII NUL (\\0) separator rather than '
+                      'a newline.')
 _global_option('profile',
                help='Show performance profiling information.')
 _global_option('revision',
 
=== modified file 'bzrlib/tests/test_help.py'
--- bzrlib/tests/test_help.py	2010-05-24 02:08:02 +0000
+++ bzrlib/tests/test_help.py	2010-05-24 04:29:26 +0000
@@ -128,7 +128,6 @@
             '\n'
             'Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'
@@ -153,7 +152,6 @@
             '\n'
             ':Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'
@@ -195,7 +193,6 @@
             '\n'
             'Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'
@@ -215,7 +212,6 @@
             '\n'
             'Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'
@@ -250,7 +246,6 @@
             '\n'
             'Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'
@@ -294,7 +289,6 @@
             '\n'
             'Options:\n'
             '  --usage        Show usage message and options.\n'
-            '  -0, --null     Use an ASCII NUL (\\0) separator rather than a newline.\n'
             '  -v, --verbose  Display more information.\n'
             '  -q, --quiet    Only display errors and warnings.\n'
             '  -h, --help     Show help message.\n'