| hg-reviewers |
Also update the function docstring.
| Lint Skipped |
| Unit Tests Skipped |
| mercurial/simplemerge.py | ||
|---|---|---|
| 432 | Can this still be true? I.e., is it valid to pass None instead of one of the contexts? | |
| name_b = overrides[1] | name_b = overrides[1] | ||||
| if len(overrides) > 2: | if len(overrides) > 2: | ||||
| name_base = overrides[2] | name_base = overrides[2] | ||||
| if len(overrides) > 3: | if len(overrides) > 3: | ||||
| raise error.Abort(_("can only specify three labels.")) | raise error.Abort(_("can only specify three labels.")) | ||||
| return [name_a, name_b, name_base] | return [name_a, name_b, name_base] | ||||
| def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, | def simplemerge(ui, localctx, basectx, otherctx, repo=None, | ||||
| filtereddata=False, **opts): | filtereddata=False, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| {local|base|other}ctx are optional. If passed, they (local/base/other) will | The merged result is written into `localctx`. | ||||
| 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. | |||||
| filtereddata should only be True if the data() in your context returns | filtereddata should only be True if the data() in your context returns | ||||
| decoded data. | decoded data. | ||||
| """ | """ | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| if not ctx: | if not ctx: | ||||
martinvonz: Can this still be true? I.e., is it valid to pass None instead of one of the contexts? | |||||
Sent as D520. phillco: Sent as D520. | |||||
| return None | return None | ||||
| if filtereddata: | if filtereddata: | ||||
| return _verifytext(ctx.data(), ctx.path(), ui, opts) | return _verifytext(ctx.data(), ctx.path(), ui, opts) | ||||
| else: | else: | ||||
| if not repo: | if not repo: | ||||
| raise error.ProgrammingError('simplemerge: repo must be passed ' | raise error.ProgrammingError('simplemerge: repo must be passed ' | ||||
| 'if using contexts and ' | 'if using contexts and ' | ||||
| 'filtereddata is False.') | 'filtereddata is False.') | ||||
Can this still be true? I.e., is it valid to pass None instead of one of the contexts?