Rev 6157: Revert the re-ordering of standard options since it has an impact on help generation and as such break tests in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6157
revision-id: v.ladeuil+lp at free.fr-20110922143017-eov5sbi0hwrx2187
parent: v.ladeuil+lp at free.fr-20110922130858-bgl2jio0g356jqv5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2011-09-22 16:30:17 +0200
message:
  Revert the re-ordering of standard options since it has an impact on help generation and as such break tests
-------------- next part --------------
=== modified file 'bzrlib/option.py'
--- a/bzrlib/option.py	2011-09-22 13:07:53 +0000
+++ b/bzrlib/option.py	2011-09-22 14:30:17 +0000
@@ -531,14 +531,14 @@
 # Declare the standard options
 _standard_option('help', short_name='h',
                  help='Show help message.')
-_standard_option('quiet', short_name='q',
-                 help="Only display errors and warnings.",
-                 custom_callback=_verbosity_level_callback)
 _standard_option('usage',
                  help='Show usage message and options.')
 _standard_option('verbose', short_name='v',
                  help='Display more information.',
                  custom_callback=_verbosity_level_callback)
+_standard_option('quiet', short_name='q',
+                 help="Only display errors and warnings.",
+                 custom_callback=_verbosity_level_callback)
 
 # Declare commonly used options
 _global_option('all')