← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: John Arbash Meinel
  • Date: 2006-03-08 14:31:23 UTC
  • mfrom: (1598 +trunk)
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060308143123-448308b0db4de410
[merge] bzr.dev 1573, lots of updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
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
 
    def get_weave_prelude(self, file_id):
137
 
        import bzrlib.transactions as transactions
138
 
        return self._weave_store.get_weave_prelude(file_id,
139
 
                self._branch.get_transaction())
140
 
 
141
135
    def get_file_lines(self, file_id):
142
136
        ie = self._inventory[file_id]
143
137
        weave = self.get_weave(file_id)
144
 
        return weave.get(ie.revision)
 
138
        return weave.get_lines(ie.revision)
145
139
 
146
140
    def get_file_text(self, file_id):
147
141
        return ''.join(self.get_file_lines(file_id))