hgext/convert/bzr.py
changeset 11134 33010ff1fd6f
parent 10939 9f6731b03906
child 12063 516b000fbb7e
--- a/hgext/convert/bzr.py	Sun May 09 21:49:57 2010 +0200
+++ b/hgext/convert/bzr.py	Sun May 09 21:52:34 2010 +0200
@@ -109,18 +109,16 @@
             # the file is not available anymore - was deleted
             raise IOError(_('%s is not available in %s anymore') %
                     (name, rev))
+        mode = self._modecache[(name, rev)]
         if kind == 'symlink':
             target = revtree.get_symlink_target(fileid)
             if target is None:
                 raise util.Abort(_('%s.%s symlink has no target')
                                  % (name, rev))
-            return target
+            return target, mode
         else:
             sio = revtree.get_file(fileid)
-            return sio.read()
-
-    def getmode(self, name, rev):
-        return self._modecache[(name, rev)]
+            return sio.read(), mode
 
     def getchanges(self, version):
         # set up caches: modecache and revtree