Mercurial > public > mercurial-scm > hg

diff mercurial/shelve.py @ 45577:5c8230ca37f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: replace calls to hg.updaterepo() by merge.update() The former no longer buys us anything. Differential Revision: https://phab.mercurial-scm.org/D9067
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 21 Sep 2020 11:53:44 -0700
parents 8c466bcb0879
children 073bb7563931
line wrap: on
line diff
--- a/mercurial/shelve.py	Mon Sep 21 09:57:29 2020 -0700
+++ b/mercurial/shelve.py	Mon Sep 21 11:53:44 2020 -0700
@@ -839,7 +839,7 @@
             state.nodestoremove.append(newnode)
             shelvectx = repo[newnode]
 
-        hg.updaterepo(repo, pendingctx.node(), overwrite=False)
+        merge.update(pendingctx)
         mergefiles(ui, repo, state.wctx, shelvectx)
         restorebranch(ui, repo, state.branchtorestore)
 
@@ -1031,7 +1031,7 @@
             ui.status(msg)
         else:
             shelvectx = repo[newnode]
-            hg.updaterepo(repo, tmpwctx.node(), False)
+            merge.update(tmpwctx)
 
     return shelvectx, ispartialunshelve