# # # patch "agraph.ml" # from [5823b36800b8a29b8a9b1105ee4945620526da33] # to [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e] # # patch "automate.ml" # from [43627088a95d11a8001f4ae39c73727538f78f15] # to [08f480fa23943d31385ca5b0354241c6f2736a9d] # # patch "monotone.ml" # from [e96a644b538acbca1d01fb33357b1c3198c71d12] # to [0382cdbf55843fdd36f008a37b5236565289f9d0] # # patch "subprocess.ml" # from [29e5d934ca5778dde131c1604d8f6a7f5070d7f1] # to [2d064944dda534981a86b13dbc018a47bfcf5576] # ============================================================ --- agraph.ml 5823b36800b8a29b8a9b1105ee4945620526da33 +++ agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e @@ -227,8 +227,6 @@ let spawn_dot graph status done_cb = "set -o pipefail ; \ tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ] else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in - if Viz_misc.debug "exec" - then Printf.eprintf "### exec: Running '%s'\n%!" (String.concat " " cmd) ; let error fmt = Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in try ============================================================ --- automate.ml 43627088a95d11a8001f4ae39c73727538f78f15 +++ automate.ml 08f480fa23943d31385ca5b0354241c6f2736a9d @@ -392,13 +392,13 @@ let spawn mtn db = let spawn mtn db = + let cmd = [ mtn ; "-d" ; db ; "automate" ; "stdio" ] in + if Viz_misc.debug "exec" + then Printf.eprintf "### exec: Running '%s'\n%!" (String.concat " " cmd) ; let flags = [ `PIPE_STDIN ; `PIPE_STDOUT ; `PIPE_STDERR ; `SEARCH_PATH ; `DO_NOT_REAP_CHILD] in - let child = - Gspawn.async_with_pipes - ~flags - [ mtn ; "-d" ; db ; "automate" ; "stdio" ] in + let child = Gspawn.async_with_pipes ~flags cmd in let p = { p_in = make_in_watch "stdin" child.Gspawn.standard_input ; p_out = make_out_watch "stdout" child.Gspawn.standard_output ; ============================================================ --- monotone.ml e96a644b538acbca1d01fb33357b1c3198c71d12 +++ monotone.ml 0382cdbf55843fdd36f008a37b5236565289f9d0 @@ -8,8 +8,6 @@ let spawn_monotone mtn cmd input status let spawn_monotone mtn cmd input status cb = let mtn_exe, db_fname = Automate.get_info mtn in let cmd = mtn_exe :: "--db" :: db_fname :: cmd in - if Viz_misc.debug "exec" - then Printf.eprintf "### exec: Running '%s'\n%!" (String.concat " " cmd) ; try status#push "Running monotone ..." ; Subprocess.spawn ============================================================ --- subprocess.ml 29e5d934ca5778dde131c1604d8f6a7f5070d7f1 +++ subprocess.ml 2d064944dda534981a86b13dbc018a47bfcf5576 @@ -134,6 +134,8 @@ let spawn ~encoding ~cmd ~input:input_op } let spawn ~encoding ~cmd ~input:input_opt ~reap_callback done_callback = + if Viz_misc.debug "exec" + then Printf.eprintf "### exec: Running '%s'\n%!" (String.concat " " cmd) ; let has_input = input_opt <> None in let spawn_flags = [ `PIPE_STDOUT ; `PIPE_STDERR ;