resolve: move reset to localrepo.commit

This way rebase doesn't leave a stale resolve state

mercurial/commands.py

@@ -645,9 +645,6 b' def commit(ui, repo, *pats, **opts):'
     elif ui.verbose:
         ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
 
-    ms = merge_.mergestate(repo)
-    ms.reset(node)
-
 def copy(ui, repo, *pats, **opts):
     """mark files as copied for the next commit
 

mercurial/localrepo.py

@@ -824,8 +824,11 b' class localrepository(repo.repository):'
                                                     "(see hg resolve)"))
             wctx = context.workingctx(self, (p1, p2), text, user, date,
                                       extra, changes)
-            return self._commitctx(wctx, force, force_editor, empty_ok,
+            r = self._commitctx(wctx, force, force_editor, empty_ok,
                                    use_dirstate, update_dirstate)
+            ms.reset()
+            return r
+
         finally:
             del lock, wlock
 

mercurial/merge.py

@@ -14,8 +14,9 b' class mergestate(object):'
     def __init__(self, repo):
         self._repo = repo
         self._read()
-    def reset(self, node):
+    def reset(self, node=None):
         self._state = {}
+        if node:
         self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def _read(self):