This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6603

copies: filter invalid copies only at end of pathcopies() (issue6163)
ClosedPublic

Authored by martinvonz on Jul 2 2019, 1:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd013099c551b: copies: filter invalid copies only at end of pathcopies() (issue6163)
Summary

copies._filter() filters out copies whose source file does not exist
in the start commit or whose target file does not exist in the end
commit. We do that after chaining copies with dirstate copies or
backward renames from another branch. We also do at the end of the
changeset-centric copy tracing. The filtering means that we will
remove copies to/from files that did not exist in some intermediate
commit. That is inconsistent with what we do if a file has been
deleted and then re-added (we allow updating across that).

Copying the two first examples from issue6163:

@  4 'rename x to y'
|
o  3 'add x again'
|
o  2 'remove x'
|
| o  1 'modify x'
|/
o  0 'add x'

@  4 'rename x to y'
|
o  3 'add x again'
|
| o  2 'modify x'
| |
| o  1 'add x'
|/
o  0 'base'

When doing hg rebase -r 1 -d 4 in the first case, it succeeds, but
hg rebase -r 2 -d 4 in the second case does not. That's because we
chain and filter via commit 0, which does not have file 'x' in the
second case. IMO, that's clearly inconsistent. So this patch removes
the filtering step so it only happens at the end. If a file was
temporarily removed, whether via a merge base or not, it will now
still be considered the same file. That fixes issue6163 for the
changeset-centric case.

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

