diff mercurial/merge.py @ 44212:cb8b67016110

graft: default `base` argument to common case of `ctx.p1()`

I also updated the callers that wanted that, partly to simplify and
partly to show that it works.

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

--- a/mercurial/merge.py	Fri Jan 10 13:12:24 2020 -0800
+++ b/mercurial/merge.py	Tue Jan 28 14:53:23 2020 -0800
@@ -2592,7 +2592,7 @@
 def graft(
     repo,
     ctx,
-    base,
+    base=None,
     labels=None,
     keepparent=False,
     keepconflictparent=False,
@@ -2607,7 +2607,7 @@
     renames/copies appropriately.
 
     ctx - changeset to rebase
-    base - merge base, usually ctx.p1()
+    base - merge base, or ctx.p1() if not specified
     labels - merge labels eg ['local', 'graft']
     keepparent - keep second parent if any
     keepconflictparent - if unresolved, keep parent used for the merge
@@ -2621,6 +2621,7 @@
     # which local deleted".
     wctx = wctx or repo[None]
     pctx = wctx.p1()
+    base = base or ctx.p1()
     mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())
 
     stats = update(