equal
deleted
inserted
replaced
1164 # delay or divert already in place |
1164 # delay or divert already in place |
1165 return None |
1165 return None |
1166 elif len(self.index) == 0: |
1166 elif len(self.index) == 0: |
1167 self._orig_index_file = self.index_file |
1167 self._orig_index_file = self.index_file |
1168 self.index_file = self._divert_index() |
1168 self.index_file = self._divert_index() |
1169 self._segmentfile.filename = self.index_file |
|
1170 assert self._orig_index_file is not None |
1169 assert self._orig_index_file is not None |
1171 assert self.index_file is not None |
1170 assert self.index_file is not None |
1172 if self.opener.exists(self.index_file): |
1171 if self.opener.exists(self.index_file): |
1173 self.opener.unlink(self.index_file) |
1172 self.opener.unlink(self.index_file) |
1174 return self.index_file |
1173 return self.index_file |
1200 self._segmentfile._delay_buffer = self._delay_buffer |
1199 self._segmentfile._delay_buffer = self._delay_buffer |
1201 else: |
1200 else: |
1202 assert self._segmentfile._delay_buffer is None |
1201 assert self._segmentfile._delay_buffer is None |
1203 self._orig_index_file = self.index_file |
1202 self._orig_index_file = self.index_file |
1204 self.index_file = pending_index_file |
1203 self.index_file = pending_index_file |
1205 self._segmentfile.filename = self.index_file |
|
1206 return self.index_file, any_pending |
1204 return self.index_file, any_pending |
1207 |
1205 |
1208 def finalize_pending(self): |
1206 def finalize_pending(self): |
1209 assert not self.is_open |
1207 assert not self.is_open |
1210 |
1208 |
1226 self._orig_index_file, |
1224 self._orig_index_file, |
1227 checkambig=True, |
1225 checkambig=True, |
1228 ) |
1226 ) |
1229 self.index_file = self._orig_index_file |
1227 self.index_file = self._orig_index_file |
1230 self._orig_index_file = None |
1228 self._orig_index_file = None |
1231 self._segmentfile.filename = self.index_file |
|
1232 else: |
1229 else: |
1233 msg = b"not delay or divert found on this revlog" |
1230 msg = b"not delay or divert found on this revlog" |
1234 raise error.ProgrammingError(msg) |
1231 raise error.ProgrammingError(msg) |
1235 return self.canonical_index_file |
1232 return self.canonical_index_file |
1236 |
1233 |