← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-16 20:52:54 UTC
  • mfrom: (5193.5.9 cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20100716205254-j0m65wckb90rj54w
(vila) Cleanup some bogus rest constructs in the doc. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
520
520
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
521
521
                self._iter_parent_trees()]
522
522
            vf.add_lines((file_id, last_revision), parent_keys,
523
 
                         self.get_file(file_id).readlines())
 
523
                         self.get_file_lines(file_id))
524
524
            repo = self.branch.repository
525
525
            base_vf = repo.texts
526
526
        else:
582
582
            yield child.file_id
583
583
 
584
584
    def lock_read(self):
 
585
        """Lock this tree for multiple read only operations.
 
586
        
 
587
        :return: A bzrlib.lock.LogicalLockResult.
 
588
        """
585
589
        pass
586
590
 
587
591
    def revision_tree(self, revision_id):