← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Aaron Bentley
  • Date: 2006-12-10 18:46:53 UTC
  • mfrom: (2167 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061210184653-qg4kra59ky1gbgyk
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
76
76
    def get_file_size(self, file_id):
77
77
        return self._inventory[file_id].text_size
78
78
 
79
 
    def get_file_sha1(self, file_id, path=None):
 
79
    def get_file_sha1(self, file_id, path=None, stat_value=None):
80
80
        ie = self._inventory[file_id]
81
81
        if ie.kind == "file":
82
82
            return ie.text_sha1
113
113
    def kind(self, file_id):
114
114
        return self._inventory[file_id].kind
115
115
 
 
116
    def _comparison_data(self, entry, path):
 
117
        if entry is None:
 
118
            return None, False, None
 
119
        return entry.kind, entry.executable, None
 
120
 
 
121
    def _file_size(self, entry, stat_value):
 
122
        assert entry.text_size is not None
 
123
        return entry.text_size
 
124
 
116
125
    def lock_read(self):
117
126
        self._repository.lock_read()
118
127