update: clarify update() call sites by specifying argument names

merge.update() takes a lot of parameters and I get confused all the
time which is which.

Differential Revision: https://phab.mercurial-scm.org/D5153

hgext/histedit.py

@@ -830,8 +830,7 b' class base(histeditaction):'
 
     def run(self):
         if self.repo['.'].node() != self.node:
-            mergemod.update(self.repo, self.node, False, True)
-            #                                     branchmerge, force)
+            mergemod.update(self.repo, self.node, branchmerge=False, force=True)
         return self.continueclean()
 
     def continuedirty(self):

hgext/rebase.py

@@ -1188,7 +1188,7 b' def rebasenode(repo, rev, p1, base, coll'
     else:
         if repo['.'].rev() != p1:
             repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
-            mergemod.update(repo, p1, False, True)
+            mergemod.update(repo, p1, branchmerge=False, force=True)
         else:
             repo.ui.debug(" already in destination\n")
         # This is, alas, necessary to invalidate workingctx's manifest cache,
@@ -1200,7 +1200,8 b' def rebasenode(repo, rev, p1, base, coll'
         repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
     # When collapsing in-place, the parent is the common ancestor, we
     # have to allow merging with it.
-    stats = mergemod.update(repo, rev, True, True, base, collapse,
+    stats = mergemod.update(repo, rev, branchmerge=True, force=True,
+                            ancestor=base, mergeancestor=collapse,
                             labels=['dest', 'source'], wc=wctx)
     if collapse:
         copies.duplicatecopies(repo, wctx, rev, dest)
@@ -1643,7 +1644,7 b' def abort(repo, originalwd, destmap, sta'
 
             # Update away from the rebase if necessary
             if shouldupdate or needupdate(repo, state):
-                mergemod.update(repo, originalwd, False, True)
+                mergemod.update(repo, originalwd, branchmerge=False, force=True)
 
             # Strip from the first rebased revision
             if rebased:

hgext/shelve.py

@@ -656,7 +656,7 b' def unshelveabort(ui, repo, state, opts)'
         try:
             checkparents(repo, state)
 
-            merge.update(repo, state.pendingctx, False, True)
+            merge.update(repo, state.pendingctx, branchmerge=False, force=True)
             if (state.activebookmark
                     and state.activebookmark in repo._bookmarks):
                 bookmarks.activate(repo, state.activebookmark)

hgext/transplant.py

@@ -184,7 +184,8 b' class transplanter(object):'
                     if pulls:
                         if source != repo:
                             exchange.pull(repo, source.peer(), heads=pulls)
-                        merge.update(repo, pulls[-1], False, False)
+                        merge.update(repo, pulls[-1], branchmerge=False,
+                                     force=False)
                         p1, p2 = repo.dirstate.parents()
                         pulls = []
 
@@ -249,7 +250,7 b' class transplanter(object):'
             tr.close()
             if pulls:
                 exchange.pull(repo, source.peer(), heads=pulls)
-                merge.update(repo, pulls[-1], False, False)
+                merge.update(repo, pulls[-1], branchmerge=False, force=False)
         finally:
             self.saveseries(revmap, merges)
             self.transplants.write()

mercurial/cmdutil.py

@@ -365,8 +365,8 b' def dorecord(ui, repo, commitfunc, cmdsu'
             if backups:
                 # Equivalent to hg.revert
                 m = scmutil.matchfiles(repo, backups.keys())
-                mergemod.update(repo, repo.dirstate.p1(),
-                        False, True, matcher=m)
+                mergemod.update(repo, repo.dirstate.p1(), branchmerge=False,
+                                force=True, matcher=m)
 
             # 3b. (apply)
             if dopatch:

mercurial/commands.py

@@ -643,7 +643,9 b' def _dobackout(ui, repo, node=None, rev='
         with dirstateguard.dirstateguard(repo, 'backout'):
             overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
             with ui.configoverride(overrides, 'backout'):
-                stats = mergemod.update(repo, parent, True, True, node, False)
+                stats = mergemod.update(repo, parent, branchmerge=True,
+                                        force=True, ancestor=node,
+                                        mergeancestor=False)
             repo.setparents(op1, op2)
         hg._showstats(repo, stats)
         if stats.unresolvedcount:

mercurial/hg.py

@@ -846,7 +846,7 b' def updaterepo(repo, node, overwrite, up'
     When overwrite is set, changes are clobbered, merged else
 
     returns stats (see pydoc mercurial.merge.applyupdates)"""
-    return mergemod.update(repo, node, False, overwrite,
+    return mergemod.update(repo, node, branchmerge=False, force=overwrite,
                            labels=['working copy', 'destination'],
                            updatecheck=updatecheck)
 
@@ -949,8 +949,8 b' def merge(repo, node, force=None, remind'
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
     if not abort:
-        stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,
-                                labels=labels)
+        stats = mergemod.update(repo, node, branchmerge=True, force=force,
+                                mergeforce=mergeforce, labels=labels)
     else:
         ms = mergemod.mergestate.read(repo)
         if ms.active():

tests/test-revlog-ancestry.py

@@ -22,10 +22,10 b' def addcommit(name, time):'
     commit(name, time)
 
 def update(rev):
-    merge.update(repo, rev, False, True)
+    merge.update(repo, rev, branchmerge=False, force=True)
 
 def merge_(rev):
-    merge.update(repo, rev, True, False)
+    merge.update(repo, rev, branchmerge=True, force=False)
 
 if __name__ == '__main__':
     addcommit(b"A", 0)