facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

verify: extract "manifest" constant into variable

Browse Source 
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.
This commit is contained in:
Martin von Zweigbergk 2016-02-03 15:53:48 -08:00
parent 8868dab63d
commit 73fc56cffe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/verify.py
View File

@ -205,20 +205,20 @@ class verifier(object):
ui.status(_("checking manifests\n")) ui.status(_("checking manifests\n"))
filenodes = {} filenodes = {}
seen = {} seen = {}
label = "manifest"
if self.refersmf: if self.refersmf:
# Do not check manifest if there are only changelog entries with # Do not check manifest if there are only changelog entries with
# null manifests. # null manifests.
self.checklog(mf, "manifest", 0) self.checklog(mf, label, 0)
total = len(mf) total = len(mf)
for i in mf: for i in mf:
ui.progress(_('checking'), i, total=total, unit=_('manifests')) ui.progress(_('checking'), i, total=total, unit=_('manifests'))
n = mf.node(i) n = mf.node(i)
lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []), lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []), label)
"manifest")
if n in mflinkrevs: if n in mflinkrevs:
del mflinkrevs[n] del mflinkrevs[n]
else: else:
self.err(lr, _("%s not in changesets") % short(n), "manifest") self.err(lr, _("%s not in changesets") % short(n), label)
try: try:
for f, fn in mf.readdelta(n).iteritems(): for f, fn in mf.readdelta(n).iteritems():
@ -229,14 +229,14 @@ class verifier(object):
filenodes.setdefault( filenodes.setdefault(
_normpath(f), {}).setdefault(fn, lr) _normpath(f), {}).setdefault(fn, lr)
except Exception as inst: 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) ui.progress(_('checking'), None)
if self.havemf: if self.havemf:
for c, m in sorted([(c, m) for m in mflinkrevs for c, m in sorted([(c, m) for m in mflinkrevs
for c in mflinkrevs[m]]): for c in mflinkrevs[m]]):
self.err(c, _("changeset refers to unknown revision %s") % self.err(c, _("changeset refers to unknown revision %s") %
short(m), "manifest") short(m), label)
return filenodes return filenodes