Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/context.py @ 21992:6be1e1dbe6a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Aug 2014 14:32:34 -0500
parents 7e871e771300 48e32c2c499b
children ef0ee0c001bf
comparison
equal deleted inserted replaced
21989:bdb6d97f0a04 21992:6be1e1dbe6a0
1345 # update dirstate for files that are actually clean 1345 # update dirstate for files that are actually clean
1346 if fixup: 1346 if fixup:
1347 try: 1347 try:
1348 # updating the dirstate is optional 1348 # updating the dirstate is optional
1349 # so we don't wait on the lock 1349 # so we don't wait on the lock
1350 # wlock can invalidate the dirstate, so cache normal _after_
1351 # taking the lock
1352 wlock = self._repo.wlock(False)
1350 normal = self._repo.dirstate.normal 1353 normal = self._repo.dirstate.normal
1351 wlock = self._repo.wlock(False)
1352 try: 1354 try:
1353 for f in fixup: 1355 for f in fixup:
1354 normal(f) 1356 normal(f)
1355 finally: 1357 finally:
1356 wlock.release() 1358 wlock.release()