← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2009-10-08 08:16:35 UTC
  • mfrom: (4732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4734.
  • Revision ID: andrew.bennetts@canonical.com-20091008081635-hwoh2m0566lkqgqq
Merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
49
49
from bzrlib.testament import Testament
50
50
""")
51
51
 
52
 
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
52
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
53
53
from bzrlib.lock import _RelockDebugMixin
54
54
from bzrlib.inter import InterObject
55
55
from bzrlib.inventory import (
1723
1723
        self.start_write_group()
1724
1724
        return result
1725
1725
 
 
1726
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1726
1727
    def unlock(self):
1727
1728
        if (self.control_files._lock_count == 1 and
1728
1729
            self.control_files._lock_mode == 'w'):