mercurial/simplemerge.py

33849:8b91a4ff23ad

def simplemerge(ui, localfile, basefile, otherfile,
                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. 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)

        # what would have been in the working copy). Since merges were run in
        # the working copy, and thus used post-filter data, we do the same to
        # maintain behavior.
        return repo.wwritedata(ctx.path(),
                               _verifytext(ctx.data(), ctx.path(), ui, opts))

    mode = opts.get('mode','merge')
    if mode == 'union':
        name_a = None
        name_b = None

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

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

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

33850:b86fc43e4b73

def simplemerge(ui, localfile, basefile, otherfile,
                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)

        # what would have been in the working copy). Since merges were run in
        # the working copy, and thus used post-filter data, we do the same to
        # maintain behavior.
        return repo.wwritedata(ctx.path(),
                               _verifytext(ctx.data(), ctx.path(), ui, opts))

    class ctxwriter(object):
        def __init__(self, ctx):
            self.ctx = ctx
            self.text = ""

        def write(self, text):
            self.text += text

        def close(self):
            self.ctx.write(self.text, self.ctx.flags())

    mode = opts.get('mode','merge')
    if mode == 'union':
        name_a = None
        name_b = None

        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,