/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/memorytree.py

  • Committer: Robert Collins
  • Date: 2007-07-25 00:52:21 UTC
  • mfrom: (2650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070725005221-0ysm6il5mqnme3wz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
83
83
        """See Tree.get_file."""
84
84
        return self._file_transport.get(self.id2path(file_id))
85
85
 
86
 
    def get_file_sha1(self, file_id, path=None):
 
86
    def get_file_sha1(self, file_id, path=None, stat_value=None):
87
87
        """See Tree.get_file_sha1()."""
88
88
        if path is None:
89
89
            path = self.id2path(file_id)
90
90
        stream = self._file_transport.get(path)
91
91
        return sha_file(stream)
92
92
 
 
93
    def _comparison_data(self, entry, path):
 
94
        """See Tree._comparison_data."""
 
95
        if entry is None:
 
96
            return None, False, None
 
97
        return entry.kind, entry.executable, None
 
98
 
 
99
    def _file_size(self, entry, stat_value):
 
100
        """See Tree._file_size."""
 
101
        if entry is None:
 
102
            return 0
 
103
        return entry.text_size
 
104
 
93
105
    @needs_read_lock
94
106
    def get_parent_ids(self):
95
107
        """See Tree.get_parent_ids.