/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: 2011-04-29 18:23:18 UTC
  • mto: (5832.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5834.
  • Revision ID: aaron@aaronbentley.com-20110429182318-wi335ccddmi64272
Fix PreviewTree.get_file_size.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1973
1973
            vf.fallback_versionedfiles.append(base_vf)
1974
1974
        return tree_revision
1975
1975
 
1976
 
    def _stat_limbo_file(self, file_id):
1977
 
        trans_id = self._transform.trans_id_file_id(file_id)
 
1976
    def _stat_limbo_file(self, file_id=None, trans_id=None):
 
1977
        if trans_id is None:
 
1978
            trans_id = self._transform.trans_id_file_id(file_id)
1978
1979
        name = self._transform._limbo_name(trans_id)
1979
1980
        return os.lstat(name)
1980
1981
 
2195
2196
 
2196
2197
    def get_file_size(self, file_id):
2197
2198
        """See Tree.get_file_size"""
 
2199
        trans_id = self._transform.trans_id_file_id(file_id)
 
2200
        kind = self._transform.final_kind(trans_id)
 
2201
        if kind != 'file':
 
2202
            return None
 
2203
        if trans_id in self._transform._new_contents:
 
2204
            return self._stat_limbo_file(trans_id=trans_id).st_size
2198
2205
        if self.kind(file_id) == 'file':
2199
2206
            return self._transform._tree.get_file_size(file_id)
2200
2207
        else: