Mercurial > hg
comparison hgext/censor.py @ 24890:cba84b06b702 stable
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.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 01 May 2015 22:19:20 +0900 |
parents | 5e111acc1170 |
children | 80c5b2666a96 |
comparison
equal
deleted
inserted
replaced
24889:ab9390165429 | 24890:cba84b06b702 |
---|---|
20 Censored nodes can interrupt mercurial's typical operation whenever the excised | 20 Censored nodes can interrupt mercurial's typical operation whenever the excised |
21 data needs to be materialized. Some commands, like ``hg cat``/``hg revert``, | 21 data needs to be materialized. Some commands, like ``hg cat``/``hg revert``, |
22 simply fail when asked to produce censored data. Others, like ``hg verify`` and | 22 simply fail when asked to produce censored data. Others, like ``hg verify`` and |
23 ``hg update``, must be capable of tolerating censored data to continue to | 23 ``hg update``, must be capable of tolerating censored data to continue to |
24 function in a meaningful way. Such commands only tolerate censored file | 24 function in a meaningful way. Such commands only tolerate censored file |
25 revisions if they are allowed by the policy specified by the "censor.allow" | 25 revisions if they are allowed by the "censor.policy=ignore" config option. |
26 config option. | |
27 """ | 26 """ |
28 | 27 |
29 from mercurial.node import short | 28 from mercurial.node import short |
30 from mercurial import cmdutil, error, filelog, revlog, scmutil, util | 29 from mercurial import cmdutil, error, filelog, revlog, scmutil, util |
31 from mercurial.i18n import _ | 30 from mercurial.i18n import _ |