##// END OF EJS Templates
Additional appendfile fixes for interleaved data/index files...
mason@suse.com -
r2082:856f0ba2 default
parent child Browse files
Show More
@@ -180,15 +180,15 b' class appendopener(object):'
180 # not mixed up together.
180 # not mixed up together.
181
181
182 class appendchangelog(changelog.changelog, appendopener):
182 class appendchangelog(changelog.changelog, appendopener):
183 def __init__(self, opener):
183 def __init__(self, opener, version):
184 appendopener.__init__(self, opener)
184 appendopener.__init__(self, opener)
185 changelog.changelog.__init__(self, self)
185 changelog.changelog.__init__(self, self, version)
186 def checkinlinesize(self, fp, tr):
186 def checkinlinesize(self, fp, tr):
187 return
187 return
188
188
189 class appendmanifest(manifest.manifest, appendopener):
189 class appendmanifest(manifest.manifest, appendopener):
190 def __init__(self, opener):
190 def __init__(self, opener, version):
191 appendopener.__init__(self, opener)
191 appendopener.__init__(self, opener)
192 manifest.manifest.__init__(self, self)
192 manifest.manifest.__init__(self, self, version)
193 def checkinlinesize(self, fp, tr):
193 def checkinlinesize(self, fp, tr):
194 return
194 return
@@ -1413,7 +1413,7 b' class localrepository(object):'
1413
1413
1414 # write changelog and manifest data to temp files so
1414 # write changelog and manifest data to temp files so
1415 # concurrent readers will not see inconsistent view
1415 # concurrent readers will not see inconsistent view
1416 cl = appendfile.appendchangelog(self.opener)
1416 cl = appendfile.appendchangelog(self.opener, self.changelog.version)
1417
1417
1418 oldheads = len(cl.heads())
1418 oldheads = len(cl.heads())
1419
1419
@@ -1427,7 +1427,7 b' class localrepository(object):'
1427 cnr = cor
1427 cnr = cor
1428 changesets = cnr - cor
1428 changesets = cnr - cor
1429
1429
1430 mf = appendfile.appendmanifest(self.opener)
1430 mf = appendfile.appendmanifest(self.opener, self.manifest.version)
1431
1431
1432 # pull off the manifest group
1432 # pull off the manifest group
1433 self.ui.status(_("adding manifests\n"))
1433 self.ui.status(_("adding manifests\n"))
@@ -1455,10 +1455,10 b' class localrepository(object):'
1455 cl.writedata()
1455 cl.writedata()
1456
1456
1457 # make changelog and manifest see real files again
1457 # make changelog and manifest see real files again
1458 self.changelog = changelog.changelog(self.opener)
1458 self.changelog = changelog.changelog(self.opener, self.changelog.version)
1459 self.manifest = manifest.manifest(self.opener)
1459 self.manifest = manifest.manifest(self.opener, self.manifest.version)
1460 self.changelog.checkinlinesize(tr)
1460 self.changelog.checkinlinesize(tr)
1461 self.changelog.checkinlinesize(tr)
1461 self.manifest.checkinlinesize(tr)
1462
1462
1463 newheads = len(self.changelog.heads())
1463 newheads = len(self.changelog.heads())
1464 heads = ""
1464 heads = ""
@@ -822,6 +822,7 b' class revlog(object):'
822 return
822 return
823 if not fp:
823 if not fp:
824 fp = self.opener(self.indexfile, 'r')
824 fp = self.opener(self.indexfile, 'r')
825 fp.seek(0, 2)
825 size = fp.tell()
826 size = fp.tell()
826 if size < 131072:
827 if size < 131072:
827 return
828 return
General Comments 0
You need to be logged in to leave comments. Login now