This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6351

tests: update annotate tests to work around simplemerge bug
ClosedPublic

Authored by martinvonz on May 7 2019, 1:25 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGd5b35d6972a5: tests: update annotate tests to work around simplemerge bug
Summary

test-annotate.t and test-fastannotate.hg were failing with --pure
since 57203e0210f8 (copies: calculate mergecopies() based on
pathcopies(), 2019-04-11). It turned out to be because the pure file
merge code behaved differently. I'm guessing it's the
mdiff.get_matching_blocks() that behaves differently, but I haven't
confirmed that.

With this content in the base:

a
a
a

And this on the local side:

a
z
a

And this on the other side:

a
a
a
b4
c
b6

It produced this conflict:

a
z
a
<<<<<<< working copy: b80e3e32f75a - test: c
||||||| base
a
=======
a
b4
c
b5
>>>>>>> merge rev:    64afcdf8e29e - test: mergeb

I don't care enough about the pure Python code to fix it, so this
patch just updates the tests to manually resolve the conflict.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 7 2019, 1:25 AM
martinvonz planned changes to this revision.May 7 2019, 1:28 AM
martinvonz added inline comments.
tests/test-fastannotate-hg.t
375–377

Hmm, I didn't notice this part until now. I guess I'll have to update this too.

martinvonz edited the summary of this revision. (Show Details)May 7 2019, 11:46 AM
martinvonz updated this revision to Diff 15035.
martinvonz added a comment.May 7 2019, 12:09 PM

This is now ready

Closed by commit rHGd5b35d6972a5: tests: update annotate tests to work around simplemerge bug (authored by martinvonz). · Explain WhyMay 7 2019, 7:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-annotate.t (21 lines)
Mtests/test-fastannotate-hg.t (21 lines)

Diff 15035

tests/test-annotate.t

$ 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
Work around the pure version not resolving the conflict like native code
#if pure
$ hg merge
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
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 <<EOF > b
> a
> z
> a
> b4
> c
> b5
> EOF
$ hg resolve -m b
(no more unresolved files)
$ rm b.orig
#else
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
#endif
$ 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

tests/test-fastannotate-hg.t

$ 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
Work around the pure version not resolving the conflict like native code
#if pure
$ hg merge
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
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 <<EOF > b
> a
> z
> a
> b4
> c
> b5
> EOF
$ hg resolve -m b
(no more unresolved files)
$ rm b.orig
#else
$ hg merge $ hg merge
merging b merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
#endif
$ 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
| a | a | a | +z | | a | a | a | +z |
| | | -a | a | | | | -a | a |
|-------------------| |-------------------|
| a | a | a | | a | a | a |
| a | a | a | | a | a | a |
| a | | -a | | a | | -a |
this leads to more question marks below) this leads to more question marks below)
(rev 1 adds two "a"s and rev 6 deletes one "a". (rev 1 adds two "a"s and rev 6 deletes one "a".
the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1. the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1.
and that causes the line number difference) and that causes the line number difference)
martinvonzAuthorUnsubmitted
Not Done

Hmm, I didn't notice this part until now. I guess I'll have to update this too.

martinvonz: Hmm, I didn't notice this part until now. I guess I'll have to update this too.
$ hg annotate -nlf b --config fastannotate.modes= $ hg annotate -nlf b --config fastannotate.modes=
0 a:1: a 0 a:1: a
6 b:2: z 6 b:2: z
1 a:3: a 1 a:3: a
3 b:4: b4 3 b:4: b4
4 b:5: c 4 b:5: c
3 b:5: b5 3 b:5: b5