~bzr-pqm/bzr/bzr.dev

1553.5.28 by Martin Pool
[merge] from bzr.dev before integration
1
# Copyright (C) 2005, 2006 Canonical Ltd
1185.65.22 by Robert Collins
lockable_files was extracted from branch.py - give it a copyright statement
2
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.
7
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.
12
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.65.29 by Robert Collins
Implement final review suggestions.
17
from cStringIO import StringIO
18
import codecs
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
19
#import traceback
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
20
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
21
import bzrlib
1185.65.27 by Robert Collins
Tweak storage towards mergability.
22
from bzrlib.decorators import *
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
23
import bzrlib.errors as errors
1185.67.4 by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock
24
from bzrlib.errors import LockError, ReadOnlyError
1185.65.27 by Robert Collins
Tweak storage towards mergability.
25
from bzrlib.osutils import file_iterator, safe_unicode
1185.65.29 by Robert Collins
Implement final review suggestions.
26
from bzrlib.symbol_versioning import *
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
27
from bzrlib.trace import mutter, note
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
28
import bzrlib.transactions as transactions
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
29
1553.5.41 by Martin Pool
Add new LockableFiles.LockDirStrategy; not used yet
30
# XXX: The tracking here of lock counts and whether the lock is held is
31
# somewhat redundant with what's done in LockDir; the main difference is that
32
# LockableFiles permits reentrancy.
1185.65.27 by Robert Collins
Tweak storage towards mergability.
33
1185.66.3 by Aaron Bentley
Renamed ControlFiles to LockableFiles
34
class LockableFiles(object):
1553.5.38 by Martin Pool
More explanation for LockableFiles
35
    """Object representing a set of related files locked within the same scope.
36
37
    These files are used by a WorkingTree, Repository or Branch, and should
38
    generally only be touched by that object.
39
40
    LockableFiles also provides some policy on top of Transport for encoding
41
    control files as utf-8.
42
1553.5.39 by Martin Pool
More lock docs
43
    LockableFiles manage a lock count and can be locked repeatedly by
44
    a single caller.  (The underlying lock implementation generally does not
45
    support this.)
46
1553.5.38 by Martin Pool
More explanation for LockableFiles
47
    Instances of this class are often called control_files.
48
    
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
49
    This object builds on top of a Transport, which is used to actually write
50
    the files to disk, and an OSLock or LockDir, which controls how access to
51
    the files is controlled.  The particular type of locking used is set when
52
    the object is constructed.  In older formats OSLocks are used everywhere.
53
    in newer formats a LockDir is used for Repositories and Branches, and 
54
    OSLocks for the local filesystem.
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
55
    """
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
56
1553.5.47 by Martin Pool
cleanup LockableFiles
57
    # _lock_mode: None, or 'r' or 'w'
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
58
1553.5.47 by Martin Pool
cleanup LockableFiles
59
    # _lock_count: If _lock_mode is true, a positive count of the number of
60
    # times the lock has been taken *by this process*.   
61
    
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
62
    # If set to False (by a plugin, etc) BzrBranch will not set the
63
    # mode on created files or directories
64
    _set_file_mode = True
65
    _set_dir_mode = True
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
66
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
67
    def __init__(self, transport, lock_name, lock_class):
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
68
        """Create a LockableFiles group
69
70
        :param transport: Transport pointing to the directory holding the 
71
            control files and lock.
72
        :param lock_name: Name of the lock guarding these files.
1553.5.47 by Martin Pool
cleanup LockableFiles
73
        :param lock_class: Class of lock strategy to use: typically
74
            either LockDir or TransportLock.
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
75
        """
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
76
        object.__init__(self)
77
        self._transport = transport
78
        self.lock_name = lock_name
79
        self._transaction = None
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
80
        self._find_modes()
1553.5.47 by Martin Pool
cleanup LockableFiles
81
        self._lock_mode = None
