~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
196
196
        self._transport.put_file(self._escape(path), file, mode=self._file_mode)
197
197
 
198
198
    @needs_write_lock
 
199
    def put_bytes(self, path, a_string):
 
200
        """Write a string of bytes.
 
201
 
 
202
        :param path: The path to put the bytes, relative to the transport root.
 
203
        :param string: A string object, whose exact bytes are to be copied.
 
204
        """
 
205
        self._transport.put_bytes(self._escape(path), a_string,
 
206
                                  mode=self._file_mode)
 
207
 
 
208
    @needs_write_lock
199
209
    def put_utf8(self, path, a_string):
200
210
        """Write a string, encoding as utf-8.
201
211
 
202
212
        :param path: The path to put the string, relative to the transport root.
203
 
        :param string: A file-like or string object whose contents should be copied.
 
213
        :param string: A string or unicode object whose contents should be copied.
204
214
        """
205
215
        # IterableFile would not be needed if Transport.put took iterables
206
216
        # instead of files.  ADHB 2005-12-25
210
220
        # these are valuable files which should have exact contents.
211
221
        if not isinstance(a_string, basestring):
212
222
            raise errors.BzrBadParameterNotString(a_string)
213
 
        self.put(path, StringIO(a_string.encode('utf-8')))
214
 
 
215
 
    def lock_write(self):
 
223
        self.put_bytes(path, a_string.encode('utf-8'))
 
224
 
 
225
    def leave_in_place(self):
 
226
        """Set this LockableFiles to not clear the physical lock on unlock."""
 
227
        self._lock.leave_in_place()
 
228
 
 
229
    def dont_leave_in_place(self):
 
230
        """Set this LockableFiles to clear the physical lock on unlock."""
 
231
        self._lock.dont_leave_in_place()
 
232
 
 
233
    def lock_write(self, token=None):
 
234
        """Lock this group of files for writing.
 
235
        
 
236
        :param token: if this is already locked, then lock_write will fail
 
237
            unless the token matches the existing lock.
 
238
        :returns: a token if this instance supports tokens, otherwise None.
 
239
        :raises TokenLockingNotSupported: when a token is given but this
 
240
            instance doesn't support using token locks.
 
241
        :raises MismatchedToken: if the specified token doesn't match the token
 
242
            of the existing lock.
 
243
 
 
244
        A token should be passed in if you know that you have locked the object
 
245
        some other way, and need to synchronise this object's state with that
 
246
        fact.
 
247
        """
216
248
        # mutter("lock write: %s (%s)", self, self._lock_count)
217
249
        # TODO: Upgrade locking to support using a Transport,
218
250
        # and potentially a remote locking protocol
219
251
        if self._lock_mode:
220
252
            if self._lock_mode != 'w' or not self.get_transaction().writeable():
221
253
                raise errors.ReadOnlyError(self)
 
254
            self._lock.validate_token(token)
222
255
            self._lock_count += 1
 
256
            return self._token_from_lock
223
257
        else:
224
 
            self._lock.lock_write()
 
258
            token_from_lock = self._lock.lock_write(token=token)
225
259
            #note('write locking %s', self)
226
260
            #traceback.print_stack()
227
261
            self._lock_mode = 'w'
228
262
            self._lock_count = 1
229
263
            self._set_transaction(transactions.WriteTransaction())
 
264
            self._token_from_lock = token_from_lock
 
265
            return token_from_lock
230
266
 
231
267
    def lock_read(self):
232
268
        # mutter("lock read: %s (%s)", self, self._lock_count)
323
359
    def break_lock(self):
324
360
        raise NotImplementedError(self.break_lock)
325
361
 
326
 
    def lock_write(self):
 
362
    def leave_in_place(self):
 
363
        raise NotImplementedError(self.leave_in_place)
 
364
 
 
365
    def dont_leave_in_place(self):
 
366
        raise NotImplementedError(self.dont_leave_in_place)
 
367
 
 
368
    def lock_write(self, token=None):
 
369
        if token is not None:
 
370
            raise errors.TokenLockingNotSupported(self)
327
371
        self._lock = self._transport.lock_write(self._escaped_name)
328
372
 
329
373
    def lock_read(self):
341
385
        # for old-style locks, create the file now
342
386
        self._transport.put_bytes(self._escaped_name, '',
343
387
                            mode=self._file_modebits)
 
388
 
 
389
    def validate_token(self, token):
 
390
        if token is not None:
 
391
            raise errors.TokenLockingNotSupported(self)
 
392