facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

simplemerge: make context parameters non-optional

Browse Source 
Also update the function docstring.

Differential Revision: https://phab.mercurial-scm.org/D382
This commit is contained in:
Phil Cohen 2017-08-24 21:30:51 -07:00
parent 8c03c90982
commit b2eda692d7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/simplemerge.py
View File

@ -419,13 +419,10 @@ def _picklabels(defaults, overrides):
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: