bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4158.2.1
by Martin Pool
 merge back 1.13final  | 
1  | 
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
1185.65.22
by Robert Collins
 lockable_files was extracted from branch.py - give it a copyright statement  | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
7  | 
#
 | 
| 
1185.65.22
by Robert Collins
 lockable_files was extracted from branch.py - give it a copyright statement  | 
8  | 
# This program is distributed in the hope that it will be useful,
 | 
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
12  | 
#
 | 
| 
1185.65.22
by Robert Collins
 lockable_files was extracted from branch.py - give it a copyright statement  | 
13  | 
# You should have received a copy of the GNU General Public License
 | 
14  | 
# along with this program; if not, write to the Free Software
 | 
|
| 
4183.7.1
by Sabin Iacob
 update FSF mailing address  | 
15  | 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
| 
1185.65.22
by Robert Collins
 lockable_files was extracted from branch.py - give it a copyright statement  | 
16  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
17  | 
from cStringIO import StringIO  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
18  | 
|
19  | 
from bzrlib.lazy_import import lazy_import  | 
|
20  | 
lazy_import(globals(), """  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
21  | 
import codecs
 | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
22  | 
import warnings
 | 
23  | 
||
24  | 
from bzrlib import (
 | 
|
| 
3468.3.3
by Martin Pool
 Fix import  | 
25  | 
    counted_lock,
 | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
26  | 
    errors,
 | 
| 
4509.3.25
by Martin Pool
 Add an option for unlock errors to be non-fatal  | 
27  | 
    lock,
 | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
28  | 
    osutils,
 | 
29  | 
    transactions,
 | 
|
30  | 
    urlutils,
 | 
|
31  | 
    )
 | 
|
32  | 
""")  | 
|
33  | 
||
34  | 
from bzrlib.decorators import (  | 
|
| 
4634.85.9
by Andrew Bennetts
 Add some experimental decorators: @only_raises(..) and @cleanup_method.  | 
35  | 
only_raises,  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
36  | 
    )
 | 
| 
3388.2.1
by Martin Pool
 Deprecate LockableFiles.get_utf8  | 
37  | 
from bzrlib.symbol_versioning import (  | 
38  | 
deprecated_in,  | 
|
39  | 
deprecated_method,  | 
|
40  | 
    )
 | 
|
| 
1685.1.45
by John Arbash Meinel
 Moved url functions into bzrlib.urlutils  | 
41  | 
|
| 
1185.65.10
by Robert Collins
 Rename Controlfiles to LockableFiles.  | 
42  | 
|
| 
1553.5.41
by Martin Pool
 Add new LockableFiles.LockDirStrategy; not used yet  | 
43  | 
# XXX: The tracking here of lock counts and whether the lock is held is
 | 
44  | 
# somewhat redundant with what's done in LockDir; the main difference is that
 | 
|
45  | 
# LockableFiles permits reentrancy.
 | 
|
| 
1185.65.27
by Robert Collins
 Tweak storage towards mergability.  | 
46  | 
|
| 
4041.1.5
by Michael Hudson
 review comments  | 
47  | 
class _LockWarner(object):  | 
48  | 
"""Hold a counter for a lock and warn if GCed while the count is >= 1.  | 
|
| 
4041.1.4
by Michael Hudson
 this makes more sense  | 
49  | 
|
50  | 
    This is separate from LockableFiles because putting a __del__ on
 | 
|
51  | 
    LockableFiles can result in uncollectable cycles.
 | 
|
52  | 
    """
 | 
|
53  | 
||
54  | 
def __init__(self, repr):  | 
|
55  | 
self.lock_count = 0  | 
|
| 
4041.1.1
by Michael Hudson
 this is terrible but it works  | 
56  | 
self.repr = repr  | 
57  | 
||
58  | 
def __del__(self):  | 
|
| 
4041.1.4
by Michael Hudson
 this makes more sense  | 
59  | 
if self.lock_count >= 1:  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
60  | 
            # There should have been a try/finally to unlock this.
 | 
| 
4041.1.1
by Michael Hudson
 this is terrible but it works  | 
61  | 
warnings.warn("%r was gc'd while locked" % self.repr)  | 
| 
4041.1.3
by Michael Hudson
 _this_ works  | 
