summaryrefslogtreecommitdiff
path: root/src/diff_tree.ml
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2026-09-02 07:15:59 -0500
committerGitHub <noreply@github.com>2026-09-02 07:15:59 -0500
commit5b5c5f1277b165045123acae4a2470261fbad566 (patch)
tree8c43d13c61b282d889898cc03e55ffc25a82c62e /src/diff_tree.ml
parent07636e49b3a04fdc76ac42bd65df88736c3945f1 (diff)
parentf7b4459ba3c6551f8d054456b0d5013a4b0e3ee1 (diff)
downloadvyos1x-config-rolling.tar.gz
vyos1x-config-rolling.zip
Merge pull request #92 from jestabro/reference-tree-utilsrolling
T9231: Add reference_tree utils to return paths satisfying condition
Diffstat (limited to 'src/diff_tree.ml')
-rw-r--r--src/diff_tree.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/diff_tree.ml b/src/diff_tree.ml
index d592c90..3cd5303 100644
--- a/src/diff_tree.ml
+++ b/src/diff_tree.ml
@@ -19,7 +19,7 @@ module Diff_tree = struct
inter = Config_tree.default;
}
- let diff_func ?(recurse=true) (path : string list) res (m : change) =
+ let diff_func ?(descent=true) (path : string list) res (m : change) =
(* raises no exception:
clone will always be called on extant path of left or right
alert exn Vytree.get_values:
@@ -30,9 +30,9 @@ module Diff_tree = struct
| Added -> {res with add = (Config_tree.clone[@alert "-exn"]) res.right res.add path; }
| Subtracted ->
{res with sub = (Config_tree.clone[@alert "-exn"]) res.left res.sub path;
- del = (Config_tree.clone[@alert "-exn"]) ~recurse:false ~set_values:(Some []) res.left res.del path; }
+ del = (Config_tree.clone[@alert "-exn"]) ~descent:false ~set_values:(Some []) res.left res.del path; }
| Unchanged ->
- {res with inter = (Config_tree.clone[@alert "-exn"]) ~recurse:recurse res.left res.inter path; }
+ {res with inter = (Config_tree.clone[@alert "-exn"]) ~descent:descent res.left res.inter path; }
| Updated v ->
(* if in this case, node at path is guaranteed to exist *)
let ov = (Config_tree.get_values[@alert "-exn"]) res.left path in