D10584: revlog: use revlog.display_id for corruption error
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon May 3 12:07:20 UTC 2021
marmoute created this revision.
Herald added a reviewer: indygreg.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D10584
AFFECTED FILES
mercurial/revlog.py
tests/test-verify.t
CHANGE DETAILS
diff --git a/tests/test-verify.t b/tests/test-verify.t
--- a/tests/test-verify.t
+++ b/tests/test-verify.t
@@ -297,7 +297,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- a at 1: broken revlog! (index data/a.i is corrupted)
+ a at 1: broken revlog! (index data/a is corrupted)
warning: orphan data file 'data/a.i'
checked 2 changesets with 0 changes to 1 files
1 warnings encountered!
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -578,7 +578,7 @@
index.update_nodemap_data(*nodemap_data)
except (ValueError, IndexError):
raise error.RevlogError(
- _(b"index %s is corrupted") % self._indexfile
+ _(b"index %s is corrupted") % self.display_id
)
self.index, self._chunkcache = d
if not self._chunkcache:
To: marmoute, indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list