##// END OF EJS Templates
verify: extract "manifest" constant into variable...
Martin von Zweigbergk -
r28115:bd279da5 default
parent child Browse files
Show More
@@ -205,20 +205,20 b' class verifier(object):'
205 205 ui.status(_("checking manifests\n"))
206 206 filenodes = {}
207 207 seen = {}
208 label = "manifest"
208 209 if self.refersmf:
209 210 # Do not check manifest if there are only changelog entries with
210 211 # null manifests.
211 self.checklog(mf, "manifest", 0)
212 self.checklog(mf, label, 0)
212 213 total = len(mf)
213 214 for i in mf:
214 215 ui.progress(_('checking'), i, total=total, unit=_('manifests'))
215 216 n = mf.node(i)
216 lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []),
217 "manifest")
217 lr = self.checkentry(mf, i, n, seen, mflinkrevs.get(n, []), label)
218 218 if n in mflinkrevs:
219 219 del mflinkrevs[n]
220 220 else:
221 self.err(lr, _("%s not in changesets") % short(n), "manifest")
221 self.err(lr, _("%s not in changesets") % short(n), label)
222 222
223 223 try:
224 224 for f, fn in mf.readdelta(n).iteritems():
@@ -229,14 +229,14 b' class verifier(object):'
229 229 filenodes.setdefault(
230 230 _normpath(f), {}).setdefault(fn, lr)
231 231 except Exception as inst:
232 self.exc(lr, _("reading delta %s") % short(n), inst)
232 self.exc(lr, _("reading delta %s") % short(n), inst, label)
233 233 ui.progress(_('checking'), None)
234 234
235 235 if self.havemf:
236 236 for c, m in sorted([(c, m) for m in mflinkrevs
237 237 for c in mflinkrevs[m]]):
238 238 self.err(c, _("changeset refers to unknown revision %s") %
239 short(m), "manifest")
239 short(m), label)
240 240
241 241 return filenodes
242 242
General Comments 0
You need to be logged in to leave comments. Login now