comparison hgext/largefiles/overrides.py @ 45282:b442920ab1de

merge: introduce mergeresult.addfile() and use it

We want to use mergeresult object at more and more places instead of this
actions dict to simplify code and further add new APIs to mergeresult object.

This patch introduces `addfile()` which adds a new file to the internal actions
dict for now.

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

45281:fe2040abb183

                    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)

                % 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

45282:b442920ab1de

                    b'$$ &Largefile $$ &Normal file'
                )
                % lfile
            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # pick remote largefile
                mresult.addfile(lfile, b'r', None, b'replaced by standin')
                mresult.addfile(standin, b'g', sargs, b'replaces standin')
            else:  # keep local normal file
                mresult.addfile(lfile, b'k', None, b'replaces standin')
                if branchmerge:
                    mresult.addfile(
                        standin, b'k', None, b'replaced by non-standin',
                    )
                else:
                    mresult.addfile(
                        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)

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

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

    return mresult