This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10915

upgrade_utils: add support for enabling internal phases during upgrade
AbandonedPublic

Authored by Mathiasdm on Jun 28 2021, 8:44 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Summary

This makes it possible to start using internal and archived phases
on an existing repository,
if the following is set in the configuration:

[format]
internal-phase=yes

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

Mathiasdm created this revision.Jun 28 2021, 8:44 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJun 28 2021, 8:44 AM

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

Retracting this one, I notice some test failures I need to have a look at.

In D10915#166889, @Mathiasdm wrote:

Retracting this one, I notice some test failures I need to have a look at.

beware that the feature is not ready for prime time as some remaining issue/question needs to be solved/answered, most notably its interraction with distributed obsolescence. I remember doing a write up about this for the sprint last november but I cannot find it.

It would indeed be interesting to see that writeup. This is the feature we miss the most to be able to enable obsolescence for all our users.
Regarding this change itself: I figured it would not harm to add upgrade-support, as it only becomes visible when the experimental parameter has been set.

In D10915#166892, @Mathiasdm wrote:

It would indeed be interesting to see that writeup. This is the feature we miss the most to be able to enable obsolescence for all our users.
Regarding this change itself: I figured it would not harm to add upgrade-support, as it only becomes visible when the experimental parameter has been set.

How is this related to "enable obsolescence to all users ?"

If obsolescence is enabled, the behaviour of 'strip' is not ideal. What users typically want is the behaviour of 'hg strip --soft', as the regular 'hg strip' makes older revisions visible again.

In D10915#166894, @Mathiasdm wrote:

If obsolescence is enabled, the behaviour of 'strip' is not ideal. What users typically want is the behaviour of 'hg strip --soft', as the regular 'hg strip' makes older revisions visible again.

Which is exactly the kind of behavior with hg strip --soft that will cause probleme with evolution :-D

It looks like your users wants hg prune, do they not ?

It sounded to me like 'hg prune' and 'hg strip --soft' both covered the same use case.

The main benefit to me seemed that 'hg strip --soft' doesn't require me to enable evolve for all our users. I would like to have obsolescence markers for all our users, but without a properly working 'hg strip', that wasn't possible.

Mathiasdm edited the summary of this revision. (Show Details)Jun 28 2021, 11:17 AM

Mathiasdm updated this revision to Diff 28703.

In D10915#166896, @Mathiasdm wrote:

It sounded to me like 'hg prune' and 'hg strip --soft' both covered the same use case.
The main benefit to me seemed that 'hg strip --soft' doesn't require me to enable evolve for all our users.

What are you trying to achive with hg strip --soft that you cannot achieve with evolve. And what are the things blokcing you from enabling evolution for all your users ?

I would like to have obsolescence markers for all our users, but without a properly working 'hg strip', that wasn't possible.

hg strip is properly working. It is doing exactly what it is documented to do :-)

hg strip --soft with evolution -is- not properly working as it is going to hide content, without hiding the associated obsmarkers, leading to indecipherable situation for users. So mixing the two is not the way to go (and one of the reason the feature is still experimental).

In D10915#166900, @marmoute wrote:

In D10915#166896, @Mathiasdm wrote:

It sounded to me like 'hg prune' and 'hg strip --soft' both covered the same use case.
The main benefit to me seemed that 'hg strip --soft' doesn't require me to enable evolve for all our users.

What are you trying to achive with hg strip --soft that you cannot achieve with evolve. And what are the things blokcing you from enabling evolution for all your users ?

We can achieve everything with evolve, but that requires that we provide evolve everywhere and make sure it's in line with the Mercurial version used.
If evolve (or the 'hg prune' part) was shipped with Mercurial, we would probably have it enabled already.

I know that sounds like we just need to get our infrastructure set up to handle this properly (and to some degree, that's correct), but for us, it's just additional hoops to jump through, and more parts of the infrastructure that need to be synced with each other.

(If you like, we can have a call to discuss further.)

I would like to have obsolescence markers for all our users, but without a properly working 'hg strip', that wasn't possible.

hg strip is properly working. It is doing exactly what it is documented to do :-)

