comparison mercurial/revlog.py @ 51081:5ffee3cff8de

revlog: remove the `_indexfp` method The method is only used two time and we want to move that code to a lower level object. So we simply inline the method to simplify further refactoring.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 11 Oct 2023 02:19:00 +0200
parents 09d60aed5f5d
children 808f1e38cd1d
comparison
equal deleted inserted replaced
51080:09d60aed5f5d 51081:5ffee3cff8de
791 # we are done streaming. 791 # we are done streaming.
792 792
793 if self._inline: 793 if self._inline:
794 794
795 def get_stream(): 795 def get_stream():
796 with self._indexfp() as fp: 796 with self.opener(self._indexfile, mode=b"r") as fp:
797 yield None 797 yield None
798 size = index_size + data_size 798 size = index_size + data_size
799 if size <= 65536: 799 if size <= 65536:
800 yield fp.read(size) 800 yield fp.read(size)
801 else: 801 else:
830 (self._indexfile, inline_stream, index_size + data_size), 830 (self._indexfile, inline_stream, index_size + data_size),
831 ] 831 ]
832 else: 832 else:
833 833
834 def get_index_stream(): 834 def get_index_stream():
835 with self._indexfp() as fp: 835 with self.opener(self._indexfile, mode=b"r") as fp:
836 yield None 836 yield None
837 if index_size <= 65536: 837 if index_size <= 65536:
838 yield fp.read(index_size) 838 yield fp.read(index_size)
839 else: 839 else:
840 yield from util.filechunkiter(fp, limit=index_size) 840 yield from util.filechunkiter(fp, limit=index_size)
1062 if self._docket is None: 1062 if self._docket is None:
1063 return None 1063 return None
1064 t = self._docket.default_compression_header 1064 t = self._docket.default_compression_header
1065 c = self._get_decompressor(t) 1065 c = self._get_decompressor(t)
1066 return c.decompress 1066 return c.decompress
1067
1068 def _indexfp(self):
1069 """file object for the revlog's index file"""
1070 return self.opener(self._indexfile, mode=b"r")
1071 1067
1072 def __index_write_fp(self): 1068 def __index_write_fp(self):
1073 # You should not use this directly and use `_writing` instead 1069 # You should not use this directly and use `_writing` instead
1074 try: 1070 try:
1075 f = self.opener( 1071 f = self.opener(