mq: use dirstateguard instead of dirstate.invalidate (qpush)
Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as
a kind of "restore .hg/dirstate to the original status" during afailure.
But it just discards changes in memory, and doesn't actually restore
".hg/dirstate". Then, it can't work as expected, if "dirstate.write()"
is executed while processing.
This patch uses "dirstateguard" instead of "dirstate.invalidate()" to
restore ".hg/dirstate" at failure even if "dirstate.write()" is
executed before failure.
This is a part of preparations to fix the issue that the recent (in
memory) dirstate isn't visible to external processes (e.g. "precommit"
hook).
--- a/hgext/mq.py Thu May 07 12:07:11 2015 +0900
+++ b/hgext/mq.py Thu May 07 12:07:11 2015 +0900
@@ -807,9 +807,10 @@
def apply(self, repo, series, list=False, update_status=True,
strict=False, patchdir=None, merge=None, all_files=None,
tobackup=None, keepchanges=False):
- wlock = lock = tr = None
+ wlock = dsguard = lock = tr = None
try:
wlock = repo.wlock()
+ dsguard = cmdutil.dirstateguard(repo, 'mq.apply')
lock = repo.lock()
tr = repo.transaction("qpush")
try:
@@ -818,21 +819,22 @@
tobackup=tobackup, keepchanges=keepchanges)
tr.close()
self.savedirty()
+ dsguard.close()
return ret
except AbortNoCleanup:
tr.close()
self.savedirty()
+ dsguard.close()
raise
except: # re-raises
try:
tr.abort()
finally:
repo.invalidate()
- repo.dirstate.invalidate()
self.invalidate()
raise
finally:
- release(tr, lock, wlock)
+ release(tr, lock, dsguard, wlock)
self.removeundo(repo)
def _apply(self, repo, series, list=False, update_status=True,