Mercurial > public > mercurial-scm > hg-stable

diff mercurial/revlog.py @ 41302:c953c2a94d68 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: fix resolution of revlog version 0 This partially backs out cecf3f8bccd3, "revlog: always process opener options." My understanding is that if there's no "revlog1" nor "revlog2" in .hg/requires, the repository should stick to the v0 format. The reasoning is briefly described in 31a5973fcf96, "revlog: get rid of defversion." Maybe we can drop support for missing opener options, but I didn't do that in this patch.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 21 Jan 2019 22:14:29 +0900
parents 13c23396c7fe
children ab0d762d89ef
line wrap: on
line diff
--- a/mercurial/revlog.py	Sun Jan 20 11:57:36 2019 +0900
+++ b/mercurial/revlog.py	Mon Jan 21 22:14:29 2019 +0900
@@ -396,6 +396,11 @@
             newversionflags = REVLOGV1 | FLAG_INLINE_DATA
             if 'generaldelta' in opts:
                 newversionflags |= FLAG_GENERALDELTA
+        elif getattr(self.opener, 'options', None) is not None:
+            # If options provided but no 'revlog*' found, the repository
+            # would have no 'requires' file in it, which means we have to
+            # stick to the old format.
+            newversionflags = REVLOGV0
         else:
             newversionflags = REVLOG_DEFAULT_VERSION