omry / omegaconf / 782e86a8-560e-4fe3-84c9-63705f0e285d

100%

master: 100%

Pull #1318

circleci

Fix nested readonly structured config merges

OmegaConf.merge() and OmegaConf.unsafe_merge() construct their results by mutating an internal merge target. Nested frozen structured configs can carry explicit readonly flags on destination containers, so recursive merge writes into those containers could raise ReadonlyConfigError even though public merge_with() is the operation that should reject readonly mutation.

Thread a private _allow_readonly_target flag through the merge internals so non-public merge construction can temporarily relax a destination container's local readonly flag, then restore the saved flag after the merge. Keep public merge_with() semantics unchanged.

Add regression coverage for OmegaConf.merge() and OmegaConf.unsafe_merge() with nested frozen structured configs, their input mutation contracts, and nested readonly flag restoration.

Fixes #1102

9 of 9 new or added lines in 1 file covered. (100.0%)

3819 of 3819 relevant lines covered (100.0%)

1.0 hits per line