##// END OF EJS Templates
revlog: get rid of defversion...
Sune Foldager -
r14333:31a5973f default
parent child Browse files
Show More
@@ -116,9 +116,9 b' class localrepository(repo.repository):'
116
116
117 def _applyrequirements(self, requirements):
117 def _applyrequirements(self, requirements):
118 self.requirements = requirements
118 self.requirements = requirements
119 self.sopener.options = {}
119 openerreqs = set(('revlogv1', 'generaldelta'))
120 if 'generaldelta' in requirements:
120 self.sopener.options = dict((r, 1) for r in requirements
121 self.sopener.options['generaldelta'] = 1
121 if r in openerreqs)
122
122
123 def _writerequirements(self):
123 def _writerequirements(self):
124 reqfile = self.opener("requires", "w")
124 reqfile = self.opener("requires", "w")
@@ -178,7 +178,6 b' class localrepository(repo.repository):'
178 p = os.environ['HG_PENDING']
178 p = os.environ['HG_PENDING']
179 if p.startswith(self.root):
179 if p.startswith(self.root):
180 c.readpending('00changelog.i.a')
180 c.readpending('00changelog.i.a')
181 self.sopener.options['defversion'] = c.version
182 return c
181 return c
183
182
184 @propertycache
183 @propertycache
@@ -227,12 +227,11 b' class revlog(object):'
227
227
228 v = REVLOG_DEFAULT_VERSION
228 v = REVLOG_DEFAULT_VERSION
229 if hasattr(opener, 'options'):
229 if hasattr(opener, 'options'):
230 if 'defversion' in opener.options:
230 if 'revlogv1' in opener.options:
231 v = opener.options['defversion']
231 if 'generaldelta' in opener.options:
232 if v & REVLOGNG:
232 v |= REVLOGGENERALDELTA
233 v |= REVLOGNGINLINEDATA
233 else:
234 if v & REVLOGNG and 'generaldelta' in opener.options:
234 v = 0
235 v |= REVLOGGENERALDELTA
236
235
237 i = ''
236 i = ''
238 try:
237 try:
General Comments 0
You need to be logged in to leave comments. Login now