Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog-compression: fix computation of engine availability
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 07 Apr 2021 12:15:28 +0200
changeset 46851 3aa78f2aea48
parent 46850 9dfcadc2cabb
child 46852 fbfb1d6d8459
revlog-compression: fix computation of engine availability 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. Differential Revision: https://phab.mercurial-scm.org/D10325
mercurial/localrepo.py file | annotate | diff | comparison | revisions
mercurial/upgrade_utils/actions.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Wed Apr 07 00:12:07 2021 +0200
+++ b/mercurial/localrepo.py	Wed Apr 07 12:15:28 2021 +0200
@@ -3470,7 +3470,9 @@
     compengines = ui.configlist(b'format', b'revlog-compression')
     for compengine in compengines:
         if compengine in util.compengines:
-            break
+            engine = util.compengines[compengine]
+            if engine.available() and engine.revlogheader():
+                break
     else:
         raise error.Abort(
             _(
--- a/mercurial/upgrade_utils/actions.py	Wed Apr 07 00:12:07 2021 +0200
+++ b/mercurial/upgrade_utils/actions.py	Wed Apr 07 12:15:28 2021 +0200
@@ -428,7 +428,9 @@
         # return the first valid value as the selection code would do
         for comp in compengines:
             if comp in util.compengines:
-                return comp
+                e = util.compengines[comp]
+                if e.available() and e.revlogheader():
+                    return comp
 
         # no valide compression found lets display it all for clarity
         return b','.join(compengines)
mercurial