Mercurial > public > mercurial-scm > hg-stable

diff mercurial/shelve.py @ 44458:f0021fbedea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: remove redundant clearing of mergestate in rebase and shelve `repo.commit()` now clears the merge state even if it ends up not creating a commit because there were no changes to commit. Differential Revision: https://phab.mercurial-scm.org/D8197
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Feb 2020 11:32:27 -0800
parents f5c006621f07
children 47c1226463a1
line wrap: on
line diff
--- a/mercurial/shelve.py	Fri Feb 28 11:32:02 2020 -0800
+++ b/mercurial/shelve.py	Fri Feb 28 11:32:27 2020 -0800
@@ -827,10 +827,6 @@
                 )
 
         if newnode is None:
-            # If it ended up being a no-op commit, then the normal
-            # merge state clean-up path doesn't happen, so do it
-            # here. Fix issue5494
-            merge.mergestate.clean(repo)
             shelvectx = state.pendingctx
             msg = _(
                 b'note: unshelved changes already existed '
@@ -1031,10 +1027,6 @@
             )
 
         if newnode is None:
-            # If it ended up being a no-op commit, then the normal
-            # merge state clean-up path doesn't happen, so do it
-            # here. Fix issue5494
-            merge.mergestate.clean(repo)
             shelvectx = tmpwctx
             msg = _(
                 b'note: unshelved changes already existed '