| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
| return [name_a, name_b, name_base] | return [name_a, name_b, name_base] | ||||
| def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts): | def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts): | ||||
| """Performs the simplemerge algorithm. | """Performs the simplemerge algorithm. | ||||
| The merged result is written into `localctx`. | The merged result is written into `localctx`. | ||||
| """ | """ | ||||
| def readctx(ctx): | def readctx(ctx): | ||||
| if not ctx: | |||||
| 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. | ||||
| return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) | return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts) | ||||