Show More
@@ -1211,10 +1211,15 b' class localrepository(object):' | |||||
1211 | continue |
|
1211 | continue | |
1212 | ce.refresh() |
|
1212 | ce.refresh() | |
1213 |
|
1213 | |||
1214 |
def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc |
|
1214 | def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc, | |
|
1215 | parentenvvar=None): | |||
|
1216 | parentlock = None | |||
|
1217 | if parentenvvar is not None: | |||
|
1218 | parentlock = os.environ.get(parentenvvar) | |||
1215 | try: |
|
1219 | try: | |
1216 | l = lockmod.lock(vfs, lockname, 0, releasefn=releasefn, |
|
1220 | l = lockmod.lock(vfs, lockname, 0, releasefn=releasefn, | |
1217 |
acquirefn=acquirefn, desc=desc |
|
1221 | acquirefn=acquirefn, desc=desc, | |
|
1222 | parentlock=parentlock) | |||
1218 | except error.LockHeld as inst: |
|
1223 | except error.LockHeld as inst: | |
1219 | if not wait: |
|
1224 | if not wait: | |
1220 | raise |
|
1225 | raise |
General Comments 0
You need to be logged in to leave comments.
Login now