Rev 2350: Fix WorkingTree4.get_file_sha1 to actually work. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

Robert Collins robertc at robertcollins.net
Wed Feb 21 03:21:18 GMT 2007


At sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

------------------------------------------------------------
revno: 2350
revision-id: robertc at robertcollins.net-20070221032018-7aon9e56q3sitz6q
parent: robertc at robertcollins.net-20070221013745-7d0ho05wt5btnfyl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Wed 2007-02-21 14:20:18 +1100
message:
  Fix WorkingTree4.get_file_sha1 to actually work.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-02-21 01:08:13 +0000
+++ b/bzrlib/workingtree_4.py	2007-02-21 03:20:18 +0000
@@ -283,12 +283,12 @@
 
     def get_file_sha1(self, file_id, path=None, stat_value=None):
         # check file id is valid unconditionally.
-        entry, parents = self._get_entry(file_id=file_id, path=path)
-        assert entry is not None, 'what error should this raise'
+        key, details = self._get_entry(file_id=file_id, path=path)
+        assert key is not None, 'what error should this raise'
         # TODO:
         # if row stat is valid, use cached sha1, else, get a new sha1.
         if path is None:
-            path = os.path.join(entry[0][0:2]).decode('utf8')
+            path = os.path.join(*key[0:2]).decode('utf8')
         return self._hashcache.get_sha1(path, stat_value)
 
     def _get_inventory(self):



More information about the bazaar-commits mailing list