Mercurial > hg

diff hgext/convert/hg.py @ 45346:3c783ff08d40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8e8d513941b4
children 5d65e04b6a80
line wrap: on
line diff
--- a/hgext/convert/hg.py	Wed Aug 05 15:41:23 2020 +0530
+++ b/hgext/convert/hg.py	Wed Aug 05 16:00:25 2020 +0530
@@ -229,7 +229,7 @@
             followcopies=False,
         )
 
-        for file, (action, info, msg) in pycompat.iteritems(mresult.actions):
+        for file, (action, info, msg) in mresult.filemap():
             if source.targetfilebelongstosource(file):
                 # If the file belongs to the source repo, ignore the p2
                 # since it will be covered by the existing fileset.