comparison mercurial/simplemerge.py @ 48559:b5e1283c0475

simplemerge: use same newline detection for :mergediff as for :merge[3]

The `:merge` and `:merge3` markers used the newline style detected
from the base input. The `:mergediff` style always used LF as newline
character. This patch teaches `:mergediff` to use the same detection
as the others did.

Differential Revision: https://phab.mercurial-scm.org/D11976

48558:2dbee604a4f0

    for i, override in enumerate(overrides):
        result[i] = override
    return result


def render_markers(
    m3,
    name_a=None,
    name_b=None,
    name_base=None,

    end_marker=b'>>>>>>>',
    base_marker=None,
    minimize=False,
):
    """Return merge in cvs-like form."""
    conflicts = False
    newline = b'\n'
    if len(m3.a) > 0:
        if m3.a[0].endswith(b'\r\n'):
            newline = b'\r\n'
        elif m3.a[0].endswith(b'\r'):
            newline = b'\r'
    if name_a and start_marker:
        start_marker = start_marker + b' ' + name_a
    if name_b and end_marker:
        end_marker = end_marker + b' ' + name_b
    if name_base and base_marker:

            lines.extend(group_lines)
    return lines, conflicts


def render_mergediff(m3, name_a, name_b, name_base):
    lines = []
    conflicts = False
    for what, group_lines in m3.merge_groups():
        if what == b'conflict':
            base_lines, a_lines, b_lines = group_lines

                        for line in lines1[block[0] : block[1]]:
                            yield b'-' + line
                        for line in lines2[block[2] : block[3]]:
                            yield b'+' + line

            lines.append(b"<<<<<<<\n")
            if matching_lines(a_blocks) < matching_lines(b_blocks):
                lines.append(b"======= %s\n" % name_a)
                lines.extend(a_lines)
                lines.append(b"------- %s\n" % name_base)
                lines.append(b"+++++++ %s\n" % name_b)
                lines.extend(diff_lines(b_blocks, base_lines, b_lines))
            else:
                lines.append(b"------- %s\n" % name_base)
                lines.append(b"+++++++ %s\n" % name_a)
                lines.extend(diff_lines(a_blocks, base_lines, a_lines))
                lines.append(b"======= %s\n" % name_b)
                lines.extend(b_lines)
            lines.append(b">>>>>>>\n")
            conflicts = True
        else:
            lines.extend(group_lines)
    return lines, conflicts

48559:b5e1283c0475

    for i, override in enumerate(overrides):
        result[i] = override
    return result


def _detect_newline(m3):
    if len(m3.a) > 0:
        if m3.a[0].endswith(b'\r\n'):
            return b'\r\n'
        elif m3.a[0].endswith(b'\r'):
            return b'\r'
    return b'\n'


def render_markers(
    m3,
    name_a=None,
    name_b=None,
    name_base=None,

    end_marker=b'>>>>>>>',
    base_marker=None,
    minimize=False,
):
    """Return merge in cvs-like form."""
    newline = _detect_newline(m3)
    conflicts = False
    if name_a and start_marker:
        start_marker = start_marker + b' ' + name_a
    if name_b and end_marker:
        end_marker = end_marker + b' ' + name_b
    if name_base and base_marker:

            lines.extend(group_lines)
    return lines, conflicts


def render_mergediff(m3, name_a, name_b, name_base):
    newline = _detect_newline(m3)
    lines = []
    conflicts = False
    for what, group_lines in m3.merge_groups():
        if what == b'conflict':
            base_lines, a_lines, b_lines = group_lines

                        for line in lines1[block[0] : block[1]]:
                            yield b'-' + line
                        for line in lines2[block[2] : block[3]]:
                            yield b'+' + line

            lines.append(b"<<<<<<<" + newline)
            if matching_lines(a_blocks) < matching_lines(b_blocks):
                lines.append(b"======= " + name_a + newline)
                lines.extend(a_lines)
                lines.append(b"------- " + name_base + newline)
                lines.append(b"+++++++ " + name_b + newline)
                lines.extend(diff_lines(b_blocks, base_lines, b_lines))
            else:
                lines.append(b"------- " + name_base + newline)
                lines.append(b"+++++++ " + name_a + newline)
                lines.extend(diff_lines(a_blocks, base_lines, a_lines))
                lines.append(b"======= " + name_b + newline)
                lines.extend(b_lines)
            lines.append(b">>>>>>>" + newline)
            conflicts = True
        else:
            lines.extend(group_lines)
    return lines, conflicts