The results in some duplicate, but the code is very straight-forward
and I think it's worth it to have each conflict marker style in a
separate function.
| 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 (35 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 | ||
| Closed | martinvonz |
| return b'\r' | return b'\r' | ||||
| return b'\n' | return b'\n' | ||||
| def render_markers( | def render_markers( | ||||
| m3, | m3, | ||||
| name_a=None, | name_a=None, | ||||
| name_b=None, | name_b=None, | ||||
| name_base=None, | |||||
| start_marker=b'<<<<<<<', | start_marker=b'<<<<<<<', | ||||
| mid_marker=b'=======', | mid_marker=b'=======', | ||||
| end_marker=b'>>>>>>>', | end_marker=b'>>>>>>>', | ||||
| base_marker=None, | |||||
| minimize=False, | minimize=False, | ||||
| ): | ): | ||||
| """Return merge in cvs-like form.""" | """Return merge in cvs-like form.""" | ||||
| newline = _detect_newline(m3) | newline = _detect_newline(m3) | ||||
| conflicts = False | conflicts = False | ||||
| if name_a and start_marker: | if name_a and start_marker: | ||||
| start_marker = start_marker + b' ' + name_a | start_marker = start_marker + b' ' + name_a | ||||
| if name_b and end_marker: | if name_b and end_marker: | ||||
| end_marker = end_marker + b' ' + name_b | end_marker = end_marker + b' ' + name_b | ||||
| if name_base and base_marker: | |||||
| base_marker = base_marker + b' ' + name_base | |||||
| merge_groups = m3.merge_groups() | merge_groups = m3.merge_groups() | ||||
| if minimize: | if minimize: | ||||
| merge_groups = m3.minimize(merge_groups) | merge_groups = m3.minimize(merge_groups) | ||||
| lines = [] | lines = [] | ||||
| for what, group_lines in merge_groups: | for what, group_lines in merge_groups: | ||||
| if what == b'conflict': | if what == b'conflict': | ||||
| base_lines, a_lines, b_lines = group_lines | base_lines, a_lines, b_lines = group_lines | ||||
| conflicts = True | conflicts = True | ||||
| if start_marker is not None: | if start_marker is not None: | ||||
| lines.append(start_marker + newline) | lines.append(start_marker + newline) | ||||
| lines.extend(a_lines) | lines.extend(a_lines) | ||||
| if base_marker is not None: | |||||
| lines.append(base_marker + newline) | |||||
| lines.extend(base_lines) | |||||
| if mid_marker is not None: | if mid_marker is not None: | ||||
| lines.append(mid_marker + newline) | lines.append(mid_marker + newline) | ||||
| lines.extend(b_lines) | lines.extend(b_lines) | ||||
| if end_marker is not None: | if end_marker is not None: | ||||
| lines.append(end_marker + newline) | lines.append(end_marker + newline) | ||||
| else: | else: | ||||
| lines.extend(group_lines) | lines.extend(group_lines) | ||||
| return lines, conflicts | return lines, conflicts | ||||
| def render_merge3(m3, name_a, name_b, name_base): | |||||
| """Render conflicts as 3-way conflict markers.""" | |||||
| newline = _detect_newline(m3) | |||||
| conflicts = False | |||||
| lines = [] | |||||
| for what, group_lines in m3.merge_groups(): | |||||
| if what == b'conflict': | |||||
| base_lines, a_lines, b_lines = group_lines | |||||
| conflicts = True | |||||
| lines.append(b'<<<<<<< ' + name_a + newline) | |||||
| lines.extend(a_lines) | |||||
| lines.append(b'||||||| ' + name_base + newline) | |||||
| lines.extend(base_lines) | |||||
| lines.append(b'=======' + newline) | |||||
| lines.extend(b_lines) | |||||
| lines.append(b'>>>>>>> ' + name_b + newline) | |||||
| else: | |||||
| lines.extend(group_lines) | |||||
| return lines, conflicts | |||||
| def render_mergediff(m3, name_a, name_b, name_base): | def render_mergediff(m3, name_a, name_b, name_base): | ||||
| """Render conflicts as conflict markers with one snapshot and one diff.""" | |||||
| newline = _detect_newline(m3) | newline = _detect_newline(m3) | ||||
| lines = [] | lines = [] | ||||
| conflicts = False | conflicts = False | ||||
| for what, group_lines in m3.merge_groups(): | for what, group_lines in m3.merge_groups(): | ||||
| if what == b'conflict': | if what == b'conflict': | ||||
| base_lines, a_lines, b_lines = group_lines | base_lines, a_lines, b_lines = group_lines | ||||
| base_text = b''.join(base_lines) | base_text = b''.join(base_lines) | ||||
| b_blocks = list( | b_blocks = list( | ||||
| 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,)) | ||||
| else: | else: | ||||
| name_a, name_b, name_base = _picklabels(opts.get('label', [])) | name_a, name_b, name_base = _picklabels(opts.get('label', [])) | ||||
| if mode == b'mergediff': | if mode == b'mergediff': | ||||
| lines, conflicts = render_mergediff(m3, name_a, name_b, name_base) | lines, conflicts = render_mergediff(m3, name_a, name_b, name_base) | ||||
| elif mode == b'merge3': | |||||
| lines, conflicts = render_merge3(m3, name_a, name_b, name_base) | |||||
| else: | else: | ||||
| extrakwargs = { | extrakwargs = { | ||||
| 'minimize': True, | 'minimize': True, | ||||
| } | } | ||||
| if mode == b'merge3': | |||||
| extrakwargs['base_marker'] = b'|||||||' | |||||
| extrakwargs['name_base'] = name_base | |||||
| extrakwargs['minimize'] = False | |||||
| lines, conflicts = render_markers( | lines, conflicts = render_markers( | ||||
| m3, name_a=name_a, name_b=name_b, **extrakwargs | m3, name_a=name_a, name_b=name_b, **extrakwargs | ||||
| ) | ) | ||||
| 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 | ||||