martinvonz created this revision.Jul 2 2019, 1:13 PM
martinvonz added a commit: rHGd013099c551b: copies: filter invalid copies only at end of pathcopies() (issue6163).Jul 10 2019, 3:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd013099c551b: copies: filter invalid copies only at end of pathcopies() (issue6163) (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 15876

mercurial/copies.py

# it a copy even if the destination already existed on the # it a copy even if the destination already existed on the
# other branch. It's simply too expensive to check if the # other branch. It's simply too expensive to check if the
# file existed in the manifest. # file existed in the manifest.
if dst not in copies: if dst not in copies:
# If it was copied on the p1 side, leave it as copied from # If it was copied on the p1 side, leave it as copied from
# that side, even if it was also copied on the p2 side. # that side, even if it was also copied on the p2 side.
copies[dst] = copies2[dst] copies[dst] = copies2[dst]
if r == b.rev(): if r == b.rev():
_filter(a, b, copies)
return copies return copies
for i, c in enumerate(children[r]): for i, c in enumerate(children[r]):
childctx = repo[c] childctx = repo[c]
if r == childctx.p1().rev(): if r == childctx.p1().rev():
parent = 1 parent = 1
childcopies = childctx.p1copies() childcopies = childctx.p1copies()
else: else:
assert r == childctx.p2().rev() assert r == childctx.p2().rev()
"""find {dst@b: src@a} copy mapping where a is an ancestor of b""" """find {dst@b: src@a} copy mapping where a is an ancestor of b"""
match = a.repo().narrowmatch(match) match = a.repo().narrowmatch(match)
# check for working copy # check for working copy
if b.rev() is None: if b.rev() is None:
cm = _committedforwardcopies(a, b.p1(), match) cm = _committedforwardcopies(a, b.p1(), match)
# combine copies from dirstate if necessary # combine copies from dirstate if necessary
copies = _chain(cm, _dirstatecopies(b._repo, match)) copies = _chain(cm, _dirstatecopies(b._repo, match))
_filter(a, b, copies)
else: else:
copies = _committedforwardcopies(a, b, match) copies = _committedforwardcopies(a, b, match)
return copies return copies
def _backwardrenames(a, b, match): def _backwardrenames(a, b, match):
if a._repo.ui.config('experimental', 'copytrace') == 'off': if a._repo.ui.config('experimental', 'copytrace') == 'off':
return {} return {}
if debug: if debug:
repo.ui.debug('debug.copies: search mode: backward\n') repo.ui.debug('debug.copies: search mode: backward\n')
copies = _backwardrenames(x, y, match=match) copies = _backwardrenames(x, y, match=match)
else: else:
if debug: if debug:
repo.ui.debug('debug.copies: search mode: combined\n') repo.ui.debug('debug.copies: search mode: combined\n')
copies = _chain(_backwardrenames(x, a, match=match), copies = _chain(_backwardrenames(x, a, match=match),
_forwardcopies(a, y, match=match)) _forwardcopies(a, y, match=match))
_filter(x, y, copies) _filter(x, y, copies)
return copies return copies
def mergecopies(repo, c1, c2, base): def mergecopies(repo, c1, c2, base):
""" """
Finds moves and copies between context c1 and c2 that are relevant for Finds moves and copies between context c1 and c2 that are relevant for
merging. 'base' will be used as the merge base. merging. 'base' will be used as the merge base.
Copytracing is used in commands like rebase, merge, unshelve, etc to merge Copytracing is used in commands like rebase, merge, unshelve, etc to merge

tests/test-copies-unrelated.t

| x | x
| o 2 modify x | o 2 modify x
| | x | | x
| o 1 add x | o 1 add x
|/ x |/ x
o 0 base o 0 base
a a
$ hg debugpathcopies 1 4 $ hg debugpathcopies 1 4
x -> y (no-filelog !)
#if filelog
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2 $ hg graft -r 2
grafting 2:* "modify x" (glob) grafting 2:* "modify x" (glob)
file 'x' was deleted in local [local] but was modified in other [graft]. file 'x' was deleted in local [local] but was modified in other [graft].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [255]
#else
$ hg graft -r 2
grafting 2:* "modify x" (glob)
merging y and x to y
#endif
$ hg co -qC 2 $ hg co -qC 2
$ hg graft -r 4 $ hg graft -r 4
grafting 4:* "rename x to y"* (glob) grafting 4:* "rename x to y"* (glob)
merging x and y to y merging x and y to y
Add x on two branches, with same content but different history, then rename x Add x on two branches, with same content but different history, then rename x
to y on one side. Similar to the case above, here the file's nodeid is to y on one side. Similar to the case above, here the file's nodeid is
different between the branches. different between the branches.
| x | x
| o 2 modify x | o 2 modify x
| | x | | x
| o 1 add x | o 1 add x
|/ x |/ x
o 0 base o 0 base
a a
$ hg debugpathcopies 1 5 $ hg debugpathcopies 1 5
x -> y (no-filelog !)
#if filelog
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2 $ hg graft -r 2
grafting 2:* "modify x" (glob) grafting 2:* "modify x" (glob)
file 'x' was deleted in local [local] but was modified in other [graft]. file 'x' was deleted in local [local] but was modified in other [graft].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [255]
#else
$ hg graft -r 2
grafting 2:* "modify x" (glob)
merging y and x to y
#endif
$ hg co -qC 2 $ hg co -qC 2
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 5 $ hg graft -r 5
grafting 5:* "rename x to y"* (glob) grafting 5:* "rename x to y"* (glob)
file 'x' was deleted in other [graft] but was modified in local [local]. file 'x' was deleted in other [graft] but was modified in local [local].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue

tests/test-copies.t

x x
$ hg debugp1copies -r 3 $ hg debugp1copies -r 3
$ hg debugp2copies -r 3 $ hg debugp2copies -r 3
$ hg debugpathcopies 2 3 $ hg debugpathcopies 2 3
x -> y x -> y
$ hg debugpathcopies 1 3 $ hg debugpathcopies 1 3
x -> z x -> z
Copy x to y on one side of merge, create y and rename to z on the other side. Pathcopies from the Copy x to y on one side of merge, create y and rename to z on the other side.
first side should not include the y->z rename since y didn't exist in the merge base.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ hg cp x y $ hg cp x y
$ hg ci -qm 'copy x to y' $ hg ci -qm 'copy x to y'
$ hg co -q 0 $ hg co -q 0
$ echo y > y $ echo y > y
$ hg ci -Aqm 'add y' $ hg ci -Aqm 'add y'
o 0 add x o 0 add x
x x
$ hg debugp1copies -r 3 $ hg debugp1copies -r 3
y -> z y -> z
$ hg debugp2copies -r 3 $ hg debugp2copies -r 3
$ hg debugpathcopies 2 3 $ hg debugpathcopies 2 3
y -> z y -> z
$ hg debugpathcopies 1 3 $ hg debugpathcopies 1 3
y -> z (no-filelog !)
Create x and y, then rename x to z on one side of merge, and rename y to z and Create x and y, then rename x to z on one side of merge, and rename y to z and
modify z on the other side. When storing copies in the changeset, we don't modify z on the other side. When storing copies in the changeset, we don't
filter out copies whose target was created on the other side of the merge. filter out copies whose target was created on the other side of the merge.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ hg ci -Aqm 'add x and y' $ hg ci -Aqm 'add x and y'