82
        self._lock_count = 0
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
83
        esc_name = self._escape(lock_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
84
        self._lock = lock_class(transport, esc_name,
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
85
                                file_modebits=self._file_mode,
86
                                dir_modebits=self._dir_mode)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
87
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
88
    def create_lock(self):
89
        """Create the lock.
90
91
        This should normally be called only when the LockableFiles directory
92
        is first created on disk.
93
        """
94
        self._lock.create()
95
1553.5.53 by Martin Pool
Add LockableFiles __repr__
96
    def __repr__(self):
97
        return '%s(%r)' % (self.__class__.__name__,
98
                           self._transport)
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
99
    def __str__(self):
100
        return 'LockableFiles(%s, %s)' % (self.lock_name, self._transport.base)
101
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
102
    def __del__(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
103
        if self.is_locked():
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
104
            # XXX: This should show something every time, and be suitable for
105
            # headless operation and embedding
1185.67.9 by Aaron Bentley
Fixed most bugs
106
            from warnings import warn
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
107
            warn("file group %r was not explicitly unlocked" % self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
108
            self._lock.unlock()
1553.5.53 by Martin Pool
Add LockableFiles __repr__
109
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
110
    def _escape(self, file_or_path):
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
111
        if not isinstance(file_or_path, basestring):
112
            file_or_path = '/'.join(file_or_path)
113
        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
114
            return u''
1185.65.27 by Robert Collins
Tweak storage towards mergability.
115
        return bzrlib.transport.urlescape(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
116
117
    def _find_modes(self):
118
        """Determine the appropriate modes for files and directories."""
119
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
120
            st = self._transport.stat('.')
121
        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
122
            self._dir_mode = 0755
123
            self._file_mode = 0644
124
        else:
125
            self._dir_mode = st.st_mode & 07777
126
            # Remove the sticky and execute bits for files
127
            self._file_mode = self._dir_mode & ~07111
128
        if not self._set_dir_mode:
129
            self._dir_mode = None
130
        if not self._set_file_mode:
131
            self._file_mode = None
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
132
133
    def controlfilename(self, file_or_path):
134
        """Return location relative to branch."""
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
135
        return self._transport.abspath(self._escape(file_or_path))
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
136
1534.1.15 by Robert Collins
* The internal storage of history, and logical branch identity have now
137
    @deprecated_method(zero_eight)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
138
    def controlfile(self, file_or_path, mode='r'):
139
        """Open a control file for this branch.
140
1185.65.27 by Robert Collins
Tweak storage towards mergability.
141
        There are two classes of file in a lockable directory: text
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
142
        and binary.  binary files are untranslated byte streams.  Text
143
        control files are stored with Unix newlines and in UTF-8, even
144
        if the platform or locale defaults are different.
145
1185.65.27 by Robert Collins
Tweak storage towards mergability.
146
        Such files are not openable in write mode : they are managed via
147
        put and put_utf8 which atomically replace old versions using
148
        atomicfile.
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
149
        """
150
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
151
        relpath = self._escape(file_or_path)
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
152
        # TODO: codecs.open() buffers linewise, so it was overloaded with
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
153
        # a much larger buffer, do we need to do the same for getreader/getwriter?
154
        if mode == 'rb': 
1185.65.29 by Robert Collins
Implement final review suggestions.
155
            return self.get(relpath)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
156
        elif mode == 'wb':
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
157
            raise BzrError("Branch.controlfile(mode='wb') is not supported, use put[_utf8]")
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
158
        elif mode == 'r':
1185.65.29 by Robert Collins
Implement final review suggestions.
159
            return self.get_utf8(relpath)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
160
        elif mode == 'w':
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
161
            raise BzrError("Branch.controlfile(mode='w') is not supported, use put[_utf8]")
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
162
        else:
163
            raise BzrError("invalid controlfile mode %r" % mode)
164
1185.65.29 by Robert Collins
Implement final review suggestions.
165
    @needs_read_lock
166
    def get(self, relpath):
167
        """Get a file as a bytestream."""
168
        relpath = self._escape(relpath)
169
        return self._transport.get(relpath)
170
171
    @needs_read_lock
172
    def get_utf8(self, relpath):
173
        """Get a file as a unicode stream."""
174
        relpath = self._escape(relpath)
175
        # DO NOT introduce an errors=replace here.
176
        return codecs.getreader('utf-8')(self._transport.get(relpath))
177
1185.65.27 by Robert Collins
Tweak storage towards mergability.
178
    @needs_write_lock
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
179
    def put(self, path, file):
180
        """Write a file.
181
        
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
182
        :param path: The path to put the file, relative to the .bzr control
183
                     directory
184
        :param f: A file-like or string object whose contents should be copied.
185
        """
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
186
        self._transport.put(self._escape(path), file, mode=self._file_mode)
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
187
1185.65.27 by Robert Collins
Tweak storage towards mergability.
188
    @needs_write_lock
1185.65.29 by Robert Collins
Implement final review suggestions.
189
    def put_utf8(self, path, a_string):
190
        """Write a string, encoding as utf-8.
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
191
1185.65.29 by Robert Collins
Implement final review suggestions.
192
        :param path: The path to put the string, relative to the transport root.
193
        :param string: A file-like or string object whose contents should be copied.
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
194
        """
1185.67.7 by Aaron Bentley
Refactored a bit
195
        # IterableFile would not be needed if Transport.put took iterables
196
        # instead of files.  ADHB 2005-12-25
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
197
        # RBC 20060103 surely its not needed anyway, with codecs transcode
198
        # file support ?
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
199
        # JAM 20060103 We definitely don't want encode(..., 'replace')
200
        # these are valuable files which should have exact contents.
1185.65.29 by Robert Collins
Implement final review suggestions.
201
        if not isinstance(a_string, basestring):
202
            raise errors.BzrBadParameterNotString(a_string)
203
        self.put(path, StringIO(a_string.encode('utf-8')))
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
204
205
    def lock_write(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
206
        # mutter("lock write: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
207
        # TODO: Upgrade locking to support using a Transport,
208
        # and potentially a remote locking protocol
209
        if self._lock_mode:
1594.2.22 by Robert Collins
Ensure that lockable files calls finish() on transactions.:
210
            if self._lock_mode != 'w' or not self.get_transaction().writeable():
1553.5.33 by Martin Pool
LockDir review comment fixes
211
                raise ReadOnlyError(self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
212
            self._lock_count += 1
213
        else:
1553.5.47 by Martin Pool
cleanup LockableFiles
214
            self._lock.lock_write()
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
215
            #note('write locking %s', self)
216
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
217
            self._lock_mode = 'w'
218
            self._lock_count = 1
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
219
            self._set_transaction(transactions.WriteTransaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
220
221
    def lock_read(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
222
        # mutter("lock read: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
223
        if self._lock_mode:
224
            assert self._lock_mode in ('r', 'w'), \
225
                   "invalid lock mode %r" % self._lock_mode
226
            self._lock_count += 1
227
        else:
1553.5.47 by Martin Pool
cleanup LockableFiles
228
            self._lock.lock_read()
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
229
            #note('read locking %s', self)
230
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
231
            self._lock_mode = 'r'
232
            self._lock_count = 1
233
            self._set_transaction(transactions.ReadOnlyTransaction())
234
            # 5K may be excessive, but hey, its a knob.
235
            self.get_transaction().set_cache_size(5000)
236
                        
237
    def unlock(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
238
        # mutter("unlock: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
239
        if not self._lock_mode:
1553.5.36 by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked
240
            raise errors.LockNotHeld(self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
241
        if self._lock_count > 1:
242
            self._lock_count -= 1
243
        else:
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
244
            #note('unlocking %s', self)
245
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
246
            self._finish_transaction()
1553.5.47 by Martin Pool
cleanup LockableFiles
247
            self._lock.unlock()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
248
            self._lock_mode = self._lock_count = None
249
1553.5.35 by Martin Pool
Start break-lock --show
250
    def is_locked(self):
251
        """Return true if this LockableFiles group is locked"""
252
        return self._lock_count >= 1
253
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
254
    def get_transaction(self):
255
        """Return the current active transaction.
256
257
        If no transaction is active, this returns a passthrough object
258
        for which all data is immediately flushed and no caching happens.
259
        """
260
        if self._transaction is None:
261
            return transactions.PassThroughTransaction()
262
        else:
263
            return self._transaction
264
265
    def _set_transaction(self, new_transaction):
266
        """Set a new active transaction."""
267
        if self._transaction is not None:
268
            raise errors.LockError('Branch %s is in a transaction already.' %
269
                                   self)
270
        self._transaction = new_transaction
271
272
    def _finish_transaction(self):
273
        """Exit the current transaction."""
274
        if self._transaction is None:
275
            raise errors.LockError('Branch %s is not in a transaction' %
276
                                   self)
277
        transaction = self._transaction
278
        self._transaction = None
279
        transaction.finish()
1553.5.40 by Martin Pool
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
280
281
1553.5.45 by Martin Pool
Clean up Transport-based locks for old branches
282
class TransportLock(object):
283
    """Locking method which uses transport-dependent locks.
284
285
    On the local filesystem these transform into OS-managed locks.
286
287
    These do not guard against concurrent access via different
288
    transports.
289
290
    This is suitable for use only in WorkingTrees (which are at present
291
    always local).
1553.5.40 by Martin Pool
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
292
    """
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
293
    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.
294
        self._transport = transport
295
        self._escaped_name = escaped_name
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
296
        self._file_modebits = file_modebits
297
        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.
298
299
    def lock_write(self):
300
        self._lock = self._transport.lock_write(self._escaped_name)
301
302
    def lock_read(self):
303
        self._lock = self._transport.lock_read(self._escaped_name)
304
305
    def unlock(self):
306
        self._lock.unlock()
307
        self._lock = None
308
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
309
    def create(self):
310
        """Create lock mechanism"""
311
        # for old-style locks, create the file now
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
312
        self._transport.put(self._escaped_name, StringIO(), 
313
                            mode=self._file_modebits)