/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2008-08-01 05:39:08 UTC
  • mto: (3363.17.7 merge-into)
  • mto: This revision was merged to the branch mainline in revision 3736.
  • Revision ID: aaron@aaronbentley.com-20080801053908-mpfbe4lfuymsd7mg
Implement PreviewTree.get_file_sha1 properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
41
41
    has_symlinks,
42
42
    lexists,
43
43
    pathjoin,
 
44
    sha_file,
44
45
    splitpath,
45
46
    supports_executable,
46
47
)
1637
1638
            return None
1638
1639
 
1639
1640
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1640
 
        return self._transform._tree.get_file_sha1(file_id)
 
1641
        trans_id = self._transform.trans_id_file_id(file_id)
 
1642
        kind = self._transform._new_contents.get(trans_id)
 
1643
        if kind is None:
 
1644
            return self._transform._tree.get_file_sha1(file_id)
 
1645
        if kind == 'file':
 
1646
            fileobj = self.get_file(file_id)
 
1647
            try:
 
1648
                return sha_file(fileobj)
 
1649
            finally:
 
1650
                fileobj.close()
1641
1651
 
1642
1652
    def is_executable(self, file_id, path=None):
1643
1653
        if file_id is None: