amend: use dirstateguard instead of dirstate.invalidate
Before this patch, "cmdutil.amend()" uses "dirstate.invalidate()" as a
kind of "restore .hg/dirstate to the original status" during a failure.
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 process (e.g. "precommit"
hook).
--- a/mercurial/cmdutil.py Thu May 07 12:07:10 2015 +0900
+++ b/mercurial/cmdutil.py Thu May 07 12:07:10 2015 +0900
@@ -2464,9 +2464,10 @@
ui.note(_('amending changeset %s\n') % old)
base = old.p1()
- wlock = lock = newid = None
+ wlock = dsguard = lock = newid = None
try:
wlock = repo.wlock()
+ dsguard = dirstateguard(repo, 'amend')
lock = repo.lock()
tr = repo.transaction('amend')
try:
@@ -2637,6 +2638,7 @@
tr.close()
finally:
tr.release()
+ dsguard.close()
if not createmarkers and newid != old.node():
# Strip the intermediate commit (if there was one) and the amended
# commit
@@ -2645,9 +2647,7 @@
ui.note(_('stripping amended changeset %s\n') % old)
repair.strip(ui, repo, old.node(), topic='amend-backup')
finally:
- if newid is None:
- repo.dirstate.invalidate()
- lockmod.release(lock, wlock)
+ lockmod.release(lock, dsguard, wlock)
return newid
def commiteditor(repo, ctx, subs, editform=''):