This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6252

tests: make merge conflicts explicit in `hg annotate` tests
ClosedPublic

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

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7116fc614cfc: tests: make merge conflicts explicit in `hg annotate` tests
Summary

We were using true as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".

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.Apr 16 2019, 1:16 PM
marmoute accepted this revision.Apr 17 2019, 4:36 PM
marmoute added a subscriber: marmoute.

This one seems simple and sensible.

pulkit accepted this revision.Apr 17 2019, 5:18 PM
Closed by commit rHG7116fc614cfc: tests: make merge conflicts explicit in `hg annotate` tests (authored by martinvonz). · Explain WhyApr 17 2019, 6:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14815

tests/test-annotate.t

$ HGMERGE=true; export HGMERGE $ cat >> "$HGRCPATH" << EOF
> [ui]
> merge = :merge3
> EOF
init init
$ hg init repo $ hg init repo
$ cd repo $ cd repo
commit commit
> b4 > b4
> c > c
> b5 > b5
> EOF > EOF
$ hg ci -mb2.1 -d '2 0' $ hg ci -mb2.1 -d '2 0'
created new head created new head
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat b
a
a
a
<<<<<<< working copy: 5fbdc1152d97 - test: b2.1
b4
c
b5
||||||| base
=======
b4
b5
b6
>>>>>>> merge rev: 37ec9f5c3d1f - test: b2
$ cat <<EOF > b
> a
> a
> a
> b4
> c
> b5
> EOF
$ hg resolve --mark -q
$ rm b.orig
$ hg ci -mmergeb -d '3 0' $ hg ci -mmergeb -d '3 0'
annotate after merge annotate after merge
$ hg annotate -nf b $ hg annotate -nf b
0 a: a 0 a: a
1 a: a 1 a: a
1 a: a 1 a: a
$ hg cp a b $ hg cp a b
$ cat <<EOF > b $ cat <<EOF > b
> a > a
> z > z
> a > a
> EOF > EOF
$ hg ci -mc -d '3 0' $ hg ci -mc -d '3 0'
created new head created new head
BROKEN: 'a' was copied to 'b' on both sides. We should not get a merge conflict here
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
$ cat <<EOF >> b use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat b
<<<<<<< working copy: b80e3e32f75a - test: c
a
z
a
||||||| base
=======
a
a
a
b4
c
b5
>>>>>>> merge rev: 64afcdf8e29e - test: mergeb
$ cat <<EOF > b
> a
> z
> a
> b4 > b4
> c > c
> b5 > b5
> EOF > EOF
$ hg resolve --mark -q
$ rm b.orig
$ echo d >> b $ echo d >> b
$ hg ci -mmerge2 -d '4 0' $ hg ci -mmerge2 -d '4 0'
annotate after rename merge annotate after rename merge
$ hg annotate -nf b $ hg annotate -nf b
0 a: a 0 a: a
6 b: z 6 b: z
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
16: baz:0 16: baz:0
19: baz:3 19: baz:3
20: baz:4 20: baz:4
24: baz:3->3+ 24: baz:3->3+
27: baz:3+->3- 27: baz:3+->3-
$ hg merge 25 $ hg merge 25
merging baz and qux to qux merging baz and qux to qux
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging qux! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat qux
0
0
1 baz:1
2 baz:2
<<<<<<< working copy: 863de62655ef - test: baz:3+->3-
3- baz:3
4 baz:4
||||||| base
3+ baz:3
4 baz:4
=======
3+ baz:3
4+ baz:4
>>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+
5
6
7
$ cat > qux <<EOF
> 0
> 0
> 1 baz:1
> 2 baz:2
> 3- baz:3
> 4 baz:4
> 5
> 6
> 7
> EOF
$ hg resolve --mark -q
$ rm qux.orig
$ hg ci -m merge $ hg ci -m merge
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
16: baz:0 16: baz:0
19: baz:3 19: baz:3
20: baz:4 20: baz:4
24: baz:3->3+ 24: baz:3->3+
25: qux:4->4+ 25: qux:4->4+
27: baz:3+->3- 27: baz:3+->3-
28: merge 28: merge
$ hg up 25 --quiet $ hg up 25 --quiet
$ hg merge 27 $ hg merge 27
merging qux and baz to qux merging qux and baz to qux
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging qux! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat qux
0
0
1 baz:1
2 baz:2
<<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
3+ baz:3
4+ baz:4
||||||| base
3+ baz:3
4 baz:4
=======
3- baz:3
4 baz:4
>>>>>>> merge rev: 863de62655ef - test: baz:3+->3-
5
6
7
$ cat > qux <<EOF
> 0
> 0
> 1 baz:1
> 2 baz:2
> 3+ baz:3
> 4+ baz:4
> 5
> 6
> EOF
$ hg resolve --mark -q
$ rm qux.orig
$ hg ci -m 'merge from other side' $ hg ci -m 'merge from other side'
created new head created new head
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
16: baz:0 16: baz:0
19: baz:3 19: baz:3
20: baz:4 20: baz:4
24: baz:3->3+ 24: baz:3->3+
25: qux:4->4+ 25: qux:4->4+
$ echo 2 >> a $ echo 2 >> a
$ hg commit -m 2 $ hg commit -m 2
$ echo a > a $ echo a > a
$ hg commit -m a $ hg commit -m a
$ hg update '.^' -q $ hg update '.^' -q
$ echo 3 >> a $ echo 3 >> a
$ hg commit -m 3 -q $ hg commit -m 3 -q
$ hg merge 2 -q $ hg merge 2 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
<<<<<<< working copy: 0a068f0261cf - test: 3
1
2
3
||||||| base
1
2
=======
a
>>>>>>> merge rev: 9409851bc20a - test: a
$ cat > a << EOF $ cat > a << EOF
> b > b
> 1 > 1
> 2 > 2
> 3 > 3
> a > a
> EOF > EOF
$ hg resolve --mark -q $ hg resolve --mark -q
$ rm a.orig
$ hg commit -m m $ hg commit -m m
$ hg annotate a $ hg annotate a
4: b 4: b
0: 1 0: 1
1: 2 1: 2
3: 3 3: 3
2: a 2: a
$ cd .. $ cd ..

