##// END OF EJS Templates
revlog: use "entry_point" phrasing for loading the revlog...
marmoute -
r47946:21ef5f75 default
parent child Browse files
Show More
@@ -469,21 +469,13 b' class revlog(object):'
469 new_header, mmapindexthreshold, force_nodemap = self._init_opts()
469 new_header, mmapindexthreshold, force_nodemap = self._init_opts()
470
470
471 if self.postfix is None:
471 if self.postfix is None:
472 index_file = b'%s.i' % self.radix
472 entry_point = b'%s.i' % self.radix
473 data_file = b'%s.d' % self.radix
474 elif self.postfix == b'a':
475 index_file = b'%s.i.a' % self.radix
476 data_file = b'%s.d' % self.radix
477 else:
473 else:
478 index_file = b'%s.i.%s' % (self.radix, self.postfix)
474 entry_point = b'%s.i.%s' % (self.radix, self.postfix)
479 data_file = b'%s.d.%s' % (self.radix, self.postfix)
480
481 self._indexfile = index_file
482 self._datafile = data_file
483
475
484 indexdata = b''
476 indexdata = b''
485 self._initempty = True
477 self._initempty = True
486 indexdata = self._get_data(self._indexfile, mmapindexthreshold)
478 indexdata = self._get_data(entry_point, mmapindexthreshold)
487 if len(indexdata) > 0:
479 if len(indexdata) > 0:
488 header = INDEX_HEADER.unpack(indexdata[:4])[0]
480 header = INDEX_HEADER.unpack(indexdata[:4])[0]
489 self._initempty = False
481 self._initempty = False
@@ -533,6 +525,13 b' class revlog(object):'
533 msg %= (self._format_version, self.display_id)
525 msg %= (self._format_version, self.display_id)
534 raise error.RevlogError(msg)
526 raise error.RevlogError(msg)
535
527
528 self._indexfile = entry_point
529
530 if self.postfix is None or self.postfix == b'a':
531 self._datafile = b'%s.d' % self.radix
532 else:
533 self._datafile = b'%s.d.%s' % (self.radix, self.postfix)
534
536 self.nodeconstants = sha1nodeconstants
535 self.nodeconstants = sha1nodeconstants
537 self.nullid = self.nodeconstants.nullid
536 self.nullid = self.nodeconstants.nullid
538
537
General Comments 0
You need to be logged in to leave comments. Login now