Mercurial > hg-stable
changeset 25627:9573d8f346f1
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.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Jun 2015 12:00:06 -0500 |
| parents | ea0902e3128e |
| children | 9c647f427aef |
| files | mercurial/verify.py tests/test-fncache.t tests/test-verify.t |
| diffstat | 3 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/verify.py Fri Jun 19 11:07:15 2015 -0700 +++ b/mercurial/verify.py Fri Jun 19 12:00:06 2015 -0500 @@ -244,7 +244,7 @@ try: storefiles.remove(ff) except KeyError: - err(lr, _("missing revlog!"), ff) + warn(_(" warning: revlog '%s' not in fncache!") % ff) checklog(fl, f, lr) seen = {}
--- a/tests/test-fncache.t Fri Jun 19 11:07:15 2015 -0700 +++ b/tests/test-fncache.t Fri Jun 19 12:00:06 2015 -0500 @@ -48,13 +48,11 @@ 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:
--- a/tests/test-verify.t Fri Jun 19 11:07:15 2015 -0700 +++ b/tests/test-verify.t Fri Jun 19 12:00:06 2015 -0500 @@ -44,17 +44,18 @@ 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]