Merge with crew-stable
authorBrendan Cully <brendan@kublai.com>
Thu, 11 Jun 2009 12:23:08 -0700
changeset 8784 9154c79c67cc
parent 8782 d19ab9a56bf4 (current diff)
parent 8783 6556d4145122 (diff)
child 8785 7a9151bc5b37
Merge with crew-stable
hgext/convert/bzr.py
--- 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)