Patchwork D382: simplemerge: make context parameters non-optional

login
register
mail settings
Submitter phabricator
Date Aug. 25, 2017, 6:40 a.m.
Message ID <68082de372914e0e5da02d5ebdca1131@localhost.localdomain>
Download mbox | patch
Permalink /patch/23332/
State Not Applicable
Headers show

Comments

phabricator - Aug. 25, 2017, 6:40 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1ad3085239ad: simplemerge: make context parameters non-optional (authored by phillco).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D382?vs=1042&id=1288

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

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -419,13 +419,10 @@ 
 
     return [name_a, name_b, name_base]
 
-def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None,
-                **opts):
+def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
     """Performs the simplemerge algorithm.
 
-    {local|base|other}ctx are optional. If passed, they (local/base/other) will
-    be read from and the merge result written to (local). You should pass
-    explicit labels in this mode since the default is to use the file paths.
+    The merged result is written into `localctx`.
     """
     def readctx(ctx):
         if not ctx: