← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-15 15:03:15 UTC
  • mfrom: (4797.42.3 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: v.ladeuil+lp@free.fr-20100415150315-y2bbh2tzvshyzet0
Merge 2.1 into bzr.dev including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
20
20
 
21
21
from bzrlib import (
22
22
    errors,
 
23
    osutils,
23
24
    revision,
 
25
    symbol_versioning,
24
26
    tree,
25
27
    )
26
28
 
174
176
        return set(self._repository.get_ancestry(self._revision_id,
175
177
                                                 topo_sorted=False))
176
178
 
177
 
    def is_locked(self):
178
 
        return self._repository.is_locked()
179
 
 
180
179
    def lock_read(self):
181
180
        self._repository.lock_read()
182
 
        return self
183
181
 
184
182
    def __repr__(self):
185
183
        return '<%s instance at %x, rev_id=%r>' % (