Mercurial > hg

changeset 28115:bd279da57e4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
verify: extract "manifest" constant into variable The "manifest" label that's used in error messages will instead be the directory path for subdirectory manifests (not the root manifest), so let's extract the constant to a variable already to make future patches simpler.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 03 Feb 2016 15:53:48 -0800
parents 2a03a365f645
children ba8257cb53e8
files mercurial/verify.py
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/verify.py	Sun Feb 07 22:46:20 2016 -0800
+++ b/mercurial/verify.py	Wed Feb 03 15:53:48 2016 -0800
@@ -205,20 +205,20 @@
         ui.status(_("checking manifests\n"))
         filenodes = {}
         seen = {}
+        label = "manifest"
         if self.refersmf:
             # Do not check manifest if there are only changelog entries with
             # null manifests.
-            self.checklog(mf, "manifest", 0)
+            self.checklog(mf, label, 0)
         total = len(mf)
         for i in mf:
             ui.progress(_('checking'), i, total=total, unit=_('manifests'))
             n = mf.node(i)
-            lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []),
-                                 "manifest")
+            lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []), label)
             if n in mflinkrevs:
                 del mflinkrevs[n]
             else:
-                self.err(lr, _("%s not in changesets") % short(n), "manifest")
+                self.err(lr, _("%s not in changesets") % short(n), label)
 
             try:
                 for f, fn in mf.readdelta(n).iteritems():
@@ -229,14 +229,14 @@
                             filenodes.setdefault(
                                 _normpath(f), {}).setdefault(fn, lr)
             except Exception as inst:
-                self.exc(lr, _("reading delta %s") % short(n), inst)
+                self.exc(lr, _("reading delta %s") % short(n), inst, label)
         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 revision %s") %
-                         short(m), "manifest")
+                         short(m), label)
 
         return filenodes