Mercurial > hgrepos > Python > libs > ConfigMix

comparison configmix/__init__.py @ 641:226aae226b8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Remove last expanding lookup of a value when merging configurations
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 05 Mar 2022 14:31:30 +0100
parents ef485419d723
children e73cf5593010
comparison
equal deleted inserted replaced
640:d35f41e15404 641:226aae226b8d
514 if k in user: 514 if k in user:
515 if isinstance(user, Configuration): 515 if isinstance(user, Configuration):
516 ukv = user.getitem_ns(k) 516 ukv = user.getitem_ns(k)
517 else: 517 else:
518 ukv = user[k] 518 ukv = user[k]
519 if user[k] == constants.DEL_VALUE: 519 if ukv == constants.DEL_VALUE:
520 # do not copy 520 # do not copy
521 del user[k] 521 del user[k]
522 else: 522 else:
523 user[k] = _safe_merge(ukv, v, filter_comments) 523 user[k] = _safe_merge(ukv, v, filter_comments)
524 else: 524 else: