/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: Andrew Bennetts
  • Date: 2007-02-28 07:08:25 UTC
  • mfrom: (2018.13.1 hpss)
  • mto: (2018.5.80 hpss)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: andrew.bennetts@canonical.com-20070228070825-q2dvkjb0a11ouhtx
Update to current hpss branch?  Fix lots of test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockable_files.py
240
240
                raise errors.ReadOnlyError(self)
241
241
            self._lock.validate_token(token)
242
242
            self._lock_count += 1
243
 
            return token
 
243
            return self._token_from_lock
244
244
        else:
245
245
            token_from_lock = self._lock.lock_write(token=token)
246
246
            #note('write locking %s', self)
248
248
            self._lock_mode = 'w'
249
249
            self._lock_count = 1
250
250
            self._set_transaction(transactions.WriteTransaction())
 
251
            # XXX: add test for the case that requires self._token_from_lock:
 
252
            # token = x.lock_write(); assert(x.lock_write() == token)
 
253
            self._token_from_lock = token_from_lock
251
254
            return token_from_lock
252
255
 
253
256
    def lock_read(self):