| hg-reviewers |
There's no need for an out abstraction between files and contexts anymore.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # 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) | ||||
| class ctxwriter(object): | |||||
| def __init__(self, ctx): | |||||
| self.ctx = ctx | |||||
| self.text = "" | |||||
| def write(self, text): | |||||
| self.text += text | |||||
| def close(self): | |||||
| self.ctx.write(self.text, self.ctx.flags()) | |||||
| mode = opts.get('mode','merge') | mode = opts.get('mode','merge') | ||||
| name_a, name_b, name_base = None, None, None | name_a, name_b, name_base = None, None, None | ||||
| if mode != 'union': | if mode != 'union': | ||||
| name_a, name_b, name_base = _picklabels([localctx.path(), | name_a, name_b, name_base = _picklabels([localctx.path(), | ||||
| otherctx.path(), None], | otherctx.path(), None], | ||||
| opts.get('label', [])) | opts.get('label', [])) | ||||
| try: | try: | ||||
| localtext = readctx(localctx) | localtext = readctx(localctx) | ||||
| basetext = readctx(basectx) | basetext = readctx(basectx) | ||||
| othertext = readctx(otherctx) | othertext = readctx(otherctx) | ||||
| except error.Abort: | except error.Abort: | ||||
| return 1 | return 1 | ||||
| if opts.get('print'): | |||||
| out = ui.fout | |||||
| else: | |||||
| out = ctxwriter(localctx) | |||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| extrakwargs = { | extrakwargs = { | ||||
| "localorother": opts.get("localorother", None), | "localorother": opts.get("localorother", None), | ||||
| 'minimize': True, | 'minimize': True, | ||||
| } | } | ||||
| if mode == 'union': | if mode == 'union': | ||||
| extrakwargs['start_marker'] = None | extrakwargs['start_marker'] = None | ||||
| extrakwargs['mid_marker'] = None | extrakwargs['mid_marker'] = None | ||||
| extrakwargs['end_marker'] = None | extrakwargs['end_marker'] = None | ||||
| elif name_base is not None: | elif name_base is not None: | ||||
| extrakwargs['base_marker'] = '|||||||' | extrakwargs['base_marker'] = '|||||||' | ||||
| extrakwargs['name_base'] = name_base | extrakwargs['name_base'] = name_base | ||||
| extrakwargs['minimize'] = False | extrakwargs['minimize'] = False | ||||
| mergedtext = "" | |||||
| for line in m3.merge_lines(name_a=name_a, name_b=name_b, | for line in m3.merge_lines(name_a=name_a, name_b=name_b, | ||||
| **pycompat.strkwargs(extrakwargs)): | **pycompat.strkwargs(extrakwargs)): | ||||
| out.write(line) | if opts.get('print'): | ||||
| ui.fout.write(line) | |||||
| else: | |||||
| mergedtext += line | |||||
| if not opts.get('print'): | if not opts.get('print'): | ||||
| out.close() | localctx.write(mergedtext, localctx.flags()) | ||||
| if m3.conflicts and not mode == 'union': | if m3.conflicts and not mode == 'union': | ||||
| return 1 | return 1 | ||||