~bzr-pqm/bzr/bzr.dev

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