| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/simplemerge.py (36 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # 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) | ||||
| mode = opts.get('mode', b'merge') | |||||
| name_a, name_b, name_base = None, None, None | |||||
| if mode != b'union': | |||||
| name_a, name_b, name_base = _picklabels( | |||||
| [localctx.path(), otherctx.path(), None], 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 | ||||
| m3 = Merge3Text(basetext, localtext, othertext) | m3 = Merge3Text(basetext, localtext, othertext) | ||||
| conflicts = False | conflicts = False | ||||
| mode = opts.get('mode', b'merge') | |||||
| if mode == b'union': | if mode == b'union': | ||||
| lines = _resolve(m3, (1, 2)) | lines = _resolve(m3, (1, 2)) | ||||
| elif mode == b'local': | elif mode == b'local': | ||||
| lines = _resolve(m3, (1,)) | lines = _resolve(m3, (1,)) | ||||
| elif mode == b'other': | elif mode == b'other': | ||||
| lines = _resolve(m3, (2,)) | lines = _resolve(m3, (2,)) | ||||
| elif mode == b'mergediff': | else: | ||||
| name_a, name_b, name_base = _picklabels( | |||||
| [localctx.path(), otherctx.path(), None], opts.get('label', []) | |||||
| ) | |||||
| if mode == b'mergediff': | |||||
| lines, conflicts = _mergediff(m3, name_a, name_b, name_base) | lines, conflicts = _mergediff(m3, name_a, name_b, name_base) | ||||
| else: | else: | ||||
| extrakwargs = { | extrakwargs = { | ||||
| 'minimize': True, | 'minimize': True, | ||||
| } | } | ||||
| if name_base is not None: | if name_base is not None: | ||||
| extrakwargs['base_marker'] = b'|||||||' | extrakwargs['base_marker'] = b'|||||||' | ||||
| extrakwargs['name_base'] = name_base | extrakwargs['name_base'] = name_base | ||||
| extrakwargs['minimize'] = False | extrakwargs['minimize'] = False | ||||
| lines = list( | lines = list( | ||||
| m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) | m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) | ||||
| ) | ) | ||||
| conflicts = m3.conflicts | conflicts = m3.conflicts | ||||
| mergedtext = b''.join(lines) | mergedtext = b''.join(lines) | ||||
| if opts.get('print'): | if opts.get('print'): | ||||
| ui.fout.write(mergedtext) | ui.fout.write(mergedtext) | ||||
| else: | else: | ||||
| # localctx.flags() already has the merged flags (done in | # localctx.flags() already has the merged flags (done in | ||||
| # mergestate.resolve()) | # mergestate.resolve()) | ||||
| localctx.write(mergedtext, localctx.flags()) | localctx.write(mergedtext, localctx.flags()) | ||||
| if conflicts: | if conflicts: | ||||
| return 1 | return 1 | ||||