/brz/remove-bazaar

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