Mercurial > hg
diff 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
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 15:37:26 +0530 |
parents | a3cd63d6005b |
children | e5b4061f32be |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Aug 05 14:03:59 2020 +0530 +++ b/hgext/largefiles/overrides.py Wed Aug 05 15:37:26 2020 +0530 @@ -571,8 +571,8 @@ 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)) + (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