comparison mercurial/verify.py @ 10282:08a0f04b56bd

many, many trivial check-code fixups
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jan 2010 00:05:27 -0600
parents 25e572394f5c
children 767fbacb3ddc
comparison
equal deleted inserted replaced
10281:e7d3b509af8b 10282:08a0f04b56bd
153 exc(lr, _("reading manifest delta %s") % short(n), inst) 153 exc(lr, _("reading manifest delta %s") % short(n), inst)
154 154
155 ui.status(_("crosschecking files in changesets and manifests\n")) 155 ui.status(_("crosschecking files in changesets and manifests\n"))
156 156
157 if havemf: 157 if havemf:
158 for c,m in sorted([(c, m) for m in mflinkrevs for c in mflinkrevs[m]]): 158 for c, m in sorted([(c, m) for m in mflinkrevs
159 for c in mflinkrevs[m]]):
159 err(c, _("changeset refers to unknown manifest %s") % short(m)) 160 err(c, _("changeset refers to unknown manifest %s") % short(m))
160 mflinkrevs = None # del is bad here due to scope issues 161 mflinkrevs = None # del is bad here due to scope issues
161 162
162 for f in sorted(filelinkrevs): 163 for f in sorted(filelinkrevs):
163 if f not in filenodes: 164 if f not in filenodes:
257 except Exception, inst: 258 except Exception, inst:
258 exc(lr, _("checking rename of %s") % short(n), inst, f) 259 exc(lr, _("checking rename of %s") % short(n), inst, f)
259 260
260 # cross-check 261 # cross-check
261 if f in filenodes: 262 if f in filenodes:
262 fns = [(lr, n) for n,lr in filenodes[f].iteritems()] 263 fns = [(lr, n) for n, lr in filenodes[f].iteritems()]
263 for lr, node in sorted(fns): 264 for lr, node in sorted(fns):
264 err(lr, _("%s in manifests not found") % short(node), f) 265 err(lr, _("%s in manifests not found") % short(node), f)
265 266
266 for f in storefiles: 267 for f in storefiles:
267 warn(_("warning: orphan revlog '%s'") % f) 268 warn(_("warning: orphan revlog '%s'") % f)