This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6276

copies: clarify mutually exclusive cases in _chain() with a s/if/elif/
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5a3979529740: copies: clarify mutually exclusive cases in _chain() with a s/if/elif/
Summary

If the 'b' dict has a rename from 'x' to 'y', it shouldn't be possible
for 'x' to be both (a key) in 'a' and in 'src'. That would mean that
'x' is a file in the source commit and also a rename destination in
the intermediate commit. But we currently don't allow renaming files
onto existing files, so that shouldn't happen. So let's clarify that
by using an "elif" instead of an "if". And if we did allow renaming
files onto existing files, we should prefer to use the rename
destination in the intermediate commit as source anyway.

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 (2 lines)

Diff 14983

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 in src: elif 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]
# remove copies to files that were then removed, i.e. case 1 # remove copies to files that were then removed, i.e. case 1