Mercurial > public > mercurial-scm > hg-stable
diff mercurial/sparse.py @ 45367:3c783ff08d40
mergeresult: introduce filemap() which yields filename based mapping
We wanted to remove `actions` as this was leaking how we store things internally
and was direct access to one of the member. This introduces filemap() which
yields a map of `filename` -> `action, args, msg`.
`mergeresult.actions` has been deleted as it's no longer required.
Differential Revision: https://phab.mercurial-scm.org/D8888
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 16:00:25 +0530 |
parents | 9320f66854f6 |
children | a1f51c7dce0f |
line wrap: on
line diff
--- a/mercurial/sparse.py Wed Aug 05 15:41:23 2020 +0530 +++ b/mercurial/sparse.py Wed Aug 05 16:00:25 2020 +0530 @@ -388,7 +388,7 @@ sparsematch = matcher(repo, [mctx.rev()]) temporaryfiles = [] - for file, action in pycompat.iteritems(mresult.actions): + for file, action in mresult.filemap(): type, args, msg = action files.add(file) if sparsematch(file):