Mercurial > hg

changeset 14333:31a5973fcf96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: get rid of defversion defversion was a property (later option) on the store opener, used to propagate the changelog revlog format to the other revlogs, so they would be created with the same format. This required that the changelog instance was created before any other revlog; an invariant that wasn't directly enforced (or documented) anywhere. We now use the revlogv1 requirement instead, which is transfered to the store opener options. If this option is missing, v0 revlogs are created.
author Sune Foldager <cryo@cyanite.org>
date Mon, 16 May 2011 12:44:34 +0200
parents a2f0f61a6988
children 85c82ebc96a3
files mercurial/localrepo.py mercurial/revlog.py
diffstat 2 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon May 16 11:52:28 2011 +0200
+++ b/mercurial/localrepo.py	Mon May 16 12:44:34 2011 +0200
@@ -116,9 +116,9 @@
 
     def _applyrequirements(self, requirements):
         self.requirements = requirements
-        self.sopener.options = {}
-        if 'generaldelta' in requirements:
-            self.sopener.options['generaldelta'] = 1
+        openerreqs = set(('revlogv1', 'generaldelta'))
+        self.sopener.options = dict((r, 1) for r in requirements
+                                           if r in openerreqs)
 
     def _writerequirements(self):
         reqfile = self.opener("requires", "w")
@@ -178,7 +178,6 @@
             p = os.environ['HG_PENDING']
             if p.startswith(self.root):
                 c.readpending('00changelog.i.a')
-        self.sopener.options['defversion'] = c.version
         return c
 
     @propertycache
--- a/mercurial/revlog.py	Mon May 16 11:52:28 2011 +0200
+++ b/mercurial/revlog.py	Mon May 16 12:44:34 2011 +0200
@@ -227,12 +227,11 @@
 
         v = REVLOG_DEFAULT_VERSION
         if hasattr(opener, 'options'):
-            if 'defversion' in opener.options:
-                v = opener.options['defversion']
-                if v & REVLOGNG:
-                    v |= REVLOGNGINLINEDATA
-            if v & REVLOGNG and 'generaldelta' in opener.options:
-                v |= REVLOGGENERALDELTA
+            if 'revlogv1' in opener.options:
+                if 'generaldelta' in opener.options:
+                    v |= REVLOGGENERALDELTA
+            else:
+                v = 0
 
         i = ''
         try: