Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 32881:9e3733d93f64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace dict.iterkeys() with iter(dict) dict.iterkeys() does not exists on Python 3.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 16 Jun 2017 01:46:47 +0530
parents 9fbd8ad398aa
children 6582dc01aca3
comparison
equal deleted inserted replaced
32880:e4a43b810528 32881:9e3733d93f64
836 836
837 # For copied and moved files, we need to add the source file too. 837 # For copied and moved files, we need to add the source file too.
838 for copykey, copyvalue in copy.iteritems(): 838 for copykey, copyvalue in copy.iteritems():
839 if copyvalue in relevantfiles: 839 if copyvalue in relevantfiles:
840 relevantfiles.add(copykey) 840 relevantfiles.add(copykey)
841 for movedirkey in movewithdir.iterkeys(): 841 for movedirkey in movewithdir:
842 relevantfiles.add(movedirkey) 842 relevantfiles.add(movedirkey)
843 filesmatcher = scmutil.matchfiles(repo, relevantfiles) 843 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
844 matcher = matchmod.intersectmatchers(matcher, filesmatcher) 844 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
845 845
846 diff = m1.diff(m2, match=matcher) 846 diff = m1.diff(m2, match=matcher)