Rev 6172: Global options respect their hidden attribute in file:///home/vila/src/bzr/bugs/860424-hidden-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/860424-hidden-options/

------------------------------------------------------------
revno: 6172
revision-id: v.ladeuil+lp at free.fr-20110927114850-338r2mns0138klv0
parent: pqm at pqm.ubuntu.com-20110926154224-by4s1qzbroh115wn
fixes bug: https://launchpad.net/bugs/860424
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 860424-hidden-options
timestamp: Tue 2011-09-27 13:48:50 +0200
message:
  Global options respect their hidden attribute
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2011-09-19 15:59:40 +0000
+++ b/bzrlib/commands.py	2011-09-27 11:48:50 +0000
@@ -816,7 +816,8 @@
     try:
         options, args = parser.parse_args(args)
     except UnicodeEncodeError,e:
-        raise errors.BzrCommandError(gettext('Only ASCII permitted in option names'))
+        raise errors.BzrCommandError(
+            gettext('Only ASCII permitted in option names'))
 
     opts = dict([(k, v) for k, v in options.__dict__.iteritems() if
                  v is not option.OptionParser.DEFAULT_VALUE])

=== modified file 'bzrlib/tests/test_options.py'
--- a/bzrlib/tests/test_options.py	2011-06-01 07:01:17 +0000
+++ b/bzrlib/tests/test_options.py	2011-09-27 11:48:50 +0000
@@ -65,6 +65,11 @@
         out, err = self.run_bzr('help status')
         self.assertContainsRe(out, r'--show-ids.*Show internal object.')
 
+    def test_option_help_global_hidden(self):
+        """Hidden global options have no help strings."""
+        out, err = self.run_bzr('help log')
+        self.assertNotContainsRe(out, r'--message')
+
     def test_option_arg_help(self):
         """Help message shows option arguments."""
         out, err = self.run_bzr('help commit')