comparison mercurial/verify.py @ 22933:3a60cd44e619

verify: report censored nodes if configured policy is abort
author Mike Edgar <adgar@google.com>
date Tue, 14 Oct 2014 16:16:04 -0400
parents 78f547cdc362
children dded1eeeff64
comparison
equal deleted inserted replaced
22932:d81792872984 22933:3a60cd44e619
265 rp = fl.renamed(n) 265 rp = fl.renamed(n)
266 if l != fl.size(i): 266 if l != fl.size(i):
267 if len(fl.revision(n)) != fl.size(i): 267 if len(fl.revision(n)) != fl.size(i):
268 err(lr, _("unpacked size is %s, %s expected") % 268 err(lr, _("unpacked size is %s, %s expected") %
269 (l, fl.size(i)), f) 269 (l, fl.size(i)), f)
270 except error.CensoredNodeError:
271 if ui.config("censor", "policy", "abort") == "abort":
272 err(lr, _("censored file data"), f)
270 except Exception, inst: 273 except Exception, inst:
271 exc(lr, _("unpacking %s") % short(n), inst, f) 274 exc(lr, _("unpacking %s") % short(n), inst, f)
272 275
273 # check renames 276 # check renames
274 try: 277 try: