##// END OF EJS Templates
localrepo: allow wlock to be inherited...
Siddharth Agarwal -
r26475:efd57cd6 default
parent child Browse files
Show More
@@ -1296,7 +1296,7 b' class localrepository(object):'
1296
1296
1297 l = self._lock(self.vfs, "wlock", wait, unlock,
1297 l = self._lock(self.vfs, "wlock", wait, unlock,
1298 self.invalidatedirstate, _('working directory of %s') %
1298 self.invalidatedirstate, _('working directory of %s') %
1299 self.origroot)
1299 self.origroot, parentenvvar='HG_WLOCK_LOCKER')
1300 self._wlockref = weakref.ref(l)
1300 self._wlockref = weakref.ref(l)
1301 return l
1301 return l
1302
1302
@@ -205,7 +205,7 b' Aborting lock does not prevent fncache w'
205 > from mercurial import commands, util
205 > from mercurial import commands, util
206 > from mercurial.extensions import wrapfunction
206 > from mercurial.extensions import wrapfunction
207 >
207 >
208 > def lockexception(orig, vfs, lockname, wait, releasefn, acquirefn, desc):
208 > def lockexception(orig, vfs, lockname, wait, releasefn, acquirefn, desc, parentenvvar=None):
209 > def releasewrap():
209 > def releasewrap():
210 > raise util.Abort("forced lock failure")
210 > raise util.Abort("forced lock failure")
211 > return orig(vfs, lockname, wait, releasewrap, acquirefn, desc)
211 > return orig(vfs, lockname, wait, releasewrap, acquirefn, desc)
General Comments 0
You need to be logged in to leave comments. Login now