--- a/mercurial/lock.py Tue Sep 22 13:25:41 2015 -0700
+++ b/mercurial/lock.py Tue Sep 22 14:09:42 2015 -0700
@@ -38,16 +38,20 @@
_host = None
- def __init__(self, vfs, file, timeout=-1, releasefn=None, desc=None):
+ def __init__(self, vfs, file, timeout=-1, releasefn=None, acquirefn=None,
+ desc=None):
self.vfs = vfs
self.f = file
self.held = 0
self.timeout = timeout
self.releasefn = releasefn
+ self.acquirefn = acquirefn
self.desc = desc
self.postrelease = []
self.pid = os.getpid()
self.delay = self.lock()
+ if self.acquirefn:
+ self.acquirefn()
def __del__(self):
if self.held: