Patchwork D6175: merge: make "labels" argument to graft() optional, like it is for update()

login
register
mail settings
Submitter phabricator
Date March 30, 2019, 8:53 p.m.
Message ID <differential-rev-PHID-DREV-2zhi3yivtdk7zkpd3ssr-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39420/
State Superseded
Headers show

Comments

phabricator - March 30, 2019, 8:53 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  graft() just passes the argument on to update(), and update() doesn't
  require it, so graft() shouldn't either.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6175

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2205,7 +2205,7 @@ 
                   error=stats.unresolvedcount)
     return stats
 
-def graft(repo, ctx, pctx, labels, keepparent=False,
+def graft(repo, ctx, pctx, labels=None, keepparent=False,
           keepconflictparent=False):
     """Do a graft-like merge.