Rev 3104: (John Arbash Meinel) Allow 'bzr commit --author' to take a unicode in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3104
revision-id:pqm at pqm.ubuntu.com-20071211175118-s94sizduj201hrs5
parent: pqm at pqm.ubuntu.com-20071211153559-uxwxk3c9amp84i43
parent: john at arbash-meinel.com-20071210163900-2wo190x3shshcvup
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-12-11 17:51:18 +0000
message:
  (John Arbash Meinel) Allow 'bzr commit --author' to take a unicode
  	string.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
    ------------------------------------------------------------
    revno: 3099.2.1
    revision-id:john at arbash-meinel.com-20071210163900-2wo190x3shshcvup
    parent: pqm at pqm.ubuntu.com-20071210120611-a3j02d26cbzvlyju
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_commit_author
    timestamp: Mon 2007-12-10 10:39:00 -0600
    message:
      Allow 'bzr commit --author' to take a unicode string.
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-12-11 05:13:36 +0000
+++ b/bzrlib/builtins.py	2007-12-11 17:51:18 +0000
@@ -2231,7 +2231,7 @@
                     "files in the working tree."),
              ListOption('fixes', type=str,
                     help="Mark a bug as being fixed by this revision."),
-             Option('author', type=str,
+             Option('author', type=unicode,
                     help="Set the author's name, if it's different "
                          "from the committer."),
              Option('local',

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2007-11-30 02:06:35 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2007-12-10 16:39:00 +0000
@@ -520,11 +520,12 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/hello.txt'])
         tree.add('hello.txt')
-        self.run_bzr("commit -m hello --author='John Doe <jdoe at example.com>' "
-                     "tree/hello.txt")
+        self.run_bzr(["commit", '-m', 'hello',
+                      '--author', u'John D\xf6 <jdoe at example.com>',
+                     "tree/hello.txt"])
         last_rev = tree.branch.repository.get_revision(tree.last_revision())
         properties = last_rev.properties
-        self.assertEqual('John Doe <jdoe at example.com>', properties['author'])
+        self.assertEqual(u'John D\xf6 <jdoe at example.com>', properties['author'])
 
     def test_author_no_email(self):
         """Author's name without an email address is allowed, too."""