~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Robert Collins
  • Date: 2006-03-02 03:12:34 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302031234-cf6b75961f27c5df
InterVersionedFile implemented.

Show diffs side-by-side

added added

removed removed

Lines of Context:
129
129
        self._revision_id = revision_id
130
130
 
131
131
    def get_weave(self, file_id):
132
 
        import bzrlib.transactions as transactions
133
132
        return self._weave_store.get_weave(file_id,
134
133
                self._branch.get_transaction())
135
134
 
136
135
    def get_weave_prelude(self, file_id):
137
 
        import bzrlib.transactions as transactions
138
136
        return self._weave_store.get_weave_prelude(file_id,
139
137
                self._branch.get_transaction())
140
138
 
141
139
    def get_file_lines(self, file_id):
142
140
        ie = self._inventory[file_id]
143
141
        weave = self.get_weave(file_id)
144
 
        return weave.get(ie.revision)
 
142
        return weave.get_lines(ie.revision)
145
143
 
146
144
    def get_file_text(self, file_id):
147
145
        return ''.join(self.get_file_lines(file_id))