62  | 
|
| 
4041.1.1
by Michael Hudson
 this is terrible but it works  | 
63  | 
|
| 
1185.66.3
by Aaron Bentley
 Renamed ControlFiles to LockableFiles  | 
64  | 
class LockableFiles(object):  | 
| 
1553.5.38
by Martin Pool
 More explanation for LockableFiles  | 
65  | 
"""Object representing a set of related files locked within the same scope.  | 
66  | 
||
| 
4570.3.1
by Martin Pool
 Update LockableFiles docstring  | 
67  | 
    This coordinates access to the lock along with providing a transaction.
 | 
| 
1553.5.38
by Martin Pool
 More explanation for LockableFiles  | 
68  | 
|
| 
1553.5.39
by Martin Pool
 More lock docs  | 
69  | 
    LockableFiles manage a lock count and can be locked repeatedly by
 | 
70  | 
    a single caller.  (The underlying lock implementation generally does not
 | 
|
71  | 
    support this.)
 | 
|
72  | 
||
| 
1553.5.38
by Martin Pool
 More explanation for LockableFiles  | 
73  | 
    Instances of this class are often called control_files.
 | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
74  | 
|
75  | 
    This class is now deprecated; code should move to using the Transport
 | 
|
76  | 
    directly for file operations and using the lock or CountedLock for
 | 
|
| 
3407.2.9
by Martin Pool
 doc  | 
77  | 
    locking.
 | 
| 
3407.2.19
by Martin Pool
 CountedLock should manage lock tokens  | 
78  | 
    
 | 
79  | 
    :ivar _lock: The real underlying lock (e.g. a LockDir)
 | 
|
80  | 
    :ivar _counted_lock: A lock decorated with a semaphore, so that it 
 | 
|
81  | 
        can be re-entered.
 | 
|
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
82  | 
    """
 | 
| 
1185.65.10
by Robert Collins
 Rename Controlfiles to LockableFiles.  | 
83  | 
|
| 
1553.5.47
by Martin Pool
 cleanup LockableFiles  | 
84  | 
    # _lock_mode: None, or 'r' or 'w'
 | 
| 
1553.5.43
by Martin Pool
 Get LockableFiles tests running against LockDir  | 
85  | 
|
| 
1553.5.47
by Martin Pool
 cleanup LockableFiles  | 
86  | 
    # _lock_count: If _lock_mode is true, a positive count of the number of
 | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
87  | 
    # times the lock has been taken *by this process*.
 | 
88  | 
||
| 
1553.5.63
by Martin Pool
 Lock type is now mandatory for LockableFiles constructor  | 
89  | 
def __init__(self, transport, lock_name, lock_class):  | 
| 
1553.5.43
by Martin Pool
 Get LockableFiles tests running against LockDir  | 
90  | 
"""Create a LockableFiles group  | 
91  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
92  | 
        :param transport: Transport pointing to the directory holding the
 | 
| 
1553.5.43
by Martin Pool
 Get LockableFiles tests running against LockDir  | 
93  | 
            control files and lock.
 | 
94  | 
        :param lock_name: Name of the lock guarding these files.
 | 
|
| 
1553.5.47
by Martin Pool
 cleanup LockableFiles  | 
95  | 
        :param lock_class: Class of lock strategy to use: typically
 | 
96  | 
            either LockDir or TransportLock.
 | 
|
| 
1553.5.43
by Martin Pool
 Get LockableFiles tests running against LockDir  | 
97  | 
        """
 | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
98  | 
self._transport = transport  | 
99  | 
self.lock_name = lock_name  | 
|
100  | 
self._transaction = None  | 
|
| 
1553.5.47
by Martin Pool
 cleanup LockableFiles  | 
101  | 
self._lock_mode = None  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
102  | 
self._lock_warner = _LockWarner(repr(self))  | 
| 
1685.1.43
by John Arbash Meinel
 Bug in lockable files when _find_mode throws  | 
103  | 
self._find_modes()  | 
| 
1553.5.43
by Martin Pool
 Get LockableFiles tests running against LockDir  | 
104  | 
esc_name = self._escape(lock_name)  | 
| 
1608.2.1
by Martin Pool
 [merge] Storage filename escaping  | 
