Mercurial > hg
diff hgext/largefiles/overrides.py @ 45345:e5b4061f32be
mergeresult: add `files()` and use it
`files()` will return a list of files on which an action needs to be performed.
This is a step to stop exposing the underlying map to the user of this object.
Differential Revision: https://phab.mercurial-scm.org/D8887
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 15:41:23 +0530 |
parents | 4c6004afd836 |
children | 490607efc992 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Aug 05 15:37:26 2020 +0530 +++ b/hgext/largefiles/overrides.py Wed Aug 05 15:41:23 2020 +0530 @@ -562,7 +562,7 @@ # Convert to dictionary with filename as key and action as value. lfiles = set() - for f in mresult.actions: + for f in mresult.files(): splitstandin = lfutil.splitstandin(f) if splitstandin is not None and splitstandin in p1: lfiles.add(splitstandin)