# HG changeset patch # User Matt Mackall # Date 2015-06-19 17:00:06 # Node ID 9573d8f346f1385b164875a1f1c9cafc30eb046f # Parent ea0902e3128e1c5fbaa253ffc3e73a50b24cf167 verify: clarify misleading fncache message This is a message about cache corruption, not repository corruption or actually missing files. Fix message and reduce to a warning. diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -244,7 +244,7 @@ def _verify(repo): try: storefiles.remove(ff) except KeyError: - err(lr, _("missing revlog!"), ff) + warn(_(" warning: revlog '%s' not in fncache!") % ff) checklog(fl, f, lr) seen = {} diff --git a/tests/test-fncache.t b/tests/test-fncache.t --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -48,13 +48,11 @@ Testing verify: checking manifests crosschecking files in changesets and manifests checking files - data/a.i@0: missing revlog! - data/a.i.hg/c.i@2: missing revlog! - data/a.i/b.i@1: missing revlog! + warning: revlog 'data/a.i' not in fncache! + warning: revlog 'data/a.i.hg/c.i' not in fncache! + warning: revlog 'data/a.i/b.i' not in fncache! 3 files, 3 changesets, 3 total revisions - 3 integrity errors encountered! - (first damaged changeset appears to be 0) - [1] + 3 warnings encountered! $ cd .. Non store repo: diff --git a/tests/test-verify.t b/tests/test-verify.t --- a/tests/test-verify.t +++ b/tests/test-verify.t @@ -44,17 +44,18 @@ introduce some bugs in repo checking manifests crosschecking files in changesets and manifests checking files - data/FOO.txt.i@0: missing revlog! + warning: revlog 'data/FOO.txt.i' not in fncache! 0: empty or missing FOO.txt FOO.txt@0: f62022d3d590 in manifests not found - data/QUICK.txt.i@0: missing revlog! + warning: revlog 'data/QUICK.txt.i' not in fncache! 0: empty or missing QUICK.txt QUICK.txt@0: 88b857db8eba in manifests not found - data/bar.txt.i@0: missing revlog! + warning: revlog 'data/bar.txt.i' not in fncache! 0: empty or missing bar.txt bar.txt@0: 256559129457 in manifests not found 3 files, 1 changesets, 0 total revisions - 9 integrity errors encountered! + 3 warnings encountered! + 6 integrity errors encountered! (first damaged changeset appears to be 0) [1]