This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10325

revlog-compression: fix computation of engine availability
ClosedPublic

Authored by marmoute on Apr 7 2021, 7:54 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3aa78f2aea48: revlog-compression: fix computation of engine availability
Summary

We don't just need the engine to be define, we need it to be available and able
to do be used for revlog compression. Without this change, zstd could be
selected as a viable option for repository creation on platform where it is not
available.

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.Apr 7 2021, 7:54 AM
baymax updated this revision to Diff 26677.Apr 7 2021, 12:00 PM

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

pulkit accepted this revision.Apr 8 2021, 2:57 AM
This revision is now accepted and ready to land.Apr 8 2021, 2:57 AM
baymax updated this revision to Diff 26681.Apr 8 2021, 6:33 AM

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

Revision Contents
Changeset List

Diff 26688

mercurial/localrepo.py

if ui.configbool(b'format', b'usefncache'): if ui.configbool(b'format', b'usefncache'):
requirements.add(requirementsmod.FNCACHE_REQUIREMENT) requirements.add(requirementsmod.FNCACHE_REQUIREMENT)
if ui.configbool(b'format', b'dotencode'): if ui.configbool(b'format', b'dotencode'):
requirements.add(requirementsmod.DOTENCODE_REQUIREMENT) requirements.add(requirementsmod.DOTENCODE_REQUIREMENT)
compengines = ui.configlist(b'format', b'revlog-compression') compengines = ui.configlist(b'format', b'revlog-compression')
for compengine in compengines: for compengine in compengines:
if compengine in util.compengines: if compengine in util.compengines:
engine = util.compengines[compengine]
if engine.available() and engine.revlogheader():
break break
else: else:
raise error.Abort( raise error.Abort(
_( _(
b'compression engines %s defined by ' b'compression engines %s defined by '
b'format.revlog-compression not available' b'format.revlog-compression not available'
) )
% b', '.join(b'"%s"' % e for e in compengines), % b', '.join(b'"%s"' % e for e in compengines),
hint=_( hint=_(

mercurial/upgrade_utils/actions.py

return compression return compression
@classmethod @classmethod
def fromconfig(cls, repo): def fromconfig(cls, repo):
compengines = repo.ui.configlist(b'format', b'revlog-compression') compengines = repo.ui.configlist(b'format', b'revlog-compression')
# return the first valid value as the selection code would do # return the first valid value as the selection code would do
for comp in compengines: for comp in compengines:
if comp in util.compengines: if comp in util.compengines:
e = util.compengines[comp]
if e.available() and e.revlogheader():
return comp return comp
# no valide compression found lets display it all for clarity # no valide compression found lets display it all for clarity
return b','.join(compengines) return b','.join(compengines)
@registerformatvariant @registerformatvariant
class compressionlevel(formatvariant): class compressionlevel(formatvariant):
name = b'compression-level' name = b'compression-level'