##// END OF EJS Templates
with: use context manager for wlock in copy
Bryan O'Sullivan -
r27812:28d0c0ef default
parent child Browse files
Show More
@@ -1483,15 +1483,12 b' class workingctx(committablectx):'
1483 self._repo.ui.warn(_("copy failed: %s is not a file or a "
1483 self._repo.ui.warn(_("copy failed: %s is not a file or a "
1484 "symbolic link\n") % dest)
1484 "symbolic link\n") % dest)
1485 else:
1485 else:
1486 wlock = self._repo.wlock()
1486 with self._repo.wlock():
1487 try:
1488 if self._repo.dirstate[dest] in '?':
1487 if self._repo.dirstate[dest] in '?':
1489 self._repo.dirstate.add(dest)
1488 self._repo.dirstate.add(dest)
1490 elif self._repo.dirstate[dest] in 'r':
1489 elif self._repo.dirstate[dest] in 'r':
1491 self._repo.dirstate.normallookup(dest)
1490 self._repo.dirstate.normallookup(dest)
1492 self._repo.dirstate.copy(source, dest)
1491 self._repo.dirstate.copy(source, dest)
1493 finally:
1494 wlock.release()
1495
1492
1496 def match(self, pats=[], include=None, exclude=None, default='glob',
1493 def match(self, pats=[], include=None, exclude=None, default='glob',
1497 listsubrepos=False, badfn=None):
1494 listsubrepos=False, badfn=None):
General Comments 0
You need to be logged in to leave comments. Login now