105  | 
self._lock = lock_class(transport, esc_name,  | 
| 
1553.5.59
by Martin Pool
 Pass file/mode bits through to creation of lock files/dirs  | 
106  | 
file_modebits=self._file_mode,  | 
107  | 
dir_modebits=self._dir_mode)  | 
|
| 
3468.3.3
by Martin Pool
 Fix import  | 
108  | 
self._counted_lock = counted_lock.CountedLock(self._lock)  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
109  | 
|
| 
1553.5.60
by Martin Pool
 New LockableFiles.create_lock() method  | 
110  | 
def create_lock(self):  | 
111  | 
"""Create the lock.  | 
|
112  | 
||
113  | 
        This should normally be called only when the LockableFiles directory
 | 
|
114  | 
        is first created on disk.
 | 
|
115  | 
        """
 | 
|
| 
1666.1.4
by Robert Collins
 * 'Metadir' is now the default disk format. This improves behaviour in  | 
116  | 
self._lock.create(mode=self._dir_mode)  | 
| 
1553.5.60
by Martin Pool
 New LockableFiles.create_lock() method  | 
117  | 
|
| 
1553.5.53
by Martin Pool
 Add LockableFiles __repr__  | 
118  | 
def __repr__(self):  | 
119  | 
return '%s(%r)' % (self.__class__.__name__,  | 
|
120  | 
self._transport)  | 
|
| 
1185.80.2
by John Arbash Meinel
 Traced double locking code to WorkingTree creating its own control files.  | 
121  | 
def __str__(self):  | 
122  | 
return 'LockableFiles(%s, %s)' % (self.lock_name, self._transport.base)  | 
|
123  | 
||
| 
1687.1.6
by Robert Collins
 Extend LockableFiles to support break_lock() calls.  | 
124  | 
def break_lock(self):  | 
125  | 
"""Break the lock of this lockable files group if it is held.  | 
|
126  | 
||
127  | 
        The current ui factory will be used to prompt for user conformation.
 | 
|
128  | 
        """
 | 
|
129  | 
self._lock.break_lock()  | 
|
130  | 
||
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
131  | 
def _escape(self, file_or_path):  | 
| 
3834.2.2
by Martin Pool
 Deprecated LockableFiles._escape  | 
132  | 
"""DEPRECATED: Do not use outside this class"""  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
133  | 
if not isinstance(file_or_path, basestring):  | 
134  | 
file_or_path = '/'.join(file_or_path)  | 
|
135  | 
if file_or_path == '':  | 
|
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
136  | 
return u''  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
137  | 
return urlutils.escape(osutils.safe_unicode(file_or_path))  | 
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
138  | 
|
139  | 
def _find_modes(self):  | 
|
| 
3416.2.1
by Martin Pool
 Add BzrDir._get_file_mode and _get_dir_mode  | 
140  | 
"""Determine the appropriate modes for files and directories.  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
141  | 
|
| 
4570.3.4
by Martin Pool
 Doc  | 
142  | 
        :deprecated: Replaced by BzrDir._find_creation_modes.
 | 
| 
3416.2.1
by Martin Pool
 Add BzrDir._get_file_mode and _get_dir_mode  | 
143  | 
        """
 | 
| 
3407.2.19
by Martin Pool
 CountedLock should manage lock tokens  | 
144  | 
        # XXX: The properties created by this can be removed or deprecated
 | 
145  | 
        # once all the _get_text_store methods etc no longer use them.
 | 
|
146  | 
        # -- mbp 20080512
 | 
|
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
147  | 
try:  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
148  | 
st = self._transport.stat('.')  | 
149  | 
except errors.TransportNotPossible:  | 
|
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
150  | 
self._dir_mode = 0755  | 
151  | 
self._file_mode = 0644  | 
|
152  | 
else:  | 
|
| 
3107.2.1
by John Arbash Meinel
 Fix LockableFiles to not use modes that allow the user to write to things they create.  | 
153  | 
            # Check the directory mode, but also make sure the created
 | 
154  | 
            # directories and files are read-write for this user. This is
 | 
|
155  | 
            # mostly a workaround for filesystems which lie about being able to
 | 
|
156  | 
            # write to a directory (cygwin & win32)
 | 
