← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

Polish on lock hooks to be easier to use.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
325
325
                self.transport.delete_tree(tmpname)
326
326
            self._trace("... unlock succeeded after %dms",
327
327
                    (time.time() - start_time) * 1000)
328
 
            result = lock.LockResult(self, old_nonce)
 
328
            result = lock.LockResult(self.transport.abspath(self.path),
 
329
                old_nonce)
329
330
            for hook in lock.hooks['released']:
330
331
                hook(result)
331
332
 
461
462
        if self._fake_read_lock:
462
463
            raise LockContention(self)
463
464
        result = self._attempt_lock()
464
 
        hook_result = lock.LockResult(self, result)
 
465
        hook_result = lock.LockResult(self.transport.abspath(self.path),
 
466
                self.nonce)
465
467
        for hook in lock.hooks['acquired']:
466
468
            hook(hook_result)
467
469
        return result