( )⚙ D10347 test-copies: test that copies' sidedata does not get corrupted during pull

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10347

test-copies: test that copies' sidedata does not get corrupted during pull
ClosedPublic

Authored by Alphare on Apr 9 2021, 4:50 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG573d817bcc1f: test-copies: test that copies' sidedata does not get corrupted during pull
Summary

This is an important usecase.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Apr 9 2021, 4:50 AM
Alphare updated this revision to Diff 27039.Apr 19 2021, 6:10 AM
marmoute accepted this revision.Apr 22 2021, 1:55 PM
marmoute added a subscriber: marmoute.

Same as D10352 and D10353, I am the author of the initial version of this patch, but @Alphare did the finalisation. So I guess we had two independant pair of eyes looking at this and I going to put a green mark on it.

baymax updated this revision to Diff 27308.May 3 2021, 6:07 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27458.May 3 2021, 9:01 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG573d817bcc1f: test-copies: test that copies' sidedata does not get corrupted during pull.May 5 2021, 6:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG573d817bcc1f: test-copies: test that copies' sidedata does not get corrupted during pull (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 27308

tests/test-copies-chain-merge.t

#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull
===================================================== =====================================================
Test Copy tracing for chain of copies involving merge Test Copy tracing for chain of copies involving merge
===================================================== =====================================================
This test files covers copies/rename case for a chains of commit where merges This test files covers copies/rename case for a chains of commit where merges
are involved. It cheks we do not have unwanted update of behavior and that the are involved. It cheks we do not have unwanted update of behavior and that the
different options to retrieve copies behave correctly. different options to retrieve copies behave correctly.
#if sidedata #if sidedata
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-use-side-data = yes > exp-use-side-data = yes
> exp-use-copies-side-data-changeset = yes > exp-use-copies-side-data-changeset = yes
> EOF > EOF
#endif #endif
#if pull
$ cat >> $HGRCPATH << EOF
> [format]
> exp-use-side-data = yes
> exp-use-copies-side-data-changeset = yes
> EOF
#endif
$ cat > same-content.txt << EOF $ cat > same-content.txt << EOF
> Here is some content that will be the same accros multiple file. > Here is some content that will be the same accros multiple file.
> >
> This is done on purpose so that we end up in some merge situation, were the > This is done on purpose so that we end up in some merge situation, were the
> resulting content is the same as in the parent(s), but a new filenodes still > resulting content is the same as in the parent(s), but a new filenodes still
> need to be created to record some file history information (especially > need to be created to record some file history information (especially
> about copies). > about copies).
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
#endif #endif
#if pull
$ cd ..
$ mv repo-chain repo-source
$ hg init repo-chain
$ cd repo-chain
$ hg pull ../repo-source
pulling from ../repo-source
requesting all changes
adding changesets
adding manifests
adding file changes
added 80 changesets with 44 changes to 25 files (+39 heads)
new changesets a3a31bbefea6:908ce9259ffa
(run 'hg heads' to see heads, 'hg merge' to merge)
#endif
#if no-compatibility no-filelog no-changeset #if no-compatibility no-filelog no-changeset
$ hg debugchangedfiles --compute 0 $ hg debugchangedfiles --compute 0
added : a, ; added : a, ;
added : b, ; added : b, ;
added : h, ; added : h, ;
added : p, ; added : p, ;