[PATCH STABLE] censor: fix incorrect configuration name for ignoring error at censored file

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Fri May 1 13:24:50 UTC 2015


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1430486360 -32400
#      Fri May 01 22:19:20 2015 +0900
# Branch stable
# Node ID cba84b06b70237768925851adb1f58e6d0510a23
# Parent  ab9390165429b7891364c0d454f3ae3b04b00c7d
censor: fix incorrect configuration name for ignoring error at censored file

According to recent "filectx.data()" implementation, "censor.policy"
should be configured as "ignore" to ignore error at censored file:
"censor.allow" seems outdated name.

diff --git a/hgext/censor.py b/hgext/censor.py
--- a/hgext/censor.py
+++ b/hgext/censor.py
@@ -22,8 +22,7 @@
 simply fail when asked to produce censored data. Others, like ``hg verify`` and
 ``hg update``, must be capable of tolerating censored data to continue to
 function in a meaningful way. Such commands only tolerate censored file
-revisions if they are allowed by the policy specified by the "censor.allow"
-config option.
+revisions if they are allowed by the "censor.policy=ignore" config option.
 """
 
 from mercurial.node import short


More information about the Mercurial-devel mailing list