comparison hgext/largefiles/overrides.py @ 45274:0e18861f96ab

merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)

Earlier, manifestmerge() and calculateupdates() returns a tuple of three things.
I wanted to add one more thing to return value.

Introducing a special class which represents results of a merge will help
understand better and also ease adding new return values.

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

45270:c8655782ef19

@eh.wrapfunction(merge, b'calculateupdates')
def overridecalculateupdates(
    origfn, repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs
):
    overwrite = force and not branchmerge
    actions, diverge, renamedelete = origfn(
        repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs
    )

    if overwrite:
        return actions, diverge, renamedelete

    # Convert to dictionary with filename as key and action as value.
    lfiles = set()
    for f in actions:
        splitstandin = lfutil.splitstandin(f)
        if splitstandin is not None and splitstandin in p1:
            lfiles.add(splitstandin)
        elif lfutil.standin(f) in p1:
            lfiles.add(f)

    for lfile in sorted(lfiles):
        standin = lfutil.standin(lfile)
        (lm, largs, lmsg) = actions.get(lfile, (None, None, None))
        (sm, sargs, smsg) = actions.get(standin, (None, None, None))
        if sm in (b'g', b'dc') and lm != b'r':
            if sm == b'dc':
                f1, f2, fa, move, anc = sargs
                sargs = (p2[f2].flags(), False)
            # Case 1: normal file in the working copy, largefile in

                    b'$$ &Largefile $$ &Normal file'
                )
                % lfile
            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # pick remote largefile
                actions[lfile] = (b'r', None, b'replaced by standin')
                actions[standin] = (b'g', sargs, b'replaces standin')
            else:  # keep local normal file
                actions[lfile] = (b'k', None, b'replaces standin')
                if branchmerge:
                    actions[standin] = (b'k', None, b'replaced by non-standin')
                else:
                    actions[standin] = (b'r', None, b'replaced by non-standin')
        elif lm in (b'g', b'dc') and sm != b'r':
            if lm == b'dc':
                f1, f2, fa, move, anc = largs
                largs = (p2[f2].flags(), False)
            # Case 2: largefile in the working copy, normal file in

                % lfile
            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    actions[lfile] = (b'k', None, b'replaced by standin')
                    actions[standin] = (b'k', None, b'replaces standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself
                    actions[lfile] = (
                        b'lfmr',
                        None,
                        b'forget non-standin largefile',
                    )

                    # linear-merge should treat this largefile as 're-added'
                    actions[standin] = (b'a', None, b'keep standin')
            else:  # pick remote normal file
                actions[lfile] = (b'g', largs, b'replaces standin')
                actions[standin] = (b'r', None, b'replaced by non-standin')

    return actions, diverge, renamedelete


@eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if b'lfmr' in actions:

45274:0e18861f96ab

@eh.wrapfunction(merge, b'calculateupdates')
def overridecalculateupdates(
    origfn, repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs
):
    overwrite = force and not branchmerge
    mresult = origfn(
        repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs
    )

    if overwrite:
        return mresult

    # Convert to dictionary with filename as key and action as value.
    lfiles = set()
    for f in mresult.actions:
        splitstandin = lfutil.splitstandin(f)
        if splitstandin is not None and splitstandin in p1:
            lfiles.add(splitstandin)
        elif lfutil.standin(f) in p1:
            lfiles.add(f)

    for lfile in sorted(lfiles):
        standin = lfutil.standin(lfile)
        (lm, largs, lmsg) = mresult.actions.get(lfile, (None, None, None))
        (sm, sargs, smsg) = mresult.actions.get(standin, (None, None, None))
        if sm in (b'g', b'dc') and lm != b'r':
            if sm == b'dc':
                f1, f2, fa, move, anc = sargs
                sargs = (p2[f2].flags(), False)
            # Case 1: normal file in the working copy, largefile in

                    b'$$ &Largefile $$ &Normal file'
                )
                % lfile
            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # pick remote largefile
                mresult.actions[lfile] = (b'r', None, b'replaced by standin')
                mresult.actions[standin] = (b'g', sargs, b'replaces standin')
            else:  # keep local normal file
                mresult.actions[lfile] = (b'k', None, b'replaces standin')
                if branchmerge:
                    mresult.actions[standin] = (
                        b'k',
                        None,
                        b'replaced by non-standin',
                    )
                else:
                    mresult.actions[standin] = (
                        b'r',
                        None,
                        b'replaced by non-standin',
                    )
        elif lm in (b'g', b'dc') and sm != b'r':
            if lm == b'dc':
                f1, f2, fa, move, anc = largs
                largs = (p2[f2].flags(), False)
            # Case 2: largefile in the working copy, normal file in

                % lfile
            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    mresult.actions[lfile] = (
                        b'k',
                        None,
                        b'replaced by standin',
                    )
                    mresult.actions[standin] = (b'k', None, b'replaces standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself
                    mresult.actions[lfile] = (
                        b'lfmr',
                        None,
                        b'forget non-standin largefile',
                    )

                    # linear-merge should treat this largefile as 're-added'
                    mresult.actions[standin] = (b'a', None, b'keep standin')
            else:  # pick remote normal file
                mresult.actions[lfile] = (b'g', largs, b'replaces standin')
                mresult.actions[standin] = (
                    b'r',
                    None,
                    b'replaced by non-standin',
                )

    return mresult


@eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
    if b'lfmr' in actions: