Add --exclude option.

Implements #14

Author: mjambon

src/bin/main.ml

@@ -8,15 +8,16 @@ open Dune_deps
 
 type config = {
   roots : string list;
+  exclude : string list;
   no_exe : bool;
   no_ext : bool;
   deps : string list;
   revdeps : string list;
 }
 
-let optimistic_run {roots; no_exe; no_ext; deps; revdeps} =
+let optimistic_run {roots; exclude; no_exe; no_ext; deps; revdeps} =
   let graph =
-    Find.find_dune_files roots
+    Find.find_dune_files roots ~exclude
     |> Dune.load_files
   in
   let graph =
@@ -57,6 +58,15 @@ let roots_term =
   in
   Arg.value (Arg.pos_all Arg.file ["."] info)
 
+let exclude_term =
+  let info =
+    Arg.info ["exclude"; "x"]
+      ~docv:"ROOT"
+      ~doc:"Ignore folder or file $(docv) when scanning the file tree \
+            for 'dune' files."
+  in
+  Arg.value (Arg.opt_all Arg.string [] info)
+
 let no_exe_term =
   let info =
     Arg.info ["no-exe"]
@@ -109,14 +119,15 @@ let revdeps_term =
   Arg.value (Arg.opt_all Arg.string [] info)
 
 let cmdline_term =
-  let combine roots no_exe no_ext hourglass deps revdeps =
+  let combine roots exclude no_exe no_ext hourglass deps revdeps =
     let deps, revdeps =
       (deps @ hourglass), (revdeps @ hourglass)
     in
-    { roots; no_exe; no_ext; deps; revdeps }
+    { roots; exclude; no_exe; no_ext; deps; revdeps }
   in
   Term.(const combine
         $ roots_term
+        $ exclude_term
         $ no_exe_term
         $ no_ext_term
         $ hourglass_term

src/lib/Find.ml

@@ -61,8 +61,9 @@ let find ~accept_file_name ~accept_dir_name visit_tracker root =
    Excludes '_build' folders but doesn't honor exclusion rules specified
    in dune files with (dirs ... \ exclude_me).
 *)
-let find_dune_files roots =
+let find_dune_files ~exclude roots =
   let visit_tracker = create_visit_tracker () in
+  List.iter visit_tracker.mark_visited exclude;
   List.fold_left (fun acc root ->
     find
       ~accept_file_name:(fun name -> name = "dune")

test/Makefile

@@ -14,9 +14,9 @@ test: output
 
 .PHONY: output
 output:
-	./dune-deps proj extra-proj > proj.dot
-	./dune-deps proj extra-proj --no-exe > proj-no-exe.dot
-	./dune-deps proj extra-proj --no-ext > proj-no-ext.dot
+	./dune-deps proj extra-proj -x extra-proj/exclude-me > proj.dot
+	./dune-deps proj --no-exe > proj-no-exe.dot
+	./dune-deps proj --no-ext > proj-no-ext.dot
 	./dune-deps proj --hourglass lib5 -h lib3 > proj-hourglass.dot
 	./dune-deps proj --deps lib3 --revdeps lib5 > proj-deps.dot
 

test/extra-proj/exclude-me/dune

@@ -0,0 +1,3 @@
+(library
+  (public_name exclude-me)
+)

test/proj-no-ext.dot.expected

@@ -1,5 +1,4 @@
 digraph {
-  "exe:extra-proj/dune:0" [label="extra",shape=diamond]
   "exe:proj/bar/test/dune:0" [label="test<bar/test>",shape=diamond]
   "exe:proj/foo/test/dune:0" [label="test<foo/test>",shape=diamond]
   "exe:proj/dune:10" [label="lib-or-exe",shape=diamond]