summaryrefslogtreecommitdiff
path: root/src/diff_show.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_show.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_show.ml')
-rw-r--r--src/diff_show.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/diff_show.ml b/src/diff_show.ml
index f10fde4..fad9b34 100644
--- a/src/diff_show.ml
+++ b/src/diff_show.ml
@@ -88,7 +88,7 @@ module Diff_show = struct
}
- let diff_func ?(recurse=true) (path : string list) res (m : change) =
+ let diff_func ?(descent=true) (path : string list) res (m : change) =
(* alert exn Vytree.get, Reference_tree.refpath, Config_tree.get_values,
Reference_tree.is_multi, Config_tree.is_tag_value:
[Vytree.Empty_path] checked at only point possible (Unchanged)
@@ -138,7 +138,7 @@ module Diff_show = struct
{res with config_diff = rev_diff; open_blocks = rev_blocks;}
| Unchanged ->
begin
- match recurse with
+ match descent with
| false ->
let rendered = render_level_open indent res.left path in
let rev_diff = diff_str ^ annotate_rendered m rendered in
@@ -238,5 +238,5 @@ let diff_show rt path left right =
let init = Diff_show.make_init left right rt path in
let ret = D.diff init left right in
(* close final braces *)
- let res = Diff_show.diff_func ~recurse:false [] ret Unchanged in
+ let res = Diff_show.diff_func ~descent:false [] ret Unchanged in
res.config_diff