Mercurial > public > mercurial-scm > hg
comparison mercurial/verify.py @ 25846:c55eac3f388d
censor: mark experimental option
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jun 2015 17:56:26 -0500 |
parents | 328739ea70c3 |
children | d21d1774c73b |
comparison
equal
deleted
inserted
replaced
25845:7e3bb3e1bfa7 | 25846:c55eac3f388d |
---|---|
268 if l != fl.size(i): | 268 if l != fl.size(i): |
269 if len(fl.revision(n)) != fl.size(i): | 269 if len(fl.revision(n)) != fl.size(i): |
270 err(lr, _("unpacked size is %s, %s expected") % | 270 err(lr, _("unpacked size is %s, %s expected") % |
271 (l, fl.size(i)), f) | 271 (l, fl.size(i)), f) |
272 except error.CensoredNodeError: | 272 except error.CensoredNodeError: |
273 # experimental config: censor.policy | |
273 if ui.config("censor", "policy", "abort") == "abort": | 274 if ui.config("censor", "policy", "abort") == "abort": |
274 err(lr, _("censored file data"), f) | 275 err(lr, _("censored file data"), f) |
275 except Exception as inst: | 276 except Exception as inst: |
276 exc(lr, _("unpacking %s") % short(n), inst, f) | 277 exc(lr, _("unpacking %s") % short(n), inst, f) |
277 | 278 |