This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9795

copies: simplify the conditional for _filter's case 3
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1d6d1a15a963: copies: simplify the conditional for _filter's case 3
rHGb2c17fc853a5: copies: simplify the conditional for _filter's case 3
Summary

The conditional is much simpler and the test are actually happier. This
clarification of the conditional will also be necessary to properly support tracing
more renames in a coming changeset.

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
marmoute planned changes to this revision.Jan 15 2021, 7:32 PM

this makes test-rebase-rename.t unhappy, investigating

marmoute added a comment.Jan 15 2021, 8:22 PM

The graft code is doing something wonky. Issue fixed.

marmoute updated this revision to Diff 24918.Jan 15 2021, 8:24 PM
baymax updated this revision to Diff 24921.Jan 15 2021, 8:58 PM

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

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

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

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

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

pulkit accepted this revision.Jan 26 2021, 3:11 PM
This revision is now accepted and ready to land.Jan 26 2021, 3:11 PM
marmoute added a commit: rHGb2c17fc853a5: copies: simplify the conditional for _filter's case 3.Jan 27 2021, 8:14 AM
Closed by commit rHGb2c17fc853a5: copies: simplify the conditional for _filter's case 3 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (9 lines)
Mtests/test-copies.t (4 lines)

Diff 25302

mercurial/copies.py

# 6 x x y x->y # 6 x x y x->y
# #
# _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 if k == v: # case 3
if v not in src: # case 5
del t[k] del t[k]
# remove criss-crossed copies elif v not in src: # case 5
elif k in src and v in dst: # remove copies from files that didn't exist
del t[k] del t[k]
# remove copies to files that were then removed
elif k not in dst: # case 1 elif k not in dst: # case 1
# remove copies to files that were then removed
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)

tests/test-copies.t

$ hg ci -m 'copy x onto y' $ hg ci -m 'copy x onto y'
$ hg l $ hg l
@ 1 copy x onto y @ 1 copy x onto y
| y | y
o 0 add x and y o 0 add x and y
x y x y
$ hg debugp1copies -r 1 $ hg debugp1copies -r 1
x -> y x -> y
Incorrectly doesn't show the rename
$ hg debugpathcopies 0 1 $ hg debugpathcopies 0 1
x -> y (no-filelog !)
Copy a file onto another file with same content. If metadata is stored in changeset, this does not Copy a file onto another file with same content. If metadata is stored in changeset, this does not
produce a new filelog entry. The changeset's "files" entry should still list the file. produce a new filelog entry. The changeset's "files" entry should still list the file.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ echo x > x2 $ echo x > x2
$ hg ci -Aqm 'add x and x2 with same content' $ hg ci -Aqm 'add x and x2 with same content'
$ hg cp -f x x2 $ hg cp -f x x2
$ hg ci -m 'copy x onto x2' $ hg ci -m 'copy x onto x2'
$ hg l $ hg l
@ 1 copy x onto x2 @ 1 copy x onto x2
| x2 | x2
o 0 add x and x2 with same content o 0 add x and x2 with same content
x x2 x x2
$ hg debugp1copies -r 1 $ hg debugp1copies -r 1
x -> x2 x -> x2
Incorrectly doesn't show the rename
$ hg debugpathcopies 0 1 $ hg debugpathcopies 0 1
x -> x2 (no-filelog !)
Rename file in a loop: x->y->z->x Rename file in a loop: x->y->z->x
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ hg mv x y $ hg mv x y
$ hg debugp1copies $ hg debugp1copies
x -> y x -> y