equal
deleted
inserted
replaced
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) |