comparison mercurial/merge.py @ 2894:f28f4c850cd8

merge: hoist some working manifest logic out of merge loop

2893:3cef09d12010

    # construct a working dir manifest
    mw = m1.copy()
    umap = dict.fromkeys(unknown)

    for f in added + modified + unknown:
        mw[f] = None
        if f in m1: mw[f] = "" # distinguish between changed and new
        mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))

    for f in deleted + removed:
        if f in mw:
            del mw[f]

    for f, n in mw.iteritems():
        if partial and not partial(f):
            continue
        if f in m2:
            s = 0

            # is the wfile new and matches m2?
            if mw[f] == None:
                if not repo.file(f).cmp(m2[f], repo.wread(f)):
                    n = m2[f]

            # are files different?
            if n != m2[f]:
                a = ma.get(f, nullid)
                # are both different from the ancestor?

2894:f28f4c850cd8

    # construct a working dir manifest
    mw = m1.copy()
    umap = dict.fromkeys(unknown)

    for f in added + modified + unknown:
        mw[f] = ""
        # is the wfile new and matches m2?
        if (f not in m1 and f in m2 and
            not repo.file(f).cmp(m2[f], repo.wread(f))):
            mw[f] = m2[f]

        mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))

    for f in deleted + removed:
        if f in mw:
            del mw[f]

    for f, n in mw.iteritems():
        if partial and not partial(f):
            continue
        if f in m2:
            s = 0

            # are files different?
            if n != m2[f]:
                a = ma.get(f, nullid)
                # are both different from the ancestor?