comparison mercurial/simplemerge.py @ 48555:c91418480cb0

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels

Before this patch, we use a combination of `mode` and `labels` to
decide which marker style to use. That's mostly my own fault because I
was the one who added the `mergediff` as a "mode" instead of adding a
separate argument for marker style. Still, let's make these arguments
more orthogonal by ignoring the number of labels when deciding which
marker style to use.

This refactoring makes it a little clearer in the simplemerge
*extension* that passing more than 2 `--label` arguments changes the
marker style.

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

48554:0dc698c91ca0

            lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
        else:
            extrakwargs = {
                'minimize': True,
            }
            if name_base is not None:
                extrakwargs['base_marker'] = b'|||||||'
                extrakwargs['name_base'] = name_base
                extrakwargs['minimize'] = False
            lines = list(
                m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)

48555:c91418480cb0

            lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
        else:
            extrakwargs = {
                'minimize': True,
            }
            if mode == b'merge3':
                extrakwargs['base_marker'] = b'|||||||'
                extrakwargs['name_base'] = name_base
                extrakwargs['minimize'] = False
            lines = list(
                m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)