← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

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,
24
23
    revision,
25
 
    symbol_versioning,
26
24
    tree,
27
25
    )
28
26
 
176
174
        return set(self._repository.get_ancestry(self._revision_id,
177
175
                                                 topo_sorted=False))
178
176
 
 
177
    def is_locked(self):
 
178
        return self._repository.is_locked()
 
179
 
179
180
    def lock_read(self):
180
181
        self._repository.lock_read()
 
182
        return self
181
183
 
182
184
    def __repr__(self):
183
185
        return '<%s instance at %x, rev_id=%r>' % (