This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10350

test-copies: test that copies' sidedata can get computed during push
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGbc7bdca15e47: test-copies: test that copies' sidedata can get computed during push
Summary

If the source of the push does not have the necessary sidedata but the server
needs them, the client should compute them on the fly while pushing.

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

Alphare created this revision.Apr 9 2021, 4:50 AM
Alphare updated this revision to Diff 26785.Apr 10 2021, 3:15 PM
Alphare updated this revision to Diff 27042.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 27311.May 3 2021, 6:07 AM

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

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

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

marmoute added a commit: rHGbc7bdca15e47: test-copies: test that copies' sidedata can get computed during push.May 5 2021, 6:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbc7bdca15e47: test-copies: test that copies' sidedata can get computed during push (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 (35 lines)

Diff 27614

tests/test-copies-chain-merge.t

#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push pull-upgrade #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push pull-upgrade push-upgrade
===================================================== =====================================================
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 push #if push
$ 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-upgrade #if pull-upgrade
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-use-side-data = no > exp-use-side-data = no
> exp-use-copies-side-data-changeset = no > exp-use-copies-side-data-changeset = no
> [experimental] > [experimental]
> changegroup4 = yes > changegroup4 = yes
> EOF > EOF
#endif #endif
#if push-upgrade
$ cat >> $HGRCPATH << EOF
> [format]
> exp-use-side-data = no
> exp-use-copies-side-data-changeset = no
> [experimental]
> changegroup4 = 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).
> EOF > EOF
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 80 changesets with 44 changes to 25 files (+39 heads) added 80 changesets with 44 changes to 25 files (+39 heads)
$ cd ../repo-chain $ cd ../repo-chain
#endif #endif
#if push-upgrade
$ cat >> $HGRCPATH << EOF
> [format]
> exp-use-side-data = yes
> exp-use-copies-side-data-changeset = yes
> [experimental]
> changegroup4 = yes
> EOF
$ cd ..
$ mv repo-chain repo-source
$ hg init repo-chain
$ cd repo-source
$ hg push ../repo-chain
pushing to ../repo-chain
searching for changes
adding changesets
adding manifests
adding file changes
added 80 changesets with 44 changes to 25 files (+39 heads)
$ cd ../repo-chain
#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, ;
added : q, ; added : q, ;