[MERGE] Make value_switches=True the default for RegistryOption.

[Robert Widhopf-Fenk]

It was False, but set to True nearly everywhere and where it was not
one would not get any help for those options , e.g. "bzr tag -h" did
not list the valid --sort types.

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: hack at robf.de-20080416223407-ilor03nm84jvchz6
# target_branch: file:///home/fenk/download/bzr.repo/bzr.dev/
# testament_sha1: 93d1b6b061e11735bf6ba98ffd3f9ac46943ac1a
# timestamp: 2008-04-17 00:38:29 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20080416172809-mq3p3rm6q3vefyyz
# 
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2008-04-12 06:46:35 +0000
+++ bzrlib/builtins.py	2008-04-16 22:34:07 +0000
@@ -1160,7 +1160,7 @@
         Option('new', help='Remove newly-added files.'),
         RegistryOption.from_kwargs('file-deletion-strategy',
             'The file deletion mode to be used.',
-            title='Deletion Strategy', value_switches=True, enum_switch=False,
+            title='Deletion Strategy', enum_switch=False,
             safe='Only delete files if they can be'
                  ' safely recovered (default).',
             keep="Don't delete any files.",
@@ -1338,7 +1338,6 @@
                 'See "help formats".',
                 registry=bzrdir.format_registry,
                 converter=bzrdir.format_registry.make_bzrdir,
-                value_switches=True,
                 title="Branch Format",
                 ),
          Option('append-revisions-only',
@@ -1424,7 +1423,7 @@
                                  ' "bzr help formats" for details.',
                             registry=bzrdir.format_registry,
                             converter=bzrdir.format_registry.make_bzrdir,
-                            value_switches=True, title='Repository format'),
+                            title='Repository format'),
                      Option('no-trees',
                              help='Branches in the repository will default to'
                                   ' not having a working tree.'),
@@ -2476,7 +2475,7 @@
                              ' formats" for details.',
                         registry=bzrdir.format_registry,
                         converter=bzrdir.format_registry.make_bzrdir,
-                        value_switches=True, title='Branch format'),
+                        title='Branch format'),
                     ]
 
     def run(self, url='.', format=None):
@@ -3968,7 +3967,6 @@
         RegistryOption.from_kwargs('patch-type',
             'The type of patch to include in the directive.',
             title='Patch type',
-            value_switches=True,
             enum_switch=False,
             bundle='Bazaar revision bundle (default).',
             diff='Normal unified diff.',
@@ -4378,8 +4376,7 @@
         RegistryOption.from_kwargs('sort',
             'Sort tags by different criteria.', title='Sorting',
             alpha='Sort tags lexicographically (default).',
-            time='Sort tags chronologically.',
-            ),
+            time='Sort tags chronologically.'),
         'show-ids',
     ]
 
