Merge pull request #56 from jestabro/show-config

T7988: calculation for config-mode 'show' command

1 files changed, 17 insertions, 14 deletions

diff --git a/src/config_diff.mli b/src/config_diff.mli
index 98e0ee3..7579e32 100644
--- a/src/config_diff.mli
+++ b/src/config_diff.mli
@@ -10,7 +10,7 @@ module Diff_tree : sig
              }
 end
 
-module Diff_string : sig
+module Diff_compare : sig
     type t = { left: Config_tree.t;
                right: Config_tree.t;
                skel: Config_tree.t;
@@ -19,23 +19,24 @@ module Diff_string : sig
              }
 end
 
-module Diff_cstore : sig
+module Diff_show : sig
     type t = { left: Config_tree.t;
                right: Config_tree.t;
-               handle: int;
-               out: string;
+               base_path: string list;
+               open_blocks: string list list;
+               config_diff: string;
              }
 end
 
-type _ result =
-    | Diff_tree : Diff_tree.t -> Diff_tree.t result
-    | Diff_string : Diff_string.t -> Diff_string.t result
-    | Diff_cstore : Diff_cstore.t -> Diff_cstore.t result
+type _ diff_result =
+    | Diff_tree : Diff_tree.t -> Diff_tree.t diff_result
+    | Diff_compare : Diff_compare.t -> Diff_compare.t diff_result
+    | Diff_show : Diff_show.t -> Diff_show.t diff_result
 
-val eval_result : 'a result -> 'a
+val eval_diff_result : 'a diff_result -> 'a
 
-type 'a diff_func = ?recurse:bool -> string list -> 'a result -> change -> 'a result
-val diff : string list -> 'a diff_func -> 'a result -> Config_tree.t option * Config_tree.t option -> 'a result
+type 'a diff_func = ?recurse:bool -> string list -> 'a diff_result -> change -> 'a diff_result
+val diff : string list -> 'a diff_func -> 'a diff_result -> Config_tree.t option * Config_tree.t option -> 'a diff_result
 
 exception Incommensurable
 exception Empty_comparison
@@ -48,7 +49,11 @@ val diff_tree : string list -> Config_tree.t -> Config_tree.t -> Config_tree.t
 [@@alert exn "Config_diff.Incommensurable"]
 [@@alert exn "Config_diff.Empty_comparison"]
 
-val show_diff : ?cmds:bool -> string list -> Config_tree.t -> Config_tree.t -> string
+val diff_compare : ?cmds:bool -> string list -> Config_tree.t -> Config_tree.t -> string
+[@@alert exn "Config_diff.Incommensurable"]
+[@@alert exn "Config_diff.Empty_comparison"]
+
+val diff_show : Reference_tree.t -> string list -> Config_tree.t -> Config_tree.t -> string
 [@@alert exn "Config_diff.Incommensurable"]
 [@@alert exn "Config_diff.Empty_comparison"]
 
@@ -64,6 +69,4 @@ val mask_tree : Config_tree.t -> Config_tree.t -> Config_tree.t
 [@@alert exn "Config_diff.Incommensurable"]
 [@@alert exn "Config_diff.Empty_comparison"]
 
-val make_diff_cstore : Config_tree.t -> Config_tree.t -> int -> Diff_cstore.t result
-
 val get_tagged_delete_tree : Config_tree.t -> Config_tree.t