This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9794

copies: clarify which case some conditional are handling
ClosedPublic

Authored by marmoute on Jan 15 2021, 6:09 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG154ded9104f1: copies: clarify which case some conditional are handling
rHGb44cc9ed5c74: copies: clarify which case some conditional are handling
Summary

This make the function a bit clearer. The middle conditional get no label
because we about about to remove it. See next changeset for details.

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.

Event Timeline

marmoute created this revision.Jan 15 2021, 6:09 PM
baymax updated this revision to Diff 24920.Jan 15 2021, 8:58 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 25106.Jan 18 2021, 8:54 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 25265.Jan 26 2021, 1:31 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jan 26 2021, 3:09 PM
This revision is now accepted and ready to land.Jan 26 2021, 3:09 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (4 lines)

Diff 25300

mercurial/copies.py

# #
# _chain() takes care of chaining the copies in 'a' and 'b', but it # _chain() takes care of chaining the copies in 'a' and 'b', but it
# cannot tell the difference between cases 1 and 2, between 3 and 4, or # cannot tell the difference between cases 1 and 2, between 3 and 4, or
# between 5 and 6, so it includes all cases in its result. # between 5 and 6, so it includes all cases in its result.
# Cases 1, 3, and 5 are then removed by _filter(). # Cases 1, 3, and 5 are then removed by _filter().
for k, v in list(t.items()): for k, v in list(t.items()):
# remove copies from files that didn't exist # remove copies from files that didn't exist
if v not in src: if v not in src: # case 5
del t[k] del t[k]
# remove criss-crossed copies # remove criss-crossed copies
elif k in src and v in dst: elif k in src and v in dst:
del t[k] del t[k]
# remove copies to files that were then removed # remove copies to files that were then removed
elif k not in dst: elif k not in dst: # case 1
del t[k] del t[k]
def _chain(prefix, suffix): def _chain(prefix, suffix):
"""chain two sets of copies 'prefix' and 'suffix'""" """chain two sets of copies 'prefix' and 'suffix'"""
result = prefix.copy() result = prefix.copy()
for key, value in pycompat.iteritems(suffix): for key, value in pycompat.iteritems(suffix):
result[key] = prefix.get(value, value) result[key] = prefix.get(value, value)