/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/lock_helpers.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/lock_helpers.py
16
16
 
17
17
"""Helper functions/classes for testing locking"""
18
18
 
19
 
from .. import errors
20
 
from ..decorators import only_raises
 
19
from bzrlib import errors
 
20
from bzrlib.decorators import only_raises
21
21
 
22
22
 
23
23
class TestPreventLocking(errors.LockError):
47
47
 
48
48
    def __eq__(self, other):
49
49
        # Branch objects look for controlfiles == repo.controlfiles.
50
 
        if isinstance(other, LockWrapper):
 
50
        if type(other) is LockWrapper:
51
51
            return self._other == other._other
52
52
        return False
53
53
 
87
87
    def disable_lock_write(self):
88
88
        """Make a lock_write call fail"""
89
89
        self.__dict__['_allow_write'] = False
 
90
 
 
91