|
157  | 
self._dir_mode = (st.st_mode & 07777) | 00700  | 
|
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
158  | 
            # Remove the sticky and execute bits for files
 | 
159  | 
self._file_mode = self._dir_mode & ~07111  | 
|
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
160  | 
|
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
161  | 
def leave_in_place(self):  | 
162  | 
"""Set this LockableFiles to not clear the physical lock on unlock."""  | 
|
163  | 
self._lock.leave_in_place()  | 
|
164  | 
||
165  | 
def dont_leave_in_place(self):  | 
|
166  | 
"""Set this LockableFiles to clear the physical lock on unlock."""  | 
|
167  | 
self._lock.dont_leave_in_place()  | 
|
168  | 
||
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
169  | 
def lock_write(self, token=None):  | 
170  | 
"""Lock this group of files for writing.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
171  | 
|
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
172  | 
        :param token: if this is already locked, then lock_write will fail
 | 
173  | 
            unless the token matches the existing lock.
 | 
|
174  | 
        :returns: a token if this instance supports tokens, otherwise None.
 | 
|
175  | 
        :raises TokenLockingNotSupported: when a token is given but this
 | 
|
176  | 
            instance doesn't support using token locks.
 | 
|
177  | 
        :raises MismatchedToken: if the specified token doesn't match the token
 | 
|
178  | 
            of the existing lock.
 | 
|
| 
2018.5.145
by Andrew Bennetts
 Add a brief explanation of what tokens are used for to lock_write docstrings.  | 
179  | 
|
180  | 
        A token should be passed in if you know that you have locked the object
 | 
|
181  | 
        some other way, and need to synchronise this object's state with that
 | 
|
182  | 
        fact.
 | 
|
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
183  | 
        """
 | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
184  | 
        # TODO: Upgrade locking to support using a Transport,
 | 
185  | 
        # and potentially a remote locking protocol
 | 
|
186  | 
if self._lock_mode:  | 
|
| 
1594.2.22
by Robert Collins
 Ensure that lockable files calls finish() on transactions.:  | 
187  | 
if self._lock_mode != 'w' or not self.get_transaction().writeable():  | 
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
188  | 
raise errors.ReadOnlyError(self)  | 
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
189  | 
self._lock.validate_token(token)  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
190  | 
self._lock_warner.lock_count += 1  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
191  | 
return self._token_from_lock  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
192  | 
else:  | 
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
193  | 
token_from_lock = self._lock.lock_write(token=token)  | 
| 
1185.80.2
by John Arbash Meinel
 Traced double locking code to WorkingTree creating its own control files.  | 
194  | 
            #traceback.print_stack()
 | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
195  | 
self._lock_mode = 'w'  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
196  | 
self._lock_warner.lock_count = 1  | 
| 
4145.1.2
by Robert Collins
 Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.  | 
197  | 
self._set_write_transaction()  | 
| 
2018.14.1
by Andrew Bennetts
 Update to current hpss branch? Fix lots of test failures.  | 
198  | 
self._token_from_lock = token_from_lock  | 
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
199  | 
return token_from_lock  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
200  | 
|
201  | 
def lock_read(self):  | 
|
202  | 
if self._lock_mode:  | 
|
| 
3376.2.4
by Martin Pool
 Remove every assert statement from bzrlib!  | 
203  | 
if self._lock_mode not in ('r', 'w'):  | 
204  | 
raise ValueError("invalid lock mode %r" % (self._lock_mode,))  | 
|
| 
4041.1.5
by Michael Hudson
 review comments  | 
205  | 
self._lock_warner.lock_count += 1  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
206  | 
else:  | 
| 
1553.5.47
by Martin Pool
 cleanup LockableFiles  | 
207  | 
self._lock.lock_read()  | 
| 
1185.80.2
by John Arbash Meinel
 Traced double locking code to WorkingTree creating its own control files.  | 
208  | 
            #traceback.print_stack()
 | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
209  | 
self._lock_mode = 'r'  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
210  | 
self._lock_warner.lock_count = 1  | 
| 
4145.1.2
by Robert Collins
 Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances.  | 
211  | 
self._set_read_transaction()  | 
212  | 
||
213  | 
def _set_read_transaction(self):  | 
|
214  | 
"""Setup a read transaction."""  | 
|
215  | 
self._set_transaction(transactions.ReadOnlyTransaction())  | 
|
216  | 
        # 5K may be excessive, but hey, its a knob.
 | 
