mercurial/simplemerge.py

33904:1915a5e809ca

# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."

from __future__ import absolute_import

import os

from .i18n import _
from . import (
    error,
    mdiff,
    pycompat,
    util,
    vfs as vfsmod,
)

class CantReprocessAndShowBase(Exception):
    pass

                localctx=None, basectx=None, otherctx=None, repo=None, **opts):
    """Performs the simplemerge algorithm.

    {local|base|other}ctx are optional. If passed, they (local/base/other) will
    be read from and the merge result written to (local). You should pass
    explicit labels in this mode since the default is to use the file paths."""
    def readfile(filename):
        f = open(filename, "rb")
        text = f.read()
        f.close()
        return _verifytext(text, filename, ui, opts)

    def readctx(ctx):
        if not ctx:
            return None
        # Merges were always run in the working copy before, which means
        # they used decoded data, if the user defined any repository

        name_a, name_b, name_base = _picklabels([localctx.path(),
                                                 otherctx.path(), None],
                                                opts.get('label', []))

    try:
        localtext = readctx(localctx) if localctx else readfile(localfile)
        basetext = readctx(basectx) if basectx else readfile(basefile)
        othertext = readctx(otherctx) if otherctx else readfile(otherfile)
    except error.Abort:
        return 1

    if opts.get('print'):
        out = ui.fout
    elif localctx:
        out = ctxwriter(localctx)
    else:
        localfile = os.path.realpath(localfile)
        opener = vfsmod.vfs(os.path.dirname(localfile))
        out = opener(os.path.basename(localfile), "w", atomictemp=True)

    m3 = Merge3Text(basetext, localtext, othertext)
    extrakwargs = {
            "localorother": opts.get("localorother", None),
            'minimize': True,

33905:61b267a99fea

# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."

from __future__ import absolute_import

from .i18n import _
from . import (
    error,
    mdiff,
    pycompat,
    util,
)

class CantReprocessAndShowBase(Exception):
    pass

                localctx=None, basectx=None, otherctx=None, repo=None, **opts):
    """Performs the simplemerge algorithm.

    {local|base|other}ctx are optional. If passed, they (local/base/other) will
    be read from and the merge result written to (local). You should pass
    explicit labels in this mode since the default is to use the file paths.
    """
    def readctx(ctx):
        if not ctx:
            return None
        # Merges were always run in the working copy before, which means
        # they used decoded data, if the user defined any repository

        name_a, name_b, name_base = _picklabels([localctx.path(),
                                                 otherctx.path(), None],
                                                opts.get('label', []))

    try:
        localtext = readctx(localctx)
        basetext = readctx(basectx)
        othertext = readctx(otherctx)
    except error.Abort:
        return 1

    if opts.get('print'):
        out = ui.fout
    else:
        out = ctxwriter(localctx)

    m3 = Merge3Text(basetext, localtext, othertext)
    extrakwargs = {
            "localorother": opts.get("localorother", None),
            'minimize': True,