Merge lp:~jelmer/brz/options-unicode into lp:brz

[Jelmer Vernooij]

Mark all options as unicode. Allows using non-ASCII values in options that
support it.

[Martin Packman (gz)]

You want `type=text_type` as the spelling to make Python 3 happy.

review: Needs Fixing

[Martin Packman (gz)]

Looks good with changes made.

review: Approve

=== modified file 'breezy/bugtracker.py'
--- breezy/bugtracker.py	2017-07-30 16:59:50 +0000
+++ breezy/bugtracker.py	2017-11-11 20:42:11 +0000
@@ -276,7 +276,7 @@
 
     def _get_bug_url(self, bug_id):
         """Return the URL for bug_id."""
-        return self.base_url + bug_id
+        return self.base_url + str(bug_id)
 
 
 tracker_registry.register(

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-10-28 13:11:58 +0000
+++ breezy/builtins.py	2017-11-11 20:42:11 +0000
@@ -1418,7 +1418,7 @@
     takes_args = ['from_location', 'to_location?']
     takes_options = ['revision',
         Option('hardlink', help='Hard-link working tree files where possible.'),
-        Option('files-from', type=str,
+        Option('files-from', type=text_type,
                help="Get file contents from this tree."),
         Option('no-tree',
             help="Create a branch without a working-tree."),
@@ -1621,7 +1621,7 @@
                                  "common operations like diff and status without "
                                  "such access, and also support local commits."
                             ),
-                     Option('files-from', type=str,
+                     Option('files-from', type=text_type,
                             help="Get file contents from this tree."),
                      Option('hardlink',
                             help='Hard-link working tree files where possible.'
@@ -2300,9 +2300,9 @@
     _see_also = ['status']
     takes_args = ['file*']
     takes_options = [
-        Option('diff-options', type=str,
+        Option('diff-options', type=text_type,
                help='Pass these options to the external diff program.'),
-        Option('prefix', type=str,
+        Option('prefix', type=text_type,
                short_name='p',
                help='Set prefixes added to old and new filenames, as '
                     'two values separated by a colon. (eg "old/:new/").'),
@@ -2340,15 +2340,15 @@
         from .diff import (get_trees_and_branches_to_diff_locked,
             show_diff_trees)
 
-        if prefix == '0':
+        if prefix == u'0':
             # diff -p0 format
             old_label = ''
             new_label = ''
-        elif prefix == '1' or prefix is None:
+        elif prefix == u'1' or prefix is None:
             old_label = 'old/'
             new_label = 'new/'
-        elif ':' in prefix:
-            old_label, new_label = prefix.split(":")
+        elif u':' in prefix:
+            old_label, new_label = prefix.split(u":")
         else:
             raise errors.BzrCommandError(gettext(
                 '--prefix expects two values separated by a colon'
@@ -2670,7 +2670,7 @@
             Option('message',
                    help='Show revisions whose message matches this '
                         'regular expression.',
-                   type=str,
+                   type=text_type,
                    hidden=True),
             Option('limit',
                    short_name='l',
@@ -2696,23 +2696,23 @@
                 short_name='m',
                 help='Show revisions whose properties match this '
                 'expression.',
-                type=str),
+                type=text_type),
             ListOption('match-message',
                    help='Show revisions whose message matches this '
                    'expression.',
-                type=str),
+                type=text_type),
             ListOption('match-committer',
                    help='Show revisions whose committer matches this '
                    'expression.',
-                type=str),
+                type=text_type),
             ListOption('match-author',
                    help='Show revisions whose authors match this '
                    'expression.',
-                type=str),
+                type=text_type),
             ListOption('match-bugs',
                    help='Show revisions whose bugs match this '
                    'expression.',
-                type=str)
+                type=text_type)
             ]
     encoding_type = 'replace'
 
@@ -3301,7 +3301,7 @@
         Option('filters', help='Apply content filters to export the '
                 'convenient form.'),
         Option('root',
-               type=str,
+               type=text_type,
                help="Name of the root directory inside the exported file."),
         Option('per-file-timestamps',
                help='Set modification time of files to that of the last '
@@ -3480,7 +3480,7 @@
     _see_also = ['add', 'bugs', 'hooks', 'uncommit']
     takes_args = ['selected*']
     takes_options = [
-            ListOption('exclude', type=str, short_name='x',
+            ListOption('exclude', type=text_type, short_name='x',
                 help="Do not consider changes made to a given path."),
             Option('message', type=text_type,
                    short_name='m',
@@ -3488,17 +3488,17 @@
             'verbose',
              Option('unchanged',
                     help='Commit even if nothing has changed.'),
-             Option('file', type=str,
+             Option('file', type=text_type,
                     short_name='F',
                     argname='msgfile',
                     help='Take commit message from this file.'),
              Option('strict',
                     help="Refuse to commit if there are unknown "
                     "files in the working tree."),
-             Option('commit-time', type=str,
+             Option('commit-time', type=text_type,
                     help="Manually set a commit time using commit date "
                     "format, e.g. '2009-10-10 08:00:00 +0100'."),
-             ListOption('fixes', type=str,
+             ListOption('fixes', type=text_type,
                     help="Mark a bug as being fixed by this revision "
                          "(see \"brz help bugs\")."),
              ListOption('author', type=text_type,
@@ -3553,7 +3553,7 @@
                     'Unrecognized bug %s. Commit refused.') % fixed_bug)
             except bugtracker.MalformedBugIdentifier as e:
                 raise errors.BzrCommandError(gettext(
-                    "%s\nCommit refused.") % (str(e),))
+                    u"%s\nCommit refused.") % (e,))
 
     def run(self, message=None, file=None, verbose=False, selected_list=None,
             unchanged=False, strict=False, local=False, fixes=None,
@@ -4075,10 +4075,10 @@
                         lazy_registry=('breezy.tests', 'parallel_registry'),
                         value_switches=False,
                         ),
-                     Option('randomize', type=str, argname="SEED",
+                     Option('randomize', type=text_type, argname="SEED",
                             help='Randomize the order of tests using the given'
                                  ' seed or "now" for the current time.'),
-                     ListOption('exclude', type=str, argname="PATTERN",
+                     ListOption('exclude', type=text_type, argname="PATTERN",
                                 short_name='x',
                                 help='Exclude tests that match this regular'
                                 ' expression.'),
@@ -4088,11 +4088,11 @@
                             help='Output test progress via subunit v2.'),
                      Option('strict', help='Fail on missing dependencies or '
                             'known failures.'),
-                     Option('load-list', type=str, argname='TESTLISTFILE',
+                     Option('load-list', type=text_type, argname='TESTLISTFILE',
                             help='Load a test id list from a text file.'),
-                     ListOption('debugflag', type=str, short_name='E',
+                     ListOption('debugflag', type=text_type, short_name='E',
                                 help='Turn on a selftest debug flag.'),
-                     ListOption('starting-with', type=str, argname='TESTID',
+                     ListOption('starting-with', type=text_type, argname='TESTID',
                                 param_name='starting_with', short_name='s',
                                 help=
                                 'Load only the tests starting with TESTID.'),
@@ -5506,7 +5506,7 @@
                lazy_registry=('breezy.transport', 'transport_server_registry'),
                value_switches=True),
         Option('listen',
-               help='Listen for connections on nominated address.', type=str),
+               help='Listen for connections on nominated address.', type=text_type),
         Option('port',
                help='Listen for connections on nominated port.  Passing 0 as '
                     'the port number will result in a dynamically allocated '
@@ -5647,9 +5647,9 @@
             diff='Normal unified diff.',
             plain='No patch, just directive.'),
         Option('sign', help='GPG-sign the directive.'), 'revision',
-        Option('mail-to', type=str,
+        Option('mail-to', type=text_type,
             help='Instead of printing the directive, email to this address.'),
-        Option('message', type=str, short_name='m',
+        Option('message', type=text_type, short_name='m',
             help='Message to use when committing this merge.')
         ]
 
@@ -6116,7 +6116,7 @@
             with_no_trees='Reconfigure repository to not create '
                 'working trees on branches by default.'
             ),
-        Option('bind-to', help='Branch to bind checkout to.', type=str),
+        Option('bind-to', help='Branch to bind checkout to.', type=text_type),
         Option('force',
             help='Perform reconfiguration even if local changes'
             ' will be lost.'),
@@ -6688,7 +6688,7 @@
     takes_options = [Option('plugin', 
                             help='Export help text from named command '\
                                  '(defaults to all built in commands).',
-                            type=str),
+                            type=text_type),
                      Option('include-duplicates',
                             help='Output multiple copies of the same msgid '
                                  'string if it appears more than once.'),

=== modified file 'breezy/cmd_version_info.py'
--- breezy/cmd_version_info.py	2017-05-22 00:56:52 +0000
+++ breezy/cmd_version_info.py	2017-11-11 20:42:11 +0000
@@ -84,7 +84,7 @@
                             help='Include the revision-history.'),
                      Option('include-file-revisions',
                             help='Include the last revision for each file.'),
-                     Option('template', type=str, help='Template for the output.'),
+                     Option('template', type=text_type, help='Template for the output.'),
                      'revision',
                      ]
     takes_args = ['location?']

=== modified file 'breezy/commit_signature_commands.py'
--- breezy/commit_signature_commands.py	2017-05-22 00:56:52 +0000
+++ breezy/commit_signature_commands.py	2017-11-11 20:42:11 +0000
@@ -110,7 +110,7 @@
                    help='Comma separated list of GPG key patterns which are'
                         ' acceptable for verification.',
                    short_name='k',
-                   type=str,),
+                   type=text_type,),
             'revision',
             'verbose',
           ]

=== modified file 'breezy/plugins/bash_completion/bashcomp.py'
--- breezy/plugins/bash_completion/bashcomp.py	2017-06-05 20:48:31 +0000
+++ breezy/plugins/bash_completion/bashcomp.py	2017-11-11 20:42:11 +0000
@@ -420,13 +420,13 @@
     """
 
     takes_options = [
-        option.Option("function-name", short_name="f", type=str, argname="name",
+        option.Option("function-name", short_name="f", type=text_type, argname="name",
                help="Name of the generated function (default: _brz)"),
         option.Option("function-only", short_name="o", type=None,
                help="Generate only the shell function, don't enable it"),
         option.Option("debug", type=None, hidden=True,
                help="Enable shell code useful for debugging"),
-        option.ListOption("plugin", type=str, argname="name",
+        option.ListOption("plugin", type=text_type, argname="name",
                 # param_name="selected_plugins", # doesn't work, bug #387117
                 help="Enable completions for the selected plugin"
                 + " (default: all plugins)"),

=== modified file 'breezy/plugins/fastimport/cmds.py'
--- breezy/plugins/fastimport/cmds.py	2017-09-26 00:55:04 +0000
+++ breezy/plugins/fastimport/cmds.py	2017-11-11 20:42:11 +0000
@@ -238,10 +238,10 @@
     _see_also = ['fast-export', 'fast-import-filter', 'fast-import-info']
     takes_args = ['source', 'destination?']
     takes_options = ['verbose',
-                    Option('user-map', type=str,
+                    Option('user-map', type=text_type,
                         help="Path to file containing a map of user-ids.",
                         ),
-                    Option('info', type=str,
+                    Option('info', type=text_type,
                         help="Path to file containing caching hints.",
                         ),
                     Option('trees',
@@ -268,10 +268,10 @@
                         experimental="Enable experimental features.",
                         value_switches=True, enum_switch=False,
                         ),
-                    Option('import-marks', type=str,
+                    Option('import-marks', type=text_type,
                         help="Import marks from file."
                         ),
-                    Option('export-marks', type=str,
+                    Option('export-marks', type=text_type,
                         help="Export marks to file."
                         ),
                     RegistryOption('format',
@@ -422,14 +422,14 @@
     _see_also = ['fast-import']
     takes_args = ['source?']
     takes_options = ['verbose',
-                    ListOption('include_paths', short_name='i', type=str,
+                    ListOption('include_paths', short_name='i', type=text_type,
                         help="Only include commits affecting these paths."
                              " Directories should have a trailing /."
                         ),
-                    ListOption('exclude_paths', short_name='x', type=str,
+                    ListOption('exclude_paths', short_name='x', type=text_type,
                         help="Exclude these paths from commits."
                         ),
-                    Option('user-map', type=str,
+                    Option('user-map', type=text_type,
                         help="Path to file containing a map of user-ids.",
                         ),
                     Option('dont-squash-empty-commits',
@@ -543,10 +543,10 @@
     _see_also = ['fast-import', 'fast-import-filter']
     takes_args = ['source']
     takes_options = ['verbose',
-                    Option('commit-mark', short_name='m', type=str,
+                    Option('commit-mark', short_name='m', type=text_type,
                         help="Mark of the commit to display."
                         ),
-                    ListOption('commands', short_name='C', type=str,
+                    ListOption('commands', short_name='C', type=text_type,
                         help="Display fields for these commands."
                         ),
                      ]
@@ -666,20 +666,20 @@
     _see_also = ['fast-import', 'fast-import-filter']
     takes_args = ['source?', 'destination?']
     takes_options = ['verbose', 'revision',
-                    Option('git-branch', short_name='b', type=str,
+                    Option('git-branch', short_name='b', type=text_type,
                         argname='FILE',
                         help='Name of the git branch to create (default=master).'
                         ),
                     Option('checkpoint', type=int, argname='N',
                         help="Checkpoint every N revisions (default=10000)."
                         ),
-                    Option('marks', type=str, argname='FILE',
+                    Option('marks', type=text_type, argname='FILE',
                         help="Import marks from and export marks to file."
                         ),
-                    Option('import-marks', type=str, argname='FILE',
+                    Option('import-marks', type=text_type, argname='FILE',
                         help="Import marks from file."
                         ),
-                    Option('export-marks', type=str, argname='FILE',
+                    Option('export-marks', type=text_type, argname='FILE',
                         help="Export marks to file."
                         ),
                     Option('plain',

=== modified file 'breezy/plugins/grep/cmds.py'
--- breezy/plugins/grep/cmds.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/grep/cmds.py	2017-11-11 20:42:11 +0000
@@ -105,13 +105,13 @@
     takes_options = [
         'verbose',
         'revision',
-        Option('color', type=str, argname='when',
+        Option('color', type=text_type, argname='when',
                help='Show match in color. WHEN is never, always or auto.'),
         Option('diff', short_name='p',
                help='Grep for pattern in changeset for each revision.'),
-        ListOption('exclude', type=str, argname='glob', short_name='X',
+        ListOption('exclude', type=text_type, argname='glob', short_name='X',
             help="Skip files whose base name matches GLOB."),
-        ListOption('include', type=str, argname='glob', short_name='I',
+        ListOption('include', type=text_type, argname='glob', short_name='I',
             help="Search only files whose base name matches GLOB."),
         Option('files-with-matches', short_name='l',
                help='Print only the name of each input file in '

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_commit.py	2017-11-11 20:42:11 +0000
@@ -533,6 +533,19 @@
                               'added hello\.txt\n'
                               'Committed revision 1\.\n')
 
+    def test_fixes_bug_unicode(self):
+        """commit --fixes=lp:unicode succeeds without output."""
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/hello.txt'])
+        tree.add('hello.txt')
+        output, err = self.run_bzr(
+            ['commit', '-m', 'hello',
+             u'--fixes=generic:\u20ac', 'tree/hello.txt'],
+            encoding='utf-8', retcode=3)
+        self.assertEqual(b'', output)
+        self.assertContainsRe(err,
+            b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
+
     def test_no_bugs_no_properties(self):
         """If no bugs are fixed, the bugs property is not set.
 
@@ -541,7 +554,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/hello.txt'])
         tree.add('hello.txt')
-        self.run_bzr( 'commit -m hello tree/hello.txt')
+        self.run_bzr('commit -m hello tree/hello.txt')
         # Get the revision properties, ignoring the branch-nick property, which
         # we don't care about for this test.
         last_rev = tree.branch.repository.get_revision(tree.last_revision())

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-10-07 13:27:26 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-11-11 20:42:11 +0000
@@ -140,6 +140,9 @@
   Thanks to Augie Fackler for reporting.
   (Jelmer Vernooij, #1710979)
 
+* Mark all options as unicode. Allows using non-ASCII values in most
+  options. (Jelmer Vernooij, #563692)
+
 Documentation
 *************