This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10903

censor: migrate the logic to a set of `censor_revs`
ClosedPublic

Authored by marmoute on Jun 22 2021, 7:27 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHGc81a5297f185: censor: migrate the logic to a set of `censor_revs`

Summary

Instead of considering a special unique censored revision within the code, we
consider a set of revision (currently always of size 1). This make the main code
less censor-centric and prepare for the usage of a similar approach for
stripping changesets.

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.Jun 22 2021, 7:27 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJun 22 2021, 7:27 PM

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

marmoute added a child revision: D10904: censor: split the core of the logic into its own function.Jun 22 2021, 7:27 PM

Alphare accepted this revision.Jul 1 2021, 4:54 AM

This revision is now accepted and ready to land.Jul 1 2021, 4:54 AM

marmoute added a commit: rHGc81a5297f185: censor: migrate the logic to a set of `censor_revs`.Jul 1 2021, 6:21 AM

Closed by commit rHGc81a5297f185: censor: migrate the logic to a set of `censor_revs` (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/revlogutils/rewrite.py (48 lines)

Status	Author	Revision
Closed	marmoute	D10904 censor: split the core of the logic into its own function
Closed	marmoute	D10903 censor: migrate the logic to a set of `censor_revs`
Closed	marmoute	D10902 censor: rename `rl` to `revlog` in the main function
Closed	marmoute	D10901 censor: extract the part about creating and opening new files in a function
Closed	marmoute	D10900 censor: extract the part about recomputing delta in a function
Closed	marmoute	D10899 censor: extract the part about writing the other revision in a function
Closed	marmoute	D10898 censor: extract the part about writing the censored revision in a function
Closed	marmoute	D10897 censor: put the tuple of open files in an explicit variable
Closed	marmoute	D10896 revlog: rewrite `censors.py` to `rewrite.py`

Diff 28714

mercurial/revlogutils/rewrite.py

	# to be copied as we go and the associated index entry needs adjustement.			# to be copied as we go and the associated index entry needs adjustement.

	assert revlog._format_version != REVLOGV0, revlog._format_version			assert revlog._format_version != REVLOGV0, revlog._format_version
	assert revlog._format_version != REVLOGV1, revlog._format_version			assert revlog._format_version != REVLOGV1, revlog._format_version

	old_index = revlog.index			old_index = revlog.index
	docket = revlog._docket			docket = revlog._docket

	censor_rev = revlog.rev(censornode)			censor_revs = {revlog.rev(censornode)}
	tombstone = storageutil.packmeta({b'censored': tombstone}, b'')			tombstone = storageutil.packmeta({b'censored': tombstone}, b'')

	censored_entry = revlog.index[censor_rev]			first_excl_rev = min(censor_revs)
	index_cutoff = revlog.index.entry_size * censor_rev
	data_cutoff = censored_entry[ENTRY_DATA_OFFSET] >> 16			first_excl_entry = revlog.index[first_excl_rev]
	sidedata_cutoff = revlog.sidedata_cut_off(censor_rev)			index_cutoff = revlog.index.entry_size * first_excl_rev
				data_cutoff = first_excl_entry[ENTRY_DATA_OFFSET] >> 16
				sidedata_cutoff = revlog.sidedata_cut_off(first_excl_rev)

	with pycompat.unnamedtempfile(mode=b"w+b") as tmp_storage:			with pycompat.unnamedtempfile(mode=b"w+b") as tmp_storage:
	# rev → (new_base, data_start, data_end, compression_mode)			# rev → (new_base, data_start, data_end, compression_mode)
	rewritten_entries = _precompute_rewritten_delta(			rewritten_entries = _precompute_rewritten_delta(
	revlog,			revlog,
	old_index,			old_index,
	{censor_rev},			censor_revs,
	tmp_storage,			tmp_storage,
	)			)

	all_files = _setup_new_files(			all_files = _setup_new_files(
	revlog,			revlog,
	index_cutoff,			index_cutoff,
	data_cutoff,			data_cutoff,
	sidedata_cutoff,			sidedata_cutoff,
	)			)

	# we dont need to open the old index file since its content already			# we dont need to open the old index file since its content already
	# exist in a usable form in `old_index`.			# exist in a usable form in `old_index`.
	with all_files() as open_files:			with all_files() as open_files:
	(			(
	old_data_file,			old_data_file,
	old_sidedata_file,			old_sidedata_file,
	new_index_file,			new_index_file,
	new_data_file,			new_data_file,
	new_sidedata_file,			new_sidedata_file,
	) = open_files			) = open_files

	# writing the censored revision			# writing the censored revision

				# Writing all subsequent revisions
				for rev in range(first_excl_rev, len(old_index)):
				if rev in censor_revs:
	_rewrite_censor(			_rewrite_censor(
	revlog,			revlog,
	old_index,			old_index,
	open_files,			open_files,
	censor_rev,			rev,
	tombstone,			tombstone,
	)			)
				else:
	# Writing all subsequent revisions
	for rev in range(censor_rev + 1, len(old_index)):
	_rewrite_simple(			_rewrite_simple(
	revlog,			revlog,
	old_index,			old_index,
	open_files,			open_files,
	rev,			rev,
	rewritten_entries,			rewritten_entries,
	tmp_storage,			tmp_storage,
	)			)
	docket.write(transaction=None, stripping=True)			docket.write(transaction=None, stripping=True)


	def _precompute_rewritten_delta(			def _precompute_rewritten_delta(
	revlog,			revlog,
	old_index,			old_index,
	excluded_revs,			excluded_revs,
	tmp_storage,			tmp_storage,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28682		Jun 22 2021, 7:27 PM	★	★
Diff 2	28714	rHGc81a5297f185c22d47e285b8eb7e8617039a0d85	Jun 22 2021, 5:20 PM	★	★