--- a/mercurial/revlogutils/rewrite.py Wed Jun 19 17:03:13 2024 +0200
+++ b/mercurial/revlogutils/rewrite.py Wed Jun 19 19:10:49 2024 +0200
@@ -136,8 +136,8 @@
rl.opener.rename(newrl._datafile, rl._datafile)
rl.clearcaches()
- chunk_cache = rl._loadindex()
- rl._load_inner(chunk_cache)
+ index, chunk_cache = rl._loadindex()
+ rl._load_inner(index, chunk_cache)
def v2_censor(revlog, tr, censor_nodes, tombstone=b''):
@@ -327,7 +327,8 @@
# reload the revlog internal information
revlog.clearcaches()
- revlog._loadindex(docket=docket)
+ index, chunk_cache = revlog._loadindex(docket=docket)
+ revlog._load_inner(index, chunk_cache)
@contextlib.contextmanager
def all_files_opener():
@@ -569,7 +570,8 @@
rl.opener.rename(new_file_path, index_file)
rl.clearcaches()
- rl._loadindex()
+ index, chunk_cache = rl._loadindex()
+ rl._load_inner(index, chunk_cache)
finally:
util.tryunlink(new_file_path)