Rev 3558: (jam) Fix bug #247585: decode from utf8 to Unicode when giving a in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3558
revision-id:pqm at pqm.ubuntu.com-20080717165559-8hvqzuqov8rz6x1g
parent: pqm at pqm.ubuntu.com-20080717132712-1zbt1asfsuslh1v9
parent: john at arbash-meinel.com-20080717162645-z7ao0b8u3yprlbzr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-17 17:55:59 +0100
message:
  (jam) Fix bug #247585: decode from utf8 to Unicode when giving a
  	commit message
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
    ------------------------------------------------------------
    revno: 3557.1.1
    revision-id:john at arbash-meinel.com-20080717162645-z7ao0b8u3yprlbzr
    parent: pqm at pqm.ubuntu.com-20080717132712-1zbt1asfsuslh1v9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2008-07-17 11:26:45 -0500
    message:
      Fix bug #247585: decode from utf8 to Unicode when giving a commit message
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
=== modified file 'NEWS'
--- a/NEWS	2008-07-17 12:58:30 +0000
+++ b/NEWS	2008-07-17 16:26:45 +0000
@@ -24,6 +24,9 @@
 
   BUG FIXES:
 
+    * Fix a test case that was failing if encoding wasn't UTF-8.
+      (John Arbash Meinel, #247585)
+
 
   DOCUMENTATION:
 

=== modified file 'bzrlib/tests/branch_implementations/test_hooks.py'
--- a/bzrlib/tests/branch_implementations/test_hooks.py	2008-07-04 01:34:44 +0000
+++ b/bzrlib/tests/branch_implementations/test_hooks.py	2008-07-17 16:26:45 +0000
@@ -99,7 +99,8 @@
         tree.lock_write()
         tree.add('')
         for revision_id in revision_ids:
-            tree.commit('Message of ' + revision_id, rev_id=revision_id)
+            tree.commit(u'Message of ' + revision_id.decode('utf8'),
+                        rev_id=revision_id)
         tree.unlock()
         branch = tree.branch
         return branch