diff options
Diffstat (limited to 'src/config_diff.mli')
| -rw-r--r-- | src/config_diff.mli | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/config_diff.mli b/src/config_diff.mli index 5f96209..70fb2e0 100644 --- a/src/config_diff.mli +++ b/src/config_diff.mli @@ -1,12 +1,12 @@ -type change = Unchanged | Added | Deleted | Updated of string list +type change = Unchanged | Added | Subtracted | Updated of string list -type diff_func = ?with_children:bool -> string list -> change -> unit +type diff_func = ?recurse:bool -> string list -> change -> unit type diff_trees = { left: Config_tree.t; right: Config_tree.t; add: Config_tree.t ref; - del: Config_tree.t ref; + sub: Config_tree.t ref; inter: Config_tree.t ref; } @@ -14,8 +14,10 @@ exception Incommensurable exception Empty_comparison val make_diff_trees : Config_tree.t -> Config_tree.t -> diff_trees -val clone : ?with_children:bool -> ?set_values:string list -> Config_tree.t -> Config_tree.t -> string list -> Config_tree.t -val decorate_trees : diff_trees -> ?with_children:bool -> string list -> change -> unit +val clone : ?recurse:bool -> ?set_values:(string list) option -> Config_tree.t -> Config_tree.t -> string list -> Config_tree.t +val decorate_trees : diff_trees -> ?recurse:bool -> string list -> change -> unit +val trim_trees : diff_trees -> ?recurse:bool -> string list -> change -> unit val compare : string list -> Config_tree.t -> Config_tree.t -> diff_trees val diff_tree : string list -> Config_tree.t -> Config_tree.t -> Config_tree.t +val trim_tree : Config_tree.t -> Config_tree.t -> Config_tree.t |