--- a/mercurial/revlogutils/nodemap.py Thu May 18 18:45:54 2023 +0100
+++ b/mercurial/revlogutils/nodemap.py Thu May 18 19:37:12 2023 +0100
@@ -611,10 +611,10 @@
def check_data(ui, index, data):
"""verify that the provided nodemap data are valid for the given idex"""
ret = 0
- ui.status((b"revision in index: %d\n") % len(index))
+ ui.status((b"revisions in index: %d\n") % len(index))
root, __ = parse_data(data)
all_revs = set(_all_revisions(root))
- ui.status((b"revision in nodemap: %d\n") % len(all_revs))
+ ui.status((b"revisions in nodemap: %d\n") % len(all_revs))
for r in range(len(index)):
if r not in all_revs:
msg = b" revision missing from nodemap: %d\n" % r
@@ -637,7 +637,7 @@
if all_revs:
for r in sorted(all_revs):
- msg = b" extra revision in nodemap: %d\n" % r
+ msg = b" extra revisions in nodemap: %d\n" % r
ui.write_err(msg)
ret = 1
return ret
--- a/tests/test-persistent-nodemap.t Thu May 18 18:45:54 2023 +0100
+++ b/tests/test-persistent-nodemap.t Thu May 18 19:37:12 2023 +0100
@@ -154,8 +154,8 @@
#endif
$ hg debugnodemap --check
- revision in index: 5001
- revision in nodemap: 5001
+ revisions in index: 5001
+ revisions in nodemap: 5001
add a new commit
@@ -241,8 +241,8 @@
#endif
$ hg debugnodemap --check
- revision in index: 5002
- revision in nodemap: 5002
+ revisions in index: 5002
+ revisions in nodemap: 5002
Test code path without mmap
---------------------------
@@ -252,11 +252,11 @@
$ hg ci -m 'bar' --config storage.revlog.persistent-nodemap.mmap=no
$ hg debugnodemap --check --config storage.revlog.persistent-nodemap.mmap=yes
- revision in index: 5003
- revision in nodemap: 5003
+ revisions in index: 5003
+ revisions in nodemap: 5003
$ hg debugnodemap --check --config storage.revlog.persistent-nodemap.mmap=no
- revision in index: 5003
- revision in nodemap: 5003
+ revisions in index: 5003
+ revisions in nodemap: 5003
#if pure