changeset 28114:2a03a365f645

verify: use similar language for missing manifest and file revisions

When a changeset refers to a manifest revision that's not found in the
manifest log, we say "changeset refers to missing revision X", but
when a manifest refers to file revision that's not found in the
filelog, we say "X in manifests not found". The language used for
missing manifest revisions seems clearer, so let's use that for
missing filelog revisions too.

--- a/mercurial/verify.py	Tue Feb 02 10:42:28 2016 -0800
+++ b/mercurial/verify.py	Sun Feb 07 22:46:20 2016 -0800
@@ -371,8 +371,8 @@
             if f in filenodes:
                 fns = [(lr, n) for n, lr in filenodes[f].iteritems()]
                 for lr, node in sorted(fns):
-                    self.err(lr, _("%s in manifests not found") % short(node),
-                             f)
+                    self.err(lr, _("manifest refers to unknown revision %s") %
+                             short(node), f)
         ui.progress(_('checking'), None)
 
         for f in storefiles:

--- a/tests/test-push-validation.t	Tue Feb 02 10:42:28 2016 -0800
+++ b/tests/test-push-validation.t	Sun Feb 07 22:46:20 2016 -0800
@@ -72,7 +72,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-   beta@1: dddc47b3ba30 in manifests not found
+   beta@1: manifest refers to unknown revision dddc47b3ba30
   2 files, 2 changesets, 2 total revisions
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)

--- a/tests/test-verify.t	Tue Feb 02 10:42:28 2016 -0800
+++ b/tests/test-verify.t	Sun Feb 07 22:46:20 2016 -0800
@@ -46,13 +46,13 @@
   checking files
    warning: revlog 'data/FOO.txt.i' not in fncache!
    0: empty or missing FOO.txt
-   FOO.txt@0: f62022d3d590 in manifests not found
+   FOO.txt@0: manifest refers to unknown revision f62022d3d590
    warning: revlog 'data/QUICK.txt.i' not in fncache!
    0: empty or missing QUICK.txt
-   QUICK.txt@0: 88b857db8eba in manifests not found
+   QUICK.txt@0: manifest refers to unknown revision 88b857db8eba
    warning: revlog 'data/bar.txt.i' not in fncache!
    0: empty or missing bar.txt
-   bar.txt@0: 256559129457 in manifests not found
+   bar.txt@0: manifest refers to unknown revision 256559129457
   3 files, 1 changesets, 0 total revisions
   3 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
@@ -102,8 +102,8 @@
   $ hg verify -q
    warning: revlog 'data/file.i' not in fncache!
    0: empty or missing file
-   file@0: 362fef284ce2 in manifests not found
-   file@1: c10f2164107d in manifests not found
+   file@0: manifest refers to unknown revision 362fef284ce2
+   file@1: manifest refers to unknown revision c10f2164107d
   1 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   3 integrity errors encountered!
@@ -130,8 +130,8 @@
    manifest@1: 941fc4534185 not in changesets
    warning: revlog 'data/file.i' not in fncache!
    ?: empty or missing file
-   file@0: 362fef284ce2 in manifests not found
-   file@1: c10f2164107d in manifests not found
+   file@0: manifest refers to unknown revision 362fef284ce2
+   file@1: manifest refers to unknown revision c10f2164107d
   1 warnings encountered!
   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
   6 integrity errors encountered!
@@ -182,7 +182,7 @@
 
   $ cp -f .hg/store-partial/data/file.* .hg/store/data
   $ hg verify -q
-   file@1: c10f2164107d in manifests not found
+   file@1: manifest refers to unknown revision c10f2164107d
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
@@ -208,7 +208,7 @@
   $ hg verify -q
    manifest@?: rev 1 points to nonexistent changeset 1
    manifest@?: 941fc4534185 not in changesets
-   file@?: c10f2164107d in manifests not found
+   file@?: manifest refers to unknown revision c10f2164107d
   3 integrity errors encountered!
   [1]
   $ cp -r .hg/store-full/* .hg/store