##// END OF EJS Templates
verify: make the `exc` method private...
marmoute -
r42032:cfe08588 default
parent child Browse files
Show More
@@ -69,7 +69,7 b' class verifier(object):'
69 self.ui.warn(" " + msg + "\n")
69 self.ui.warn(" " + msg + "\n")
70 self.errors += 1
70 self.errors += 1
71
71
72 def exc(self, linkrev, msg, inst, filename=None):
72 def _exc(self, linkrev, msg, inst, filename=None):
73 """record exception raised during the verify process"""
73 """record exception raised during the verify process"""
74 fmsg = pycompat.bytestr(inst)
74 fmsg = pycompat.bytestr(inst)
75 if not fmsg:
75 if not fmsg:
@@ -122,7 +122,7 b' class verifier(object):'
122 self._err(lr, _("unknown parent 2 %s of %s") %
122 self._err(lr, _("unknown parent 2 %s of %s") %
123 (short(p2), short(node)), f)
123 (short(p2), short(node)), f)
124 except Exception as inst:
124 except Exception as inst:
125 self.exc(lr, _("checking parents of %s") % short(node), inst, f)
125 self._exc(lr, _("checking parents of %s") % short(node), inst, f)
126
126
127 if node in seen:
127 if node in seen:
128 self._err(lr, _("duplicate revision %d (%d)") % (i, seen[node]), f)
128 self._err(lr, _("duplicate revision %d (%d)") % (i, seen[node]), f)
@@ -195,7 +195,7 b' class verifier(object):'
195 filelinkrevs.setdefault(_normpath(f), []).append(i)
195 filelinkrevs.setdefault(_normpath(f), []).append(i)
196 except Exception as inst:
196 except Exception as inst:
197 self.refersmf = True
197 self.refersmf = True
198 self.exc(i, _("unpacking changeset %s") % short(n), inst)
198 self._exc(i, _("unpacking changeset %s") % short(n), inst)
199 progress.complete()
199 progress.complete()
200 return mflinkrevs, filelinkrevs
200 return mflinkrevs, filelinkrevs
201
201
@@ -257,7 +257,7 b' class verifier(object):'
257 continue
257 continue
258 filenodes.setdefault(fullpath, {}).setdefault(fn, lr)
258 filenodes.setdefault(fullpath, {}).setdefault(fn, lr)
259 except Exception as inst:
259 except Exception as inst:
260 self.exc(lr, _("reading delta %s") % short(n), inst, label)
260 self._exc(lr, _("reading delta %s") % short(n), inst, label)
261 if not dir:
261 if not dir:
262 progress.complete()
262 progress.complete()
263
263
@@ -443,7 +443,8 b' class verifier(object):'
443 else:
443 else:
444 fl2.rev(rp[1])
444 fl2.rev(rp[1])
445 except Exception as inst:
445 except Exception as inst:
446 self.exc(lr, _("checking rename of %s") % short(n), inst, f)
446 self._exc(lr, _("checking rename of %s") % short(n),
447 inst, f)
447
448
448 # cross-check
449 # cross-check
449 if f in filenodes:
450 if f in filenodes:
General Comments 0
You need to be logged in to leave comments. Login now