Mercurial > hg
changeset 28113:d2e0d57824c2
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.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 02 Feb 2016 10:42:28 -0800 |
| parents | 334a3aa677fb |
| children | 2a03a365f645 |
| files | mercurial/verify.py tests/test-verify.t |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/verify.py Tue Feb 02 09:46:14 2016 -0800 +++ b/mercurial/verify.py Tue Feb 02 10:42:28 2016 -0800 @@ -229,14 +229,14 @@ 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
--- a/tests/test-verify.t Tue Feb 02 09:46:14 2016 -0800 +++ b/tests/test-verify.t Tue Feb 02 10:42:28 2016 -0800 @@ -171,7 +171,7 @@ $ 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 @@ $ 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 @@ $ 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)