Rev 841: Fix another unicode bug. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 841
revision-id:jelmer at samba.org-20080118031619-1d7gehl1w612qbf7
parent: jelmer at samba.org-20080117234644-k5quqeqg16qolj4v
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-01-18 04:16:19 +0100
message:
  Fix another unicode bug.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
=== modified file 'NEWS'
--- a/NEWS	2008-01-17 23:42:21 +0000
+++ b/NEWS	2008-01-18 03:16:19 +0000
@@ -2,7 +2,7 @@
 
   BUGS
 
-   * Consistently handle unicode characters. (#129334)
+   * Consistently handle unicode characters. (#129334, #164381)
 
 bzr-svn 0.4.6	2008-01-08
 

=== modified file 'fileids.py'
--- a/fileids.py	2008-01-17 23:19:19 +0000
+++ b/fileids.py	2008-01-18 03:16:19 +0000
@@ -82,7 +82,7 @@
                     data = ('M', None, None)
                 else:
                     data = (data[0], crp, generate_revid(
-                                  data[2], cbp.encode("utf-8"), str(scheme)))
+                                  data[2], cbp, str(scheme)))
             except NotBranchError:
                 # Copied from outside of a known branch
                 # Make it look like the files were added in this revision
@@ -168,7 +168,7 @@
         # No history -> empty map
         for (bp, paths, rev) in self.repos.follow_branch_history(branch, 
                                              revnum, scheme):
-            revid = self.repos.generate_revision_id(rev, bp.encode("utf-8"), 
+            revid = self.repos.generate_revision_id(rev, bp, 
                                                     str(scheme))
             try:
                 map = self.load(revid)

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-01-17 23:19:19 +0000
+++ b/logwalker.py	2008-01-18 03:16:19 +0000
@@ -193,6 +193,8 @@
 
         paths = {}
         for p, act, cf, cr in self.db.execute(query):
+            if cf is not None:
+                cf = cf.encode("utf-8")
             paths[p.encode("utf-8")] = (act, cf, cr)
         return paths