/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
1694.2.6 by Martin Pool
[merge] bzr.dev
24
from bzrlib.errors import BzrError
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
        self._transport = transport
77
        self.lock_name = lock_name
78
        self._transaction = None
1553.5.47 by Martin Pool
cleanup LockableFiles
79
        self._lock_mode = None
80
        self._lock_count = 0
1728.2.2 by Martin Pool
Fix up LockableFiles._lock_count initializer
81
        self._find_modes()
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
82
        esc_name = self._escape(lock_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
83
        self._lock = lock_class(transport, esc_name,
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
84
                                file_modebits=self._file_mode,
85
                                dir_modebits=self._dir_mode)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
86
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
87
    def create_lock(self):
88
        """Create the lock.
89
90
        This should normally be called only when the LockableFiles directory
91
        is first created on disk.
92
        """
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
93
        self._lock.create(mode=self._dir_mode)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
94
1553.5.53 by Martin Pool
Add LockableFiles __repr__
95
    def __repr__(self):
96
        return '%s(%r)' % (self.__class__.__name__,
97
                           self._transport)
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
98
    def __str__(self):
99
        return 'LockableFiles(%s, %s)' % (self.lock_name, self._transport.base)
100
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
101
    def __del__(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
102
        if self.is_locked():
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
103
            # XXX: This should show something every time, and be suitable for
104
            # headless operation and embedding
1185.67.9 by Aaron Bentley
Fixed most bugs
105
            from warnings import warn
1185.65.10 by Robert Collins
Rename Controlfiles to LockableFiles.
106
            warn("file group %r was not explicitly unlocked" % self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
107
            self._lock.unlock()
1553.5.53 by Martin Pool
Add LockableFiles __repr__
108
1687.1.6 by Robert Collins
Extend LockableFiles to support break_lock() calls.
109
    def break_lock(self):
110
        """Break the lock of this lockable files group if it is held.
111
112
        The current ui factory will be used to prompt for user conformation.
113
        """
114
        self._lock.break_lock()
115
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
116
    def _escape(self, file_or_path):
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
117
        if not isinstance(file_or_path, basestring):
118
            file_or_path = '/'.join(file_or_path)
119
        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
120
            return u''
1185.65.27 by Robert Collins
Tweak storage towards mergability.
121
        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
122
123
    def _find_modes(self):
124
        """Determine the appropriate modes for files and directories."""
125
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
126
            st = self._transport.stat('.')
127
        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
128
            self._dir_mode = 0755
129
            self._file_mode = 0644
130
        else:
131
            self._dir_mode = st.st_mode & 07777
132
            # Remove the sticky and execute bits for files
133
            self._file_mode = self._dir_mode & ~07111
134
        if not self._set_dir_mode:
135
            self._dir_mode = None
136
        if not self._set_file_mode:
137
            self._file_mode = None
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
138
139
    def controlfilename(self, file_or_path):
140
        """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
141
        return self._transport.abspath(self._escape(file_or_path))
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
142
1534.1.15 by Robert Collins
* The internal storage of history, and logical branch identity have now
143
    @deprecated_method(zero_eight)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
144
    def controlfile(self, file_or_path, mode='r'):
145
        """Open a control file for this branch.
146
1185.65.27 by Robert Collins
Tweak storage towards mergability.
147
        There are two classes of file in a lockable directory: text
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
148
        and binary.  binary files are untranslated byte streams.  Text
149
        control files are stored with Unix newlines and in UTF-8, even
150
        if the platform or locale defaults are different.
151
1185.65.27 by Robert Collins
Tweak storage towards mergability.
152
        Such files are not openable in write mode : they are managed via
153
        put and put_utf8 which atomically replace old versions using
154
        atomicfile.
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
155
        """
156
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
157
        relpath = self._escape(file_or_path)
1553.5.43 by Martin Pool
Get LockableFiles tests running against LockDir
158
        # TODO: codecs.open() buffers linewise, so it was overloaded with
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
159
        # a much larger buffer, do we need to do the same for getreader/getwriter?
160
        if mode == 'rb': 
1185.65.29 by Robert Collins
Implement final review suggestions.
161
            return self.get(relpath)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
162
        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.
163
            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
164
        elif mode == 'r':
1185.65.29 by Robert Collins
Implement final review suggestions.
165
            return self.get_utf8(relpath)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
166
        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.
167
            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
168
        else:
169
            raise BzrError("invalid controlfile mode %r" % mode)
170
1185.65.29 by Robert Collins
Implement final review suggestions.
171
    @needs_read_lock
172
    def get(self, relpath):
173
        """Get a file as a bytestream."""
174
        relpath = self._escape(relpath)
175
        return self._transport.get(relpath)
176
177
    @needs_read_lock
178
    def get_utf8(self, relpath):
179
        """Get a file as a unicode stream."""
180
        relpath = self._escape(relpath)
181
        # DO NOT introduce an errors=replace here.
182
        return codecs.getreader('utf-8')(self._transport.get(relpath))
183
1185.65.27 by Robert Collins
Tweak storage towards mergability.
184
    @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.
185
    def put(self, path, file):
186
        """Write a file.
187
        
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
188
        :param path: The path to put the file, relative to the .bzr control
189
                     directory
190
        :param f: A file-like or string object whose contents should be copied.
191
        """
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
192
        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.
193
1185.65.27 by Robert Collins
Tweak storage towards mergability.
194
    @needs_write_lock
1185.65.29 by Robert Collins
Implement final review suggestions.
195
    def put_utf8(self, path, a_string):
196
        """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.
197
1185.65.29 by Robert Collins
Implement final review suggestions.
198
        :param path: The path to put the string, relative to the transport root.
199
        :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
200
        """
1185.67.7 by Aaron Bentley
Refactored a bit
201
        # IterableFile would not be needed if Transport.put took iterables
202
        # instead of files.  ADHB 2005-12-25
1185.65.17 by Robert Collins
Merge from integration, mode-changes are broken.
203
        # RBC 20060103 surely its not needed anyway, with codecs transcode
204
        # 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
205
        # JAM 20060103 We definitely don't want encode(..., 'replace')
206
        # these are valuable files which should have exact contents.
1185.65.29 by Robert Collins
Implement final review suggestions.
207
        if not isinstance(a_string, basestring):
208
            raise errors.BzrBadParameterNotString(a_string)
209
        self.put(path, StringIO(a_string.encode('utf-8')))
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
210
211
    def lock_write(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
212
        # mutter("lock write: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
213
        # TODO: Upgrade locking to support using a Transport,
214
        # and potentially a remote locking protocol
215
        if self._lock_mode:
1594.2.22 by Robert Collins
Ensure that lockable files calls finish() on transactions.:
216
            if self._lock_mode != 'w' or not self.get_transaction().writeable():
1694.2.6 by Martin Pool
[merge] bzr.dev
217
                raise errors.ReadOnlyError(self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
218
            self._lock_count += 1
219
        else:
1553.5.47 by Martin Pool
cleanup LockableFiles
220
            self._lock.lock_write()
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
221
            #note('write locking %s', self)
222
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
223
            self._lock_mode = 'w'
224
            self._lock_count = 1
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
225
            self._set_transaction(transactions.WriteTransaction())
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
226
227
    def lock_read(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
228
        # mutter("lock read: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
229
        if self._lock_mode:
230
            assert self._lock_mode in ('r', 'w'), \
231
                   "invalid lock mode %r" % self._lock_mode
232
            self._lock_count += 1
233
        else:
1553.5.47 by Martin Pool
cleanup LockableFiles
234
            self._lock.lock_read()
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
235
            #note('read locking %s', self)
236
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
237
            self._lock_mode = 'r'
238
            self._lock_count = 1
239
            self._set_transaction(transactions.ReadOnlyTransaction())
240
            # 5K may be excessive, but hey, its a knob.
241
            self.get_transaction().set_cache_size(5000)
242
                        
243
    def unlock(self):
1551.2.3 by Aaron Bentley
Removed lock-related log spam [recommit]
244
        # mutter("unlock: %s (%s)", self, self._lock_count)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
245
        if not self._lock_mode:
1553.5.36 by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked
246
            raise errors.LockNotHeld(self)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
247
        if self._lock_count > 1:
248
            self._lock_count -= 1
249
        else:
1185.80.2 by John Arbash Meinel
Traced double locking code to WorkingTree creating its own control files.
250
            #note('unlocking %s', self)
251
            #traceback.print_stack()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
252
            self._finish_transaction()
1687.1.6 by Robert Collins
Extend LockableFiles to support break_lock() calls.
253
            try:
254
                self._lock.unlock()
255
            finally:
256
                self._lock_mode = self._lock_count = None
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
257
1553.5.35 by Martin Pool
Start break-lock --show
258
    def is_locked(self):
259
        """Return true if this LockableFiles group is locked"""
260
        return self._lock_count >= 1
261
1694.2.6 by Martin Pool
[merge] bzr.dev
262
    def get_physical_lock_status(self):
263
        """Return physical lock status.
264
        
265
        Returns true if a lock is held on the transport. If no lock is held, or
266
        the underlying locking mechanism does not support querying lock
267
        status, false is returned.
268
        """
269
        try:
270
            return self._lock.peek() is not None
271
        except NotImplementedError:
272
            return False
273
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
274
    def get_transaction(self):
275
        """Return the current active transaction.
276
277
        If no transaction is active, this returns a passthrough object
278
        for which all data is immediately flushed and no caching happens.
279
        """
280
        if self._transaction is None:
281
            return transactions.PassThroughTransaction()
282
        else:
283
            return self._transaction
284
285
    def _set_transaction(self, new_transaction):
286
        """Set a new active transaction."""
287
        if self._transaction is not None:
288
            raise errors.LockError('Branch %s is in a transaction already.' %
289
                                   self)
290
        self._transaction = new_transaction
291
292
    def _finish_transaction(self):
293
        """Exit the current transaction."""
294
        if self._transaction is None:
295
            raise errors.LockError('Branch %s is not in a transaction' %
296
                                   self)
297
        transaction = self._transaction
298
        self._transaction = None
299
        transaction.finish()
1553.5.40 by Martin Pool
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
300
301
1553.5.45 by Martin Pool
Clean up Transport-based locks for old branches
302
class TransportLock(object):
303
    """Locking method which uses transport-dependent locks.
304
305
    On the local filesystem these transform into OS-managed locks.
306
307
    These do not guard against concurrent access via different
308
    transports.
309
310
    This is suitable for use only in WorkingTrees (which are at present
311
    always local).
1553.5.40 by Martin Pool
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
312
    """
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
313
    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.
314
        self._transport = transport
315
        self._escaped_name = escaped_name
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
316
        self._file_modebits = file_modebits
317
        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.
318
1687.1.6 by Robert Collins
Extend LockableFiles to support break_lock() calls.
319
    def break_lock(self):
320
        raise NotImplementedError(self.break_lock)
321
1553.5.40 by Martin Pool
Factor locking strategy out of LockableFiles so that we can use LockDirs in new formats.
322
    def lock_write(self):
323
        self._lock = self._transport.lock_write(self._escaped_name)
324
325
    def lock_read(self):
326
        self._lock = self._transport.lock_read(self._escaped_name)
327
328
    def unlock(self):
329
        self._lock.unlock()
330
        self._lock = None
331
1694.2.6 by Martin Pool
[merge] bzr.dev
332
    def peek(self):
333
        raise NotImplementedError()
334
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
335
    def create(self, mode=None):
1553.5.59 by Martin Pool
Pass file/mode bits through to creation of lock files/dirs
336
        """Create lock mechanism"""
337
        # for old-style locks, create the file now
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
338
        self._transport.put(self._escaped_name, StringIO(), 
339
                            mode=self._file_modebits)