@@ -4431,7 +4428,7 @@
     takes_options = [RegistryOption.from_kwargs('target_type',
                      title='Target type',
                      help='The type to reconfigure the directory to.',
-                     value_switches=True, enum_switch=False,
+                     enum_switch=False,
                      branch='Reconfigure to a branch.',
                      tree='Reconfigure to a tree.',
                      checkout='Reconfigure to a checkout.',

=== modified file 'bzrlib/cmd_version_info.py'
--- bzrlib/cmd_version_info.py	2008-02-25 23:41:06 +0000
+++ bzrlib/cmd_version_info.py	2008-04-16 22:34:07 +0000
@@ -72,8 +72,7 @@
 
     takes_options = [RegistryOption('format',
                             'Select the output format.',
-                            version_info_formats.format_registry,
-                            value_switches=True),
+                            version_info_formats.format_registry),
                      Option('all', help='Include all possible information.'),
                      Option('check-clean', help='Check if tree is clean.'),
                      Option('include-history',

=== modified file 'bzrlib/option.py'
--- bzrlib/option.py	2008-02-26 23:45:24 +0000
+++ bzrlib/option.py	2008-04-16 22:34:07 +0000
@@ -285,7 +285,7 @@
 
 
 class RegistryOption(Option):
-    """Option based on a registry
+    """Option based on a registry.
 
     The values for the options correspond to entries in the registry.  Input
     must be a registry key.  After validation, it is converted into an object
@@ -306,7 +306,7 @@
             return self.converter(value)
 
     def __init__(self, name, help, registry, converter=None,
-        value_switches=False, title=None, enum_switch=True):
+        value_switches=True, title=None, enum_switch=True):
         """
         Constructor.
 
@@ -332,7 +332,7 @@
             self.title = name
 
     @staticmethod
-    def from_kwargs(name_, help=None, title=None, value_switches=False,
+    def from_kwargs(name_, help=None, title=None, value_switches=True,
                     enum_switch=True, **kwargs):
         """Convenience method to generate string-map registry options
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRSEvEAAA1F/gERQJEBR7///
VyOcgL////BgBo3GPgB6K5dKqoVpt7z3CSQQJo1PIaaMghT8SZNqaHqTT0NR6R6j9UwkoEU8eopv
UjQ2oAA0AAAAGgNEmCI0AABoAAAAAaACRETRFP0oeNU2pk8UAAAAGT1Ggeoc0ZMTABMRgRpgQYjB
MmARgkk0Cm0BNT0mRJtT08qMyT00QaAAASosrtv07szMR1uTxvSJf8fpPggonTgZVtufk1bIyCgM
EsyIQKapxrymBMqMxrqka5jTICEwRBZAR+SoWcN4fNaU20NgN8OdCxph2YNOVCTLXGq567Ublw5d
nM2nJ0q4tVwYM6/To5tEc8Rtuimqi/0q7p2U4WjfdF/LXCtZU56kY0XBowvo5FWJkwJKEQWnUcnH
Hy029uStaE+Lli1vfhvs+SCF90IJdrAqHZzsyRCGrP4qM3RuIzMzSxd+WT8ylFT7IiIvW8pMtz95
dTcImWHz/arP3Ovmh7Q/5VJELIx7qIpjQZ1wrDORmoX1gwZe3vqAuOsHiMgXE6Ez1h2llQ7V4FjQ
RgqCV5FF7BYcdoCIDKFw0QDkXD4E7zcmUArM3ekoYL25oVcajOXRweQM+axTpiRvJfNQoNfLB4Wu
D7+l0TUzCUwYchoppmEMG9Yx+feTNi4NxTz6jgULEy81MpSabY7epAolVfKGqsZlwiBEyMRHVLDV
y5SizkGmZGSkXKimTC4C8xJjcDAgXzgzlh3Y0LFVS8gOMPOIhmOBmXXDmJEpSkLQysRMDypgI/xO
mV8cL4FoXjkBFVZwZx97IUjImtWO/I3GoxG683LdA8cFEmoprzW4OC5lByxARpjZ8JF+ZwfBGhpC
YwcZ3WtMvpJleMgW2SGrKboGAeMMY+QzYVKCLXLEmGeqxkiu8gVVeu6JwLjKmFHkdiLy8uLzvUM7
5GIjBjCJrksTeN1mBVPA2LD0oNbMalVaKV4SGjDOeWRDdeUAGTDwKFJkyaqE05UzEYXTJpwzZlRQ
OjU8sfCmxlQqHJ+HKxKJErGIm5eUkzOMuxDGRwmSLED256ss9+VowCCIKIUFLxPesmA9jO5OdlSI
7uUkkA/EoIYw847Pklm76h5JmsF7iZW9eBI0FWxts6PUT6zvbZ10WfG60uCgeOF3kcDSvukRWhBl
MgLR479YGLBJTDa/mepVA5nAYKu+8c7vb8TnE7FiNtKRAqqH95ZmOsTrfXL08neqcJI91J1OVWtm
I+GbkDTtFVtvPY2wXaQ8SZ4T8jEkYmBm52Fiht6gUt3cc2+pXcX9jLwEHZqdDePvOQZiCYgWmg7a
zQSlecrUowWbREkGSLOHciSRb4NdodQ5t5nUMTRsRRvHyLIO6xIsYpH6/HOf5lD94eV27f4aE6Hg
0OGa3bGRmIOYeIpnW4l8dSsLTXOT/Scz1g5lJZegMUzHxPlodGJSUhVDhXvNvA20e4tjqafgnntX
p/Mh8JFhMnJa/RqMWmmgqnKOsHNAOw5LzblXj2ZaCPfilGvX8g2OaRvO47TkUgdCpAMmO4Mwea8F
lU8qcl7ubsXORY5GAjxgvGF3rDfQyLwPvzPkhlDWVaqjcRC+R1jCM6E/qm2K3dDa+iNyDpOQDlrQ
WiPeoqz4C6qAgv72wkgamBkhuIirKo1mhKREuVlLs+nZzEYUXmNki6bKk270xo0Ui6kMouwVNWm3
Sgig6jz1kohV6IsnWYiCeqillQKt16XvbLbPB4YKMElBhXVhe+CiJyIdeyChM4zbRFL7zdNyuSbS
0pqFxtm2M9GQLLZshEvDQ0ieWBOq/1cpoRZHLjg1GQxiKhOS6ZOUAndSrb52uWt9IZNmxEQmDzbF
fhwWaYooG6E4bkFK+q7sYo7sHMwjJML8vLlE9htURn3utGTxnOyfir0tki3pkeiuYZleMbOIoLxt
ztv8zclaLNISN7y25X82lg+BZICyDY4TpDFfihZhoJBGhZEx51MRIsJfUj880JnVAiTT8gplZJKE
ZyFS5WsZYEU2IX7L+oGRc+4UILI6CueM5EnJ5Rct1aN8hYA2VhvaxRVrmscf/5iNqlV+XQkR/jnO
U+9zkp3S0MlXYRz6lhBwmjJY+5mMRrWIdgRlBsDDBH/F3JFOFCQFIS8QAA==