← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Fix WorkingTree4.get_file_sha1 to actually work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
283
283
 
284
284
    def get_file_sha1(self, file_id, path=None, stat_value=None):
285
285
        # check file id is valid unconditionally.
286
 
        entry, parents = self._get_entry(file_id=file_id, path=path)
287
 
        assert entry is not None, 'what error should this raise'
 
286
        key, details = self._get_entry(file_id=file_id, path=path)
 
287
        assert key is not None, 'what error should this raise'
288
288
        # TODO:
289
289
        # if row stat is valid, use cached sha1, else, get a new sha1.
290
290
        if path is None:
291
 
            path = os.path.join(entry[0][0:2]).decode('utf8')
 
291
            path = os.path.join(*key[0:2]).decode('utf8')
292
292
        return self._hashcache.get_sha1(path, stat_value)
293
293
 
294
294
    def _get_inventory(self):