This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9204

tests: add notes about broken `hg log --follow <file>` with copies in extras
ClosedPublic

Authored by martinvonz on Oct 14 2020, 11:40 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6620caf427ec: tests: add notes about broken `hg log --follow <file>` with copies in extras
Summary

I also removed some unnecessary #if no-changeset where the #else
was the same :P

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.Oct 14 2020, 11:40 AM
martinvonz mentioned this in D9173: tests: run test-copies-chain-merge.t also with copies in changesets.Oct 14 2020, 11:40 AM
martinvonz added a reviewer: marmoute.

I'm happy to let the wait until @marmoute has no more pending patches.

martinvonz updated this revision to Diff 23305.Oct 26 2020, 1:03 PM
martinvonz added a commit: rHG6620caf427ec: tests: add notes about broken `hg log --follow <file>` with copies in extras.Oct 28 2020, 9:58 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6620caf427ec: tests: add notes about broken `hg log --follow <file>` with copies in extras (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (20 lines)

Diff 23332

tests/test-copies-chain-merge.t

0 2 169be882533b 000000000000 000000000000 (no-changeset !) 0 2 169be882533b 000000000000 000000000000 (no-changeset !)
0 2 b789fdd96dc2 000000000000 000000000000 (changeset !) 0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !) 2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !) 2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !)
Log output should not include a merge commit as it did not happen Log output should not include a merge commit as it did not happen
#if no-changeset
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
#else
$ hg log -Gfr 'desc("mBDm-0")' d
o 8 d-2 re-add d
|
~
#endif
#if no-changeset
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
#else
$ hg log -Gfr 'desc("mDBm-0")' d
o 8 d-2 re-add d
|
~
#endif
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
M b M b
A d A d
R a R a
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
M b M b
A d A d
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 22 f-2: rename i -> d o 22 f-2: rename i -> d
| |
o 21 f-1: rename h -> i o 21 f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 22 f-2: rename i -> d o 22 f-2: rename i -> d
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d o 22 f-2: rename i -> d
| |
o 21 f-1: rename h -> i o 21 f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d o 22 f-2: rename i -> d
| |
~ ~
#endif #endif
Merge: Merge:
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 8 d-2 re-add d o | 8 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 8 d-2 re-add d o | 8 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mFGm-0")' d $ hg log -Gfr 'desc("mFGm-0")' d
o 28 mFGm-0 simple merge - one way o 28 mFGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 22 f-2: rename i -> d o | 22 f-2: rename i -> d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
o 29 mGFm-0 simple merge - the other way o 29 mGFm-0 simple merge - the other way
|\ |\
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 22 f-2: rename i -> d o | 22 f-2: rename i -> d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d