diff hgext/transplant.py @ 40366:b14fdf1fb615

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

--- a/hgext/transplant.py	Thu Oct 18 10:11:08 2018 -0700
+++ b/hgext/transplant.py	Thu Feb 09 09:17:40 2017 -0800
@@ -184,7 +184,8 @@
                     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 @@
             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()