# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2016-02-02 18:42:28
# Node ID d2e0d57824c227690cdca850437757fe09e1f9d2
# Parent  334a3aa677fbbbebf4d3cfdc4da417c089beb812

verify: include "manifest" prefix in a few more places

We include the "manifest" prefix on most other errors, so it seems
consistent to add them to the remaining messages too. Also, having the
"manifest" prefix will be more consistent with having the directory
prefix there when we add support for treemanifests. With the
"manifest" at the beginning, let's remove the now-redundant
"manifest" in the message itself.

diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -229,14 +229,14 @@ class verifier(object):
                             filenodes.setdefault(
                                 _normpath(f), {}).setdefault(fn, lr)
             except Exception as inst:
-                self.exc(lr, _("reading manifest delta %s") % short(n), inst)
+                self.exc(lr, _("reading delta %s") % short(n), inst)
         ui.progress(_('checking'), None)
 
         if self.havemf:
             for c, m in sorted([(c, m) for m in mflinkrevs
                         for c in mflinkrevs[m]]):
-                self.err(c, _("changeset refers to unknown manifest %s") %
-                         short(m))
+                self.err(c, _("changeset refers to unknown revision %s") %
+                         short(m), "manifest")
 
         return filenodes
 
diff --git a/tests/test-verify.t b/tests/test-verify.t
--- a/tests/test-verify.t
+++ b/tests/test-verify.t
@@ -171,7 +171,7 @@ Manifest log missing entry
 
   $ cp -f .hg/store-partial/00manifest.* .hg/store
   $ hg verify -q
-   1: changeset refers to unknown manifest 941fc4534185
+   manifest@1: changeset refers to unknown revision 941fc4534185
    file@1: c10f2164107d not in manifests
   2 integrity errors encountered!
   (first damaged changeset appears to be 1)
@@ -218,7 +218,7 @@ Manifest and filelog missing entry
   $ cp -f .hg/store-partial/00manifest.* .hg/store
   $ cp -f .hg/store-partial/data/file.* .hg/store/data
   $ hg verify -q
-   1: changeset refers to unknown manifest 941fc4534185
+   manifest@1: changeset refers to unknown revision 941fc4534185
   1 integrity errors encountered!
   (first damaged changeset appears to be 1)
   [1]
@@ -245,7 +245,7 @@ Corrupt manifest log base node to cause 
   $ printf abcd | dd conv=notrunc of=.hg/store/00manifest.i bs=1 seek=16 \
   >   2> /dev/null
   $ hg verify -q
-   0: reading manifest delta d0b6632564d4: * (glob)
+   manifest@0: reading delta d0b6632564d4: * (glob)
    file@0: 362fef284ce2 not in manifests
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)