Mercurial > hgrepos > Python > libs > ConfigMix

diff configmix/config.py @ 637:4499e9b4855d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The ``{{::DEL::}}`` is not subject to interpolation any more. This fixes the handling of these deletion markers when merging configurations: sometimes they were tried to be interpolated -- and this failed.
author Franz Glasner <f.glasner@feldmann-mg.com>
date Fri, 04 Mar 2022 17:35:27 +0100
parents 764d4185c76a
children d35f41e15404
line wrap: on
line diff
--- a/configmix/config.py	Sun Jan 23 17:34:11 2022 +0100
+++ b/configmix/config.py	Fri Mar 04 17:35:27 2022 +0100
@@ -29,7 +29,7 @@
 
 from .variables import lookup_varns, lookup_filter
 from .compat import u, uchr, n, str_and_u, PY2
-from .constants import REF_NAMESPACE, NONE_FILTER, EMPTY_FILTER
+from .constants import REF_NAMESPACE, NONE_FILTER, EMPTY_FILTER, DEL_VALUE
 try:
     from ._speedups import (fast_unquote, fast_quote, fast_pathstr2path,
                             _fast_split_ns, _fast_split_filters,
@@ -931,6 +931,8 @@
         len_s = len(s)
         if len_s < 4:
             return s
+        if s == DEL_VALUE:
+            return s
         start = s.find(_STARTTOK, 0)
         if start < 0:
             return s