tests/test-fastannotate-hg.t

(this file is backported from core hg tests/test-annotate.t) (this file is backported from core hg tests/test-annotate.t)
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui]
> merge = :merge3
> [diff] > [diff]
> git=1 > git=1
> [extensions] > [extensions]
> fastannotate= > fastannotate=
> [fastannotate] > [fastannotate]
> modes=fctx > modes=fctx
> forcefollow=False > forcefollow=False
> mainbranch=. > mainbranch=.
> EOF > EOF
$ HGMERGE=true; export HGMERGE
init init
$ hg init repo $ hg init repo
$ cd repo $ cd repo
commit commit
$ echo 'a' > a $ echo 'a' > a
> b4 > b4
> c > c
> b5 > b5
> EOF > EOF
$ hg ci -mb2.1 -d '2 0' $ hg ci -mb2.1 -d '2 0'
created new head created new head
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat b
a
a
a
<<<<<<< working copy: 5fbdc1152d97 - test: b2.1
b4
c
b5
||||||| base
=======
b4
b5
b6
>>>>>>> merge rev: 37ec9f5c3d1f - test: b2
$ cat <<EOF > b
> a
> a
> a
> b4
> c
> b5
> EOF
$ hg resolve --mark -q
$ rm b.orig
$ hg ci -mmergeb -d '3 0' $ hg ci -mmergeb -d '3 0'
annotate after merge annotate after merge
(note: the first one falls back to the vanilla annotate which does not use linelog) (note: the first one falls back to the vanilla annotate which does not use linelog)
$ hg annotate -nf b --debug $ hg annotate -nf b --debug
fastannotate: b: rebuilding broken cache fastannotate: b: rebuilding broken cache
fastannotate: b: 5 new changesets in the main branch fastannotate: b: 5 new changesets in the main branch
$ hg cp a b $ hg cp a b
$ cat <<EOF > b $ cat <<EOF > b
> a > a
> z > z
> a > a
> EOF > EOF
$ hg ci -mc -d '3 0' $ hg ci -mc -d '3 0'
created new head created new head
BROKEN: 'a' was copied to 'b' on both sides. We should not get a merge conflict here
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
(branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
$ cat <<EOF >> b use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat b
<<<<<<< working copy: b80e3e32f75a - test: c
a
z
a
||||||| base
=======
a
a
a
b4
c
b5
>>>>>>> merge rev: 64afcdf8e29e - test: mergeb
$ cat <<EOF > b
> a
> z
> a
> b4 > b4
> c > c
> b5 > b5
> EOF > EOF
$ hg resolve --mark -q
$ rm b.orig
$ echo d >> b $ echo d >> b
$ hg ci -mmerge2 -d '4 0' $ hg ci -mmerge2 -d '4 0'
annotate after rename merge annotate after rename merge
$ hg annotate -nf b $ hg annotate -nf b
0 a: a 0 a: a
6 b: z 6 b: z
$ echo 2 >> a $ echo 2 >> a
$ hg commit -m 2 $ hg commit -m 2
$ echo a > a $ echo a > a
$ hg commit -m a $ hg commit -m a
$ hg update '.^' -q $ hg update '.^' -q
$ echo 3 >> a $ echo 3 >> a
$ hg commit -m 3 -q $ hg commit -m 3 -q
$ hg merge 2 -q $ hg merge 2 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
<<<<<<< working copy: 0a068f0261cf - test: 3
1
2
3
||||||| base
1
2
=======
a
>>>>>>> merge rev: 9409851bc20a - test: a
$ cat > a << EOF $ cat > a << EOF
> b > b
> 1 > 1
> 2 > 2
> 3 > 3
> a > a
> EOF > EOF
$ hg resolve --mark -q $ hg resolve --mark -q
$ rm a.orig
$ hg commit -m m $ hg commit -m m
$ hg annotate a $ hg annotate a
4: b 4: b
0: 1 0: 1
1: 2 1: 2
3: 3 3: 3
2: a 2: a
$ cd .. $ cd ..

tests/test-fastannotate-perfhack.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> fastannotate= > fastannotate=
> [fastannotate] > [fastannotate]
> perfhack=1 > perfhack=1
> EOF > EOF
$ HGMERGE=true; export HGMERGE
$ hg init repo $ hg init repo
$ cd repo $ cd repo
a simple merge case a simple merge case
$ echo 1 > a $ echo 1 > a
$ hg commit -qAm 'append 1' $ hg commit -qAm 'append 1'
$ echo 2 >> a $ echo 2 >> a

tests/test-fastannotate-protocol.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> ssh = "$PYTHON" "$TESTDIR/dummyssh" > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [extensions] > [extensions]
> fastannotate= > fastannotate=
> [fastannotate] > [fastannotate]
> mainbranch=@ > mainbranch=@
> EOF > EOF
$ HGMERGE=true; export HGMERGE
setup the server repo setup the server repo
$ hg init repo-server $ hg init repo-server
$ cd repo-server $ cd repo-server
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [fastannotate] > [fastannotate]
> server=1 > server=1
> EOF > EOF

tests/test-fastannotate.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> fastannotate= > fastannotate=
> EOF > EOF
$ HGMERGE=true; export HGMERGE
$ hg init repo $ hg init repo
$ cd repo $ cd repo
a simple merge case a simple merge case
$ echo 1 > a $ echo 1 > a
$ hg commit -qAm 'append 1' $ hg commit -qAm 'append 1'
$ echo 2 >> a $ echo 2 >> a