comparison hgext/largefiles/overrides.py @ 45344:4c6004afd836

mergeresult: introduce getfile() and use it where required

We want to hide the underlying dictionary from the users and provide API for
valid and sane use cases.

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

45343:e3826f1dab60

        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

45344:4c6004afd836

        elif lfutil.standin(f) in p1:
            lfiles.add(f)

    for lfile in sorted(lfiles):
        standin = lfutil.standin(lfile)
        (lm, largs, lmsg) = mresult.getfile(lfile, (None, None, None))
        (sm, sargs, smsg) = mresult.getfile(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