This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6275

copies: delete a redundant cleanup step in _chain()
ClosedPublic

Authored by martinvonz on Apr 18 2019, 12:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdf7ad90edbd4: copies: delete a redundant cleanup step in _chain()
Summary

The check is redundant since d5edb5d3a337 (copies: filter out copies
when target is not in destination manifest, 2019-02-14). To test that
hypothesis, I made this change in the commit that commit, but all
tests still passed. I think the case was necessary before then, we
just didn't have tests for it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (4 lines)

Diff 14982

mercurial/copies.py

# overwritten later, and case 3 will be removed later. # overwritten later, and case 3 will be removed later.
t = a.copy() t = a.copy()
for k, v in b.iteritems(): for k, v in b.iteritems():
if v in t: if v in t:
# found a chain, i.e. cases 3 & 4. # found a chain, i.e. cases 3 & 4.
if t[v] != k: if t[v] != k:
# file wasn't renamed back to itself (i.e. case 4, not 3) # file wasn't renamed back to itself (i.e. case 4, not 3)
t[k] = t[v] t[k] = t[v]
if v not in dst:
# chain was a rename, not a copy
# this deletes the copy for 'y' in case 4
del t[v]
if v in src: if v in src:
# file is a copy of an existing file, i.e. case 6. # file is a copy of an existing file, i.e. case 6.
t[k] = v t[k] = v
for k, v in list(t.items()): for k, v in list(t.items()):
# remove criss-crossed copies, i.e. case 3 # remove criss-crossed copies, i.e. case 3
if k in src and v in dst: if k in src and v in dst:
del t[k] del t[k]