|
217  | 
self.get_transaction().set_cache_size(5000)  | 
|
218  | 
||
219  | 
def _set_write_transaction(self):  | 
|
220  | 
"""Setup a write transaction."""  | 
|
221  | 
self._set_transaction(transactions.WriteTransaction())  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
222  | 
|
| 
4634.85.9
by Andrew Bennetts
 Add some experimental decorators: @only_raises(..) and @cleanup_method.  | 
223  | 
@only_raises(errors.LockNotHeld, errors.LockBroken)  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
224  | 
def unlock(self):  | 
225  | 
if not self._lock_mode:  | 
|
| 
4509.3.25
by Martin Pool
 Add an option for unlock errors to be non-fatal  | 
226  | 
return lock.cant_unlock_not_held(self)  | 
| 
4041.1.5
by Michael Hudson
 review comments  | 
227  | 
if self._lock_warner.lock_count > 1:  | 
228  | 
self._lock_warner.lock_count -= 1  | 
|
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
229  | 
else:  | 
| 
1185.80.2
by John Arbash Meinel
 Traced double locking code to WorkingTree creating its own control files.  | 
230  | 
            #traceback.print_stack()
 | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
231  | 
self._finish_transaction()  | 
| 
1687.1.6
by Robert Collins
 Extend LockableFiles to support break_lock() calls.  | 
232  | 
try:  | 
233  | 
self._lock.unlock()  | 
|
234  | 
finally:  | 
|
| 
4041.1.5
by Michael Hudson
 review comments  | 
235  | 
self._lock_mode = self._lock_warner.lock_count = None  | 
| 
4104.4.1
by Robert Collins
 Cherrypick bugfixes from bzr.dev for 1.13:  | 
236  | 
|
| 
4041.1.3
by Michael Hudson
 _this_ works  | 
237  | 
    @property
 | 
238  | 
def _lock_count(self):  | 
|
| 
4041.1.5
by Michael Hudson
 review comments  | 
239  | 
return self._lock_warner.lock_count  | 
| 
4041.1.3
by Michael Hudson
 _this_ works  | 
240  | 
|
| 
1553.5.35
by Martin Pool
 Start break-lock --show  | 
241  | 
def is_locked(self):  | 
242  | 
"""Return true if this LockableFiles group is locked"""  | 
|
| 
4041.1.5
by Michael Hudson
 review comments  | 
243  | 
return self._lock_warner.lock_count >= 1  | 
| 
1553.5.35
by Martin Pool
 Start break-lock --show  | 
244  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
245  | 
def get_physical_lock_status(self):  | 
246  | 
"""Return physical lock status.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
247  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
248  | 
        Returns true if a lock is held on the transport. If no lock is held, or
 | 
249  | 
        the underlying locking mechanism does not support querying lock
 | 
|
250  | 
        status, false is returned.
 | 
|
251  | 
        """
 | 
|
252  | 
try:  | 
|
253  | 
return self._lock.peek() is not None  | 
|
254  | 
except NotImplementedError:  | 
|
255  | 
return False  | 
|
256  | 
||
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
257  | 
def get_transaction(self):  | 
258  | 
"""Return the current active transaction.  | 
|
259  | 
||
260  | 
        If no transaction is active, this returns a passthrough object
 | 
|
261  | 
        for which all data is immediately flushed and no caching happens.
 | 
|
262  | 
        """
 | 
|
263  | 
if self._transaction is None:  | 
|
264  | 
return transactions.PassThroughTransaction()  | 
|
265  | 
else:  | 
|
266  | 
return self._transaction  | 
|
267  | 
||
268  | 
def _set_transaction(self, new_transaction):  | 
|
269  | 
"""Set a new active transaction."""  | 
|
270  | 
if self._transaction is not None:  | 
|
271  | 
raise errors.LockError('Branch %s is in a transaction already.' %  | 
|
272  | 
self)  | 
|
273  | 
self._transaction = new_transaction  | 
|
274  | 
||
275  | 
def _finish_transaction(self):  | 
|
276  | 
"""Exit the current transaction."""  | 
|
277  | 
if self._transaction is None:  | 
|
278  | 
raise errors.LockError('Branch %s is not in a transaction' %  | 
|
279  | 
self)  | 
|
280  | 
transaction = self._transaction  | 
|
281  | 
self._transaction = None  | 
|
282  | 
transaction.finish()  | 
|
| 
1553.5.40
by Martin Pool
 Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.  | 
