changeset 8784:9154c79c67cc

Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Thu, 11 Jun 2009 12:23:08 -0700
parents d19ab9a56bf4 (current diff) 6556d4145122 (diff)
children 7a9151bc5b37
files hgext/convert/bzr.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/bzr.py	Thu Jun 11 17:29:14 2009 +0200
+++ b/hgext/convert/bzr.py	Thu Jun 11 12:23:08 2009 -0700
@@ -99,7 +99,7 @@
 
     def getfile(self, name, rev):
         revtree = self.sourcerepo.revision_tree(rev)
-        fileid = revtree.path2id(name)
+        fileid = revtree.path2id(name.decode(self.encoding or 'utf-8'))
         kind = None
         if fileid is not None:
             kind = revtree.kind(fileid)