This is an archive of the discontinued Mercurial Phabricator instance.

side-data: add a test to check sidedata upgrade
ClosedPublic

Authored by marmoute on Sep 30 2020, 9:10 AM.

Download Raw Diff

Details

Reviewers

Alphare
pulkit

Group Reviewers

hg-reviewers

Commits

rHG8cebc4c13978: side-data: add a test to check sidedata upgrade
rHG4645f4938c28: side-data: add a test to check sidedata upgrade
rHGa193945816fe: side-data: add a test to check sidedata upgrade

Summary

We want to make sure that sidedata computed at commit time and during upgrade
are the same. To do so, we upgrade the repository in test-copies-chain-merge.t
since the file is checking all the special case that we need to catch. The
sidedata content in both case should be the same.

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

marmoute created this revision.Sep 30 2020, 9:10 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 30 2020, 9:10 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D9125: changing-files: add a debug command display changed files.Sep 30 2020, 9:11 AM

Alphare accepted this revision.Oct 2 2020, 5:26 AM

pulkit accepted this revision.Oct 7 2020, 8:07 AM

This revision is now accepted and ready to land.Oct 7 2020, 8:07 AM

marmoute added a commit: rHGa193945816fe: side-data: add a test to check sidedata upgrade.Oct 8 2020, 11:23 AM

Closed by commit rHGa193945816fe: side-data: add a test to check sidedata upgrade (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute added a commit: rHG4645f4938c28: side-data: add a test to check sidedata upgrade.Oct 8 2020, 12:17 PM

marmoute added a commit: rHG8cebc4c13978: side-data: add a test to check sidedata upgrade.Oct 9 2020, 2:28 AM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-copies-chain-merge.t (181 lines)

Status	Author	Revision
Closed	marmoute	D9113 copies: rename some function to the new naming scheme
Closed	marmoute	D9112 changing-files: cache the various property
Closed	marmoute	D9111 changing-files: always use `mark_touched` to update the touched set
Closed	marmoute	D9141 copies: move `merged` testing sooner
Closed	marmoute	D9140 copies: return None instead of ChangingFiles when relevant
Closed	marmoute	D9139 copies: add a HASCOPIESINFO flag to highlight rev with useful data
Closed	marmoute	D9130 salvaged: properly deal with salvaged file during copy tracing
Closed	marmoute	D9129 salvaged: persist the salvaged set on disk
Closed	marmoute	D9128 changing-files: add clean computation of changed file for merges
Closed	marmoute	D9127 changing-files: add clean computation of changed files for linear changesets
Closed	marmoute	D9126 changing-files: add clean computation of changed files for roots
Closed	marmoute	D9125 changing-files: add a debug command display changed files
Closed	marmoute	D9124 side-data: add a test to check sidedata upgrade
Closed	marmoute	D9123 changing-files: split the changing files computation from encoding
Closed	marmoute	D9120 salvaged: record salvaged in ChangingFiles at commit time
Closed	marmoute	D9119 salvaged: track removal-candidates in more cases
Closed	marmoute	D9122 salvaged: explicitly skip salvaged file while encoding
Closed	marmoute	D9118 changing-files: add a "salvaged" set to track file that were not removed
Closed	marmoute	D9117 copies: directly pass a changes object to the copy tracing code
Closed	marmoute	D9116 copies: no longer change the sidedata flag
Closed	marmoute	D9115 copies: use dedicated `_revinfo_getter` function and call
Closed	marmoute	D9114 copies: make two version of the changeset centric algorithm
Closed	marmoute	D9092 changing-files: retrieve changelogrevision.files from the sidedata block
Closed	marmoute	D9091 changing-files: drop the now useless changelogrevision argument
Closed	marmoute	D9090 changing-files: rework the way we store changed files in side-data
Closed	marmoute	D9143 changing-files: fix docstring

Diff 23088

tests/test-copies-chain-merge.t

	M b			M b
	A d			A d
	$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'			$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'
	M b			M b
	A d			A d
	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")'			$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-revert-m-0")'
	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")'			$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-revert-m-0")'


				Test that sidedata computations during upgrades ares correct
				============================================================

				We upgrade a repository that is not using sidedata (the filelog case) and
				check that the same side data have been generated as if they were computed at
				commit time.


				#if filelog
				$ cat >> $HGRCPATH << EOF
				> [format]
				> exp-use-side-data = yes
				> exp-use-copies-side-data-changeset = yes
				> EOF
				$ hg debugformat -v
				format-variant repo config default
				fncache: yes yes yes
				dotencode: yes yes yes
				generaldelta: yes yes yes
				sparserevlog: yes yes yes
				sidedata: no yes no
				persistent-nodemap: no no no
				copies-sdc: no yes no
				plain-cl-delta: yes yes yes
				compression: * (glob)
				compression-level: default default default
				$ hg debugupgraderepo --run --quiet
				upgrade will perform the following actions:

				requirements
				preserved: * (glob)
				added: exp-copies-sidedata-changeset, exp-sidedata-flag

				#endif


				#if no-compatibility

				$ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do
				> echo "##### revision $rev #####"
				> hg debugsidedata -c -v -- $rev
				> done
				##### revision 0 #####
				1 sidedata entries
				entry-0014 size 34
				'\x00\x00\x00\x03\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00abh'
				##### revision 1 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ac'
				##### revision 2 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00cd'
				##### revision 3 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de'
				##### revision 4 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ef'
				##### revision 5 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00b'
				##### revision 6 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 7 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x0c\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 8 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 9 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00bg'
				##### revision 10 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg'
				##### revision 11 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 12 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 13 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 14 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 15 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 16 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x04\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 17 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 18 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 19 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
				##### revision 20 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
				##### revision 21 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi'
				##### revision 22 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x02\x16\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00di'
				##### revision 23 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 24 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 25 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 26 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 27 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 28 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 29 #####
				1 sidedata entries
				entry-0014 size 14
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d'
				##### revision 30 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 31 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 32 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 33 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'

				#endif

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22944		Sep 30 2020, 9:10 AM	★	★
Diff 2	23088	rHGa193945816fe58df32a3eabcb68feff65deda505	Sep 29 2020, 5:16 PM	★	★