/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: Robert Collins
  • Date: 2009-07-29 04:57:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4649.
  • Revision ID: robertc@robertcollins.net-20090729045750-qp1iw48rp7jyrfh2
https://launchpad.net/bugs/347649
Change the way iter_changes treats specific files to prevent InconsistentDeltas.

This is the internal core code that handles specific file operations like ``bzr st
FILENAME`` or ``bzr commit FILENAME``, and has been changed to include the
parent directories if they have altered, and when a directory stops being
a directory its children are always included.  This fixes a number of
causes for ``InconsistentDelta`` errors, and permits faster commit of
specific paths. (Robert Collins, #347649)

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