Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 41365:876494fd967d
cleanup: delete lots of unused local variables
These were found by IntelliJ. There are many more, but these seemed
pretty safe.
Differential Revision: https://phab.mercurial-scm.org/D5629
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 17 Jan 2019 09:17:12 -0800 |
| parents | 8c222bec97da |
| children | ef2295651351 |
comparison
equal
deleted
inserted
replaced
| 41364:0132221c25cd | 41365:876494fd967d |
|---|---|
| 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: |