##// END OF EJS Templates
verify: clean up weird error/warning lists...
Matt Mackall -
r27453:8462d7f2 default
parent child Browse files
Show More
@@ -51,8 +51,8 b' class verifier(object):'
51 self.repo = repo.unfiltered()
51 self.repo = repo.unfiltered()
52 self.ui = repo.ui
52 self.ui = repo.ui
53 self.badrevs = set()
53 self.badrevs = set()
54 self.errors = [0]
54 self.errors = 0
55 self.warnings = [0]
55 self.warnings = 0
56 self.havecl = len(repo.changelog) > 0
56 self.havecl = len(repo.changelog) > 0
57 self.havemf = len(repo.manifest) > 0
57 self.havemf = len(repo.manifest) > 0
58 self.revlogv1 = repo.changelog.version != revlog.REVLOGV0
58 self.revlogv1 = repo.changelog.version != revlog.REVLOGV0
@@ -62,7 +62,7 b' class verifier(object):'
62
62
63 def warn(self, msg):
63 def warn(self, msg):
64 self.ui.warn(msg + "\n")
64 self.ui.warn(msg + "\n")
65 self.warnings[0] += 1
65 self.warnings += 1
66
66
67 def err(self, linkrev, msg, filename=None):
67 def err(self, linkrev, msg, filename=None):
68 if linkrev is not None:
68 if linkrev is not None:
@@ -73,7 +73,7 b' class verifier(object):'
73 if filename:
73 if filename:
74 msg = "%s@%s" % (filename, msg)
74 msg = "%s@%s" % (filename, msg)
75 self.ui.warn(" " + msg + "\n")
75 self.ui.warn(" " + msg + "\n")
76 self.errors[0] += 1
76 self.errors += 1
77
77
78 def exc(self, linkrev, msg, inst, filename=None):
78 def exc(self, linkrev, msg, inst, filename=None):
79 if not str(inst):
79 if not str(inst):
@@ -87,8 +87,6 b' class verifier(object):'
87 filenodes = {}
87 filenodes = {}
88 revisions = 0
88 revisions = 0
89 badrevs = self.badrevs
89 badrevs = self.badrevs
90 errors = self.errors
91 warnings = self.warnings
92 ui = repo.ui
90 ui = repo.ui
93 cl = repo.changelog
91 cl = repo.changelog
94 mf = repo.manifest
92 mf = repo.manifest
@@ -352,13 +350,13 b' class verifier(object):'
352
350
353 ui.status(_("%d files, %d changesets, %d total revisions\n") %
351 ui.status(_("%d files, %d changesets, %d total revisions\n") %
354 (len(files), len(cl), revisions))
352 (len(files), len(cl), revisions))
355 if warnings[0]:
353 if self.warnings:
356 ui.warn(_("%d warnings encountered!\n") % warnings[0])
354 ui.warn(_("%d warnings encountered!\n") % self.warnings)
357 if self.fncachewarned:
355 if self.fncachewarned:
358 ui.warn(_('hint: run "hg debugrebuildfncache" to recover from '
356 ui.warn(_('hint: run "hg debugrebuildfncache" to recover from '
359 'corrupt fncache\n'))
357 'corrupt fncache\n'))
360 if errors[0]:
358 if self.errors:
361 ui.warn(_("%d integrity errors encountered!\n") % errors[0])
359 ui.warn(_("%d integrity errors encountered!\n") % self.errors)
362 if badrevs:
360 if badrevs:
363 ui.warn(_("(first damaged changeset appears to be %d)\n")
361 ui.warn(_("(first damaged changeset appears to be %d)\n")
364 % min(badrevs))
362 % min(badrevs))
General Comments 0
You need to be logged in to leave comments. Login now