Rev 5254: Fix the type of the recently introduced null option - it should have been in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5254 [merge]
revision-id: pqm at pqm.ubuntu.com-20100524055053-98svu921jteiweaw
parent: pqm at pqm.ubuntu.com-20100524020802-hi1vckdctg1m4qq2
parent: parth.malwankar at gmail.com-20100524042801-ermuvi4ednd1zesf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-05-24 06:50:53 +0100
message:
  Fix the type of the recently introduced null option - it should have been
   global, not standard.
modified:
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
=== modified file 'bzrlib/option.py'
--- a/bzrlib/option.py	2010-05-05 04:08:11 +0000
+++ b/bzrlib/option.py	2010-05-23 18:57:38 +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'
--- a/bzrlib/tests/test_help.py	2010-05-24 02:08:02 +0000
+++ b/bzrlib/tests/test_help.py	2010-05-24 05:50:53 +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'