| hg-reviewers |
Also update the function docstring.
| Lint Skipped |
| Unit Tests Skipped |
| mercurial/simplemerge.py | ||
|---|---|---|
| 428 | 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, **opts): | ||||
| **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. | |||||
| """ | """ | ||||
| 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? | |||||
phillcoAuthorUnsubmitted Not Done Sent as D520. phillco: Sent as D520. | |||||
| return None | return None | ||||
| # Merges were always run in the working copy before, which means | # Merges were always run in the working copy before, which means | ||||
| # they used decoded data, if the user defined any repository | # they used decoded data, if the user defined any repository | ||||
| # filters. | # filters. | ||||
| # | # | ||||
| # Maintain that behavior today for BC, though perhaps in the future | # Maintain that behavior today for BC, though perhaps in the future | ||||
| # it'd be worth considering whether merging encoded data (what the | # it'd be worth considering whether merging encoded data (what the | ||||
| # repository usually sees) might be more useful. | # repository usually sees) might be more useful. | ||||
Can this still be true? I.e., is it valid to pass None instead of one of the contexts?