equal
deleted
inserted
replaced
1183 relevantfiles.add(movedirkey) |
1183 relevantfiles.add(movedirkey) |
1184 filesmatcher = scmutil.matchfiles(repo, relevantfiles) |
1184 filesmatcher = scmutil.matchfiles(repo, relevantfiles) |
1185 matcher = matchmod.intersectmatchers(matcher, filesmatcher) |
1185 matcher = matchmod.intersectmatchers(matcher, filesmatcher) |
1186 |
1186 |
1187 diff = m1.diff(m2, match=matcher) |
1187 diff = m1.diff(m2, match=matcher) |
1188 |
|
1189 if matcher is None: |
|
1190 matcher = matchmod.always('', '') |
|
1191 |
1188 |
1192 actions = {} |
1189 actions = {} |
1193 for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
1190 for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
1194 if n1 and n2: # file exists on both local and remote side |
1191 if n1 and n2: # file exists on both local and remote side |
1195 if f not in ma: |
1192 if f not in ma: |