This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6242

tests: add test for issue5343 (grafting with copies)
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7815cf0ea88b: tests: add test for issue5343 (grafting with copies)
Summary

It seems that issue5353 resulted in a lot of tests in test-graft.t,
but the bug actually reported in that issue didn't get a test
case. This patch adds one for the "move" and one for the "copy"
version of it. I also added a "copy+modify" case, to show what should
be a merge conflict. I didn't add one for the "backwards" version of
it since the comment says that that was already covered by previous
work.

The tests added by this patch show the broken behavior (the bug is
still open). I suspect the results returned from mergecopies() are not
expressive enough to fix this issue: it has a dict for copies to merge
with, but that can only give one more filename, but here we need two
(one for the path on the remote side and one for the path in the merge
base). I want to have it tested anyway since I'm about to refactor
mergecopies().

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mtests/test-graft.t (393 lines)

Diff 14770

tests/test-graft.t

divergence. The code doesn't distinguish at all between these two cases, since divergence. The code doesn't distinguish at all between these two cases, since
the end result of them is the same: an incomplete divergence joined with an the end result of them is the same: an incomplete divergence joined with an
incomplete rename into a divergence. incomplete rename into a divergence.
Finally, A.6 records a divergence entirely in the c2 pass. Finally, A.6 records a divergence entirely in the c2 pass.
A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all. A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge. A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
A.5 has issue5343 as a special case. A.5 has issue5343 as a special case.
TODO: add test coverage for A.5
A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
incomplete divergence, which is in fact complete. This is handled later in incomplete divergence, which is in fact complete. This is handled later in
mergecopies. mergecopies.
A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b, A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b,
a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting, a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting,
the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base
case, a<-b<-c->a is treated the same as a<-b<-b->a). case, a<-b<-c->a is treated the same as a<-b<-b->a).
$ hg up -q "min(desc("A0"))" $ hg up -q "min(desc("A0"))"
$ hg mv f1a f1e $ hg mv f1a f1e
$ echo c2e > f2a $ echo c2e > f2a
$ hg mv f3a f3e $ hg mv f3a f3e
$ hg mv f4a f4e $ hg mv f4a f4e
$ hg mv f5a f5b $ hg mv f5a f5b
$ hg ci -qAm "E0" $ hg ci -qAm "E0"
$ hg up -q "min(desc("A0"))"
$ hg cp f1a f1f
$ hg ci -qAm "F0"
$ hg up -q "min(desc("A0"))"
$ hg cp f1a f1g
$ echo c1g > f1g
$ hg ci -qAm "G0"
$ hg log -G $ hg log -G
@ changeset: 6:6bd1736cab86 @ changeset: 8:ba67f08fb15a
| tag: tip | tag: tip
| parent: 0:11f7a1b56675 | parent: 0:11f7a1b56675
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: G0
|
| o changeset: 7:d376ab0d7fda
|/ parent: 0:11f7a1b56675
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: F0
|
| o changeset: 6:6bd1736cab86
|/ parent: 0:11f7a1b56675
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: E0 | summary: E0
| |
| o changeset: 5:560daee679da | o changeset: 5:560daee679da
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: D1 | | summary: D1
| | | |
| o changeset: 4:c9763722f9bd | o changeset: 4:c9763722f9bd
|/ parent: 0:11f7a1b56675 |/ parent: 0:11f7a1b56675
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: A0 summary: A0
Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x), Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x),
and A.3 with a local content change to be preserved (f2x). and A.3 with a local content change to be preserved (f2x).
$ hg up -q "desc("E0")"
$ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit $ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit
grafting 2:f58c7e2b28fa "C0" grafting 2:f58c7e2b28fa "C0"
merging f1e and f1b to f1e merging f1e and f1b to f1e
merging f2a and f2c to f2c merging f2a and f2c to f2c
merging f5b and f5a to f5a merging f5b and f5a to f5a
Test the cases A.1 (f4x) and A.7 (f3x). Test the cases A.1 (f4x) and A.7 (f3x).
$ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
grafting 3:b69f5839d2d9 "D0" grafting 3:b69f5839d2d9 "D0"
note: possible conflict - f3b was renamed multiple times to: note: possible conflict - f3b was renamed multiple times to:
f3d f3d
f3e f3e
merging f4e and f4a to f4e merging f4e and f4a to f4e
warning: can't find ancestor for 'f3d' copied from 'f3b'! warning: can't find ancestor for 'f3d' copied from 'f3b'!
$ hg cat f2c
c2e
Test the case A.5 (move case, f1x).
$ hg up -q "desc("C0")"
BROKEN: Shouldn't get the warning about missing ancestor
$ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit
grafting 6:6bd1736cab86 "E0"
note: possible conflict - f1a was renamed multiple times to:
f1b
f1e
note: possible conflict - f3a was renamed multiple times to:
f3b
f3e
merging f2c and f2a to f2c
merging f5a and f5b to f5b
warning: can't find ancestor for 'f1e' copied from 'f1a'!
warning: can't find ancestor for 'f3e' copied from 'f3a'!
$ cat f1e
c1a
Test the case A.5 (copy case, f1x).
$ hg up -q "desc("C0")"
BROKEN: Shouldn't get the warning about missing ancestor
$ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit
grafting 7:d376ab0d7fda "F0"
warning: can't find ancestor for 'f1f' copied from 'f1a'!
BROKEN: f1f should be marked a copy from f1b
$ hg st --copies --change .
A f1f
BROKEN: f1f should have the new content from f1b (i.e. "c1c")
$ cat f1f
c1a
Test the case A.5 (copy+modify case, f1x).
$ hg up -q "desc("C0")"
BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0
(content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content
"c1a")
$ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit
grafting 8:ba67f08fb15a "G0"
warning: can't find ancestor for 'f1g' copied from 'f1a'!
Check the results of the grafts tested Check the results of the grafts tested
$ hg log -CGv --patch --git $ hg log -CGv --patch --git
@ changeset: 8:93ee502e8b0a @ changeset: 13:ef3adf6c20a4
| tag: tip | tag: tip
| parent: 2:f58c7e2b28fa
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| files: f3d f4e | files: f1g
| description: | description:
| D2 | G1
| |
| |
| diff --git a/f3d b/f3d | diff --git a/f1g b/f1g
| new file mode 100644 | new file mode 100644
| --- /dev/null | --- /dev/null
| +++ b/f3d | +++ b/f1g
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@
| +c3a | +c1g
| diff --git a/f4e b/f4e
| --- a/f4e
| +++ b/f4e
| @@ -1,1 +1,1 @@
| -c4a
| +c4d
| |
o changeset: 7:539cf145f496 | o changeset: 12:b5542d755b54
|/ parent: 2:f58c7e2b28fa
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| files: f1e f2a f2c f5a f5b | files: f1f
| copies: f2c (f2a) f5a (f5b)
| description: | description:
| C2 | F1
| |
| |
| diff --git a/f1e b/f1e | diff --git a/f1f b/f1f
| --- a/f1e | new file mode 100644
| +++ b/f1e | --- /dev/null
| @@ -1,1 +1,1 @@ | +++ b/f1f
| -c1a | @@ -0,0 +1,1 @@
| +c1c | +c1a
| diff --git a/f2a b/f2c
| rename from f2a
| rename to f2c
| diff --git a/f5b b/f5a
| rename from f5b
| rename to f5a
| --- a/f5b
| +++ b/f5a
| @@ -1,1 +1,1 @@
| -c5a
| +c5c
| |
o changeset: 6:6bd1736cab86 | o changeset: 11:f8a162271246
| parent: 0:11f7a1b56675 |/ parent: 2:f58c7e2b28fa
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| files: f1a f1e f2a f3a f3e f4a f4e f5a f5b | files: f1e f2c f3e f4a f4e f5a f5b
| copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a) | copies: f4e (f4a) f5b (f5a)
| description: | description:
| E0 | E1
| |
| |
| diff --git a/f1a b/f1e | diff --git a/f1e b/f1e
| rename from f1a | new file mode 100644
| rename to f1e | --- /dev/null
| diff --git a/f2a b/f2a | +++ b/f1e
| --- a/f2a | @@ -0,0 +1,1 @@
| +++ b/f2a | +c1a
| diff --git a/f2c b/f2c
| --- a/f2c
| +++ b/f2c
| @@ -1,1 +1,1 @@ | @@ -1,1 +1,1 @@
| -c2a | -c2a
| +c2e | +c2e
| diff --git a/f3a b/f3e | diff --git a/f3e b/f3e
| rename from f3a | new file mode 100644
| rename to f3e | --- /dev/null
| +++ b/f3e
| @@ -0,0 +1,1 @@
| +c3a
| diff --git a/f4a b/f4e | diff --git a/f4a b/f4e
| rename from f4a | rename from f4a
| rename to f4e | rename to f4e
| diff --git a/f5a b/f5b | diff --git a/f5a b/f5b
| rename from f5a | rename from f5a
| rename to f5b | rename to f5b
| |
| o changeset: 5:560daee679da | o changeset: 10:93ee502e8b0a
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | files: f3d f4a | | files: f3d f4e
| | description: | | description:
| | D1 | | D2
| | | |
| | | |
| | diff --git a/f3d b/f3d | | diff --git a/f3d b/f3d
| | new file mode 100644 | | new file mode 100644
| | --- /dev/null | | --- /dev/null
| | +++ b/f3d | | +++ b/f3d
| | @@ -0,0 +1,1 @@ | | @@ -0,0 +1,1 @@
| | +c3a | | +c3a
| | diff --git a/f4a b/f4a | | diff --git a/f4e b/f4e
| | --- a/f4a | | --- a/f4e
| | +++ b/f4a | | +++ b/f4e
| | @@ -1,1 +1,1 @@ | | @@ -1,1 +1,1 @@
| | -c4a | | -c4a
| | +c4d | | +c4d
| | | |
| o changeset: 4:c9763722f9bd | o changeset: 9:539cf145f496
|/ parent: 0:11f7a1b56675 | | parent: 6:6bd1736cab86
| user: test | | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| files: f1a f2a f2c f5a | | files: f1e f2a f2c f5a f5b
| copies: f2c (f2a) | | copies: f2c (f2a) f5a (f5b)
| description: | | description:
| C1 | | C2
| | |
| | |
| diff --git a/f1a b/f1a | | diff --git a/f1e b/f1e
| --- a/f1a | | --- a/f1e
| +++ b/f1a | | +++ b/f1e
| @@ -1,1 +1,1 @@ | | @@ -1,1 +1,1 @@
| -c1a | | -c1a
| +c1c | | +c1c
| diff --git a/f2a b/f2c | | diff --git a/f2a b/f2c
| rename from f2a | | rename from f2a
| rename to f2c | | rename to f2c
| diff --git a/f5a b/f5a | | diff --git a/f5b b/f5a
| --- a/f5a | | rename from f5b
| +++ b/f5a | | rename to f5a
| @@ -1,1 +1,1 @@ | | --- a/f5b
| -c5a | | +++ b/f5a
| +c5c | | @@ -1,1 +1,1 @@
| | | -c5a
| o changeset: 3:b69f5839d2d9 | | +c5c
| |
| | o changeset: 8:ba67f08fb15a
| | | parent: 0:11f7a1b56675
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | files: f1g
| | | copies: f1g (f1a)
| | | description:
| | | G0
| | |
| | |
| | | diff --git a/f1a b/f1g
| | | copy from f1a
| | | copy to f1g
| | | --- a/f1a
| | | +++ b/f1g
| | | @@ -1,1 +1,1 @@
| | | -c1a
| | | +c1g
| | |
| | | o changeset: 7:d376ab0d7fda
| | |/ parent: 0:11f7a1b56675
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | files: f1f
| | | copies: f1f (f1a)
| | | description:
| | | F0
| | |
| | |
| | | diff --git a/f1a b/f1f
| | | copy from f1a
| | | copy to f1f
| | |
| o | changeset: 6:6bd1736cab86
| |/ parent: 0:11f7a1b56675
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | files: f1a f1e f2a f3a f3e f4a f4e f5a f5b
| | copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
| | description:
| | E0
| |
| |
| | diff --git a/f1a b/f1e
| | rename from f1a
| | rename to f1e
| | diff --git a/f2a b/f2a
| | --- a/f2a
| | +++ b/f2a
| | @@ -1,1 +1,1 @@
| | -c2a
| | +c2e
| | diff --git a/f3a b/f3e
| | rename from f3a
| | rename to f3e
| | diff --git a/f4a b/f4e
| | rename from f4a
| | rename to f4e
| | diff --git a/f5a b/f5b
| | rename from f5a
| | rename to f5b
| |
| | o changeset: 5:560daee679da
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | files: f3d f4a
| | | description:
| | | D1
| | |
| | |
| | | diff --git a/f3d b/f3d
| | | new file mode 100644
| | | --- /dev/null
| | | +++ b/f3d
| | | @@ -0,0 +1,1 @@
| | | +c3a
| | | diff --git a/f4a b/f4a
| | | --- a/f4a
| | | +++ b/f4a
| | | @@ -1,1 +1,1 @@
| | | -c4a
| | | +c4d
| | |
| | o changeset: 4:c9763722f9bd
| |/ parent: 0:11f7a1b56675
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | files: f1a f2a f2c f5a
| | copies: f2c (f2a)
| | description:
| | C1
| |
| |
| | diff --git a/f1a b/f1a
| | --- a/f1a
| | +++ b/f1a
| | @@ -1,1 +1,1 @@
| | -c1a
| | +c1c
| | diff --git a/f2a b/f2c
| | rename from f2a
| | rename to f2c
| | diff --git a/f5a b/f5a
| | --- a/f5a
| | +++ b/f5a
| | @@ -1,1 +1,1 @@
| | -c5a
| | +c5c
| |
+---o changeset: 3:b69f5839d2d9
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | files: f3b f3d f4a | | files: f3b f3d f4a
| | copies: f3d (f3b) | | copies: f3d (f3b)
| | description: | | description:
| | D0 | | D0
| | | |
| | | |
| | diff --git a/f3b b/f3d | | diff --git a/f3b b/f3d
| | rename from f3b | | rename from f3b
| | rename to f3d | | rename to f3d
| | diff --git a/f4a b/f4a | | diff --git a/f4a b/f4a
| | --- a/f4a | | --- a/f4a
| | +++ b/f4a | | +++ b/f4a
| | @@ -1,1 +1,1 @@ | | @@ -1,1 +1,1 @@
| | -c4a | | -c4a
| | +c4d | | +c4d
| | | |
| o changeset: 2:f58c7e2b28fa o | changeset: 2:f58c7e2b28fa
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | files: f1b f2a f2c f5a f5b | | files: f1b f2a f2c f5a f5b
| | copies: f2c (f2a) f5a (f5b) | | copies: f2c (f2a) f5a (f5b)
| | description: | | description:
| | C0 | | C0
| | | |
| | | |
| | rename from f5b | | rename from f5b
| | rename to f5a | | rename to f5a
| | --- a/f5b | | --- a/f5b
| | +++ b/f5a | | +++ b/f5a
| | @@ -1,1 +1,1 @@ | | @@ -1,1 +1,1 @@
| | -c5a | | -c5a
| | +c5c | | +c5c
| | | |
| o changeset: 1:3d7bba921b5d o | changeset: 1:3d7bba921b5d
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| files: f1a f1b f3a f3b f5a f5b | files: f1a f1b f3a f3b f5a f5b
| copies: f1b (f1a) f3b (f3a) f5b (f5a) | copies: f1b (f1a) f3b (f3a) f5b (f5a)
| description: | description:
| B0 | B0
| |
| |
+c4a +c4a
diff --git a/f5a b/f5a diff --git a/f5a b/f5a
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/f5a +++ b/f5a
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+c5a +c5a
$ hg cat f2c
c2e
Check superfluous filemerge of files renamed in the past but untouched by graft Check superfluous filemerge of files renamed in the past but untouched by graft
$ echo a > a $ echo a > a
$ hg ci -qAma $ hg ci -qAma
$ hg mv a b $ hg mv a b
$ echo b > b $ echo b > b
$ hg ci -qAmb $ hg ci -qAmb
$ echo c > c $ echo c > c