Agreed, but it's somewhat confusing for our users.

hg strip --soft with evolution -is- not properly working as it is going to hide content, without hiding the associated obsmarkers, leading to indecipherable situation for users. So mixing the two is not the way to go (and one of the reason the feature is still experimental).

Ok, that makes sense, thanks for clarifying.

Closing this one then.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/upgrade_utils/actions.py (23 lines)

Commit	Parents	Author	Summary	Date
221c8d698c0c	5fa083a5ff04	Mathias De Mare		Jun 28 2021, 8:05 AM

Diff 28702

mercurial/upgrade_utils/actions.py

	b'optimal deltas; new repository data will be '			b'optimal deltas; new repository data will be '
	b'smaller and read times should decrease; '			b'smaller and read times should decrease; '
	b'interacting with other repositories using this '			b'interacting with other repositories using this '
	b'storage model should require less network and '			b'storage model should require less network and '
	b'CPU resources, making "hg push" and "hg pull" '			b'CPU resources, making "hg push" and "hg pull" '
	b'faster'			b'faster'
	)			)

				@registerformatvariant
				class internalphases(requirementformatvariant):
				name = b'internalphases'

				_requirement = requirements.INTERNAL_PHASE_REQUIREMENT

				default = False
				description = _(
				b'older repositories do not support '
				b'internal phases, which makes it impossible to '
				b'use features like "soft strip"'
				)
				upgrademessage = _(
				b'repository will be able to use internal phases, '
				b'making features like "soft strip" possible'
				)

				touches_filelogs = False
				touches_manifests = False
				touches_changelog = False
				touches_requirements = True

	@registerformatvariant			@registerformatvariant
	class sharesafe(requirementformatvariant):			class sharesafe(requirementformatvariant):
	name = b'share-safe'			name = b'share-safe'
	_requirement = requirements.SHARESAFE_REQUIREMENT			_requirement = requirements.SHARESAFE_REQUIREMENT

	default = False			default = False

	requirements.STORE_REQUIREMENT,			requirements.STORE_REQUIREMENT,
	requirements.SPARSEREVLOG_REQUIREMENT,			requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,			requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,			requirements.NODEMAP_REQUIREMENT,
	requirements.SHARESAFE_REQUIREMENT,			requirements.SHARESAFE_REQUIREMENT,
	requirements.REVLOGV2_REQUIREMENT,			requirements.REVLOGV2_REQUIREMENT,
	requirements.CHANGELOGV2_REQUIREMENT,			requirements.CHANGELOGV2_REQUIREMENT,
	requirements.DIRSTATE_V2_REQUIREMENT,			requirements.DIRSTATE_V2_REQUIREMENT,
				requirements.INTERNAL_PHASE_REQUIREMENT,
	}			}
	for name in compression.compengines:			for name in compression.compengines:
	engine = compression.compengines[name]			engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():			if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)			supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':			if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')			supported.add(b'revlog-compression-zstd')
	return supported			return supported
	requirements.SPARSEREVLOG_REQUIREMENT,			requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,			requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,			requirements.NODEMAP_REQUIREMENT,
	requirements.SHARESAFE_REQUIREMENT,			requirements.SHARESAFE_REQUIREMENT,
	requirements.REVLOGV1_REQUIREMENT,			requirements.REVLOGV1_REQUIREMENT,
	requirements.REVLOGV2_REQUIREMENT,			requirements.REVLOGV2_REQUIREMENT,
	requirements.CHANGELOGV2_REQUIREMENT,			requirements.CHANGELOGV2_REQUIREMENT,
	requirements.DIRSTATE_V2_REQUIREMENT,			requirements.DIRSTATE_V2_REQUIREMENT,
				requirements.INTERNAL_PHASE_REQUIREMENT,
	}			}
	for name in compression.compengines:			for name in compression.compengines:
	engine = compression.compengines[name]			engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():			if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)			supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':			if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')			supported.add(b'revlog-compression-zstd')
	return supported			return supported

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28702		Jun 28 2021, 8:44 AM	★	★
Diff 2	28703		Jun 28 2021, 11:17 AM	★	★