283  | 
|
284  | 
||
| 
1553.5.45
by Martin Pool
 Clean up Transport-based locks for old branches  | 
285  | 
class TransportLock(object):  | 
286  | 
"""Locking method which uses transport-dependent locks.  | 
|
287  | 
||
288  | 
    On the local filesystem these transform into OS-managed locks.
 | 
|
289  | 
||
290  | 
    These do not guard against concurrent access via different
 | 
|
291  | 
    transports.
 | 
|
292  | 
||
293  | 
    This is suitable for use only in WorkingTrees (which are at present
 | 
|
294  | 
    always local).
 | 
|
| 
1553.5.40
by Martin Pool
 Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.  | 
295  | 
    """
 | 
| 
1553.5.59
by Martin Pool
 Pass file/mode bits through to creation of lock files/dirs  | 
296  | 
def __init__(self, transport, escaped_name, file_modebits, dir_modebits):  | 
| 
1553.5.40
by Martin Pool
 Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.  | 
297  | 
self._transport = transport  | 
298  | 
self._escaped_name = escaped_name  | 
|
| 
1553.5.59
by Martin Pool
 Pass file/mode bits through to creation of lock files/dirs  | 
299  | 
self._file_modebits = file_modebits  | 
300  | 
self._dir_modebits = dir_modebits  | 
|
| 
1553.5.40
by Martin Pool
 Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.  | 
301  | 
|
| 
1687.1.6
by Robert Collins
 Extend LockableFiles to support break_lock() calls.  | 
302  | 
def break_lock(self):  | 
303  | 
raise NotImplementedError(self.break_lock)  | 
|
304  | 
||
| 
2018.5.75
by Andrew Bennetts
 Add Repository.{dont_,}leave_lock_in_place.  | 
305  | 
def leave_in_place(self):  | 
306  | 
raise NotImplementedError(self.leave_in_place)  | 
|
307  | 
||
| 
2018.5.76
by Andrew Bennetts
 Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.  | 
308  | 
def dont_leave_in_place(self):  | 
309  | 
raise NotImplementedError(self.dont_leave_in_place)  | 
|
310  | 
||
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
311  | 
def lock_write(self, token=None):  | 
312  | 
if token is not None:  | 
|
313  | 
raise errors.TokenLockingNotSupported(self)  | 
|
| 
1553.5.40
by Martin Pool
 Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.  | 
314  | 
self._lock = self._transport.lock_write(self._escaped_name)  | 
315  | 
||
316  | 
def lock_read(self):  | 
|
317  | 
self._lock = self._transport.lock_read(self._escaped_name)  | 
|
318  | 
||
319  | 
def unlock(self):  | 
|
320  | 
self._lock.unlock()  | 
|
321  | 
self._lock = None  | 
|
322  | 
||
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
323  | 
def peek(self):  | 
324  | 
raise NotImplementedError()  | 
|
325  | 
||
| 
1666.1.4
by Robert Collins
 * 'Metadir' is now the default disk format. This improves behaviour in  | 
326  | 
def create(self, mode=None):  | 
| 
1553.5.59
by Martin Pool
 Pass file/mode bits through to creation of lock files/dirs  | 
327  | 
"""Create lock mechanism"""  | 
328  | 
        # for old-style locks, create the file now
 | 
|
| 
1955.3.8
by John Arbash Meinel
 avoid some deprecation warnings in other parts of the code  | 
329  | 
self._transport.put_bytes(self._escaped_name, '',  | 
| 
1553.5.60
by Martin Pool
 New LockableFiles.create_lock() method  | 
330  | 
mode=self._file_modebits)  | 
| 
2279.7.1
by Andrew Bennetts
 ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that  | 
331  | 
|
332  | 
def validate_token(self, token):  | 
|
333  | 
if token is not None:  | 
|
334  | 
raise errors.TokenLockingNotSupported(self)  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
335  |