/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/counted_lock.py

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/counted_lock.py
46
46
        self._lock_mode = None
47
47
        self._lock_count = 0
48
48
 
49
 
    def get_physical_lock_status(self):
50
 
        """Return physical lock status.
51
 
 
52
 
        Returns true if a lock is held on the transport. If no lock is held, or
53
 
        the underlying locking mechanism does not support querying lock
54
 
        status, false is returned.
55
 
        """
56
 
        try:
57
 
            return self._real_lock.peek() is not None
58
 
        except NotImplementedError:
59
 
            return False
60
 
 
61
49
    def is_locked(self):
62
50
        return self._lock_mode is not None
63
51