rpms/monotone-viz/F-13 monotone-viz-1.0.2-dot.patch, NONE, 1.1 monotone-viz-1.0.2-new-stdio.patch, NONE, 1.1 import.log, 1.3, 1.4 monotone-viz.spec, 1.8, 1.9 monotone-viz-1.0.2-mtn-0.46.patch, 1.1, NONE

Thomas Moschny thm at fedoraproject.org
Thu Jul 8 05:37:32 UTC 2010


Author: thm

Update of /cvs/pkgs/rpms/monotone-viz/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11929/F-13

Modified Files:
	import.log monotone-viz.spec 
Added Files:
	monotone-viz-1.0.2-dot.patch 
	monotone-viz-1.0.2-new-stdio.patch 
Removed Files:
	monotone-viz-1.0.2-mtn-0.46.patch 
Log Message:
- Update patch to better support monotone-0.46 and later.
- Add patch to workaround broken dot "-y" option.


monotone-viz-1.0.2-dot.patch:
 agraph.ml |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE monotone-viz-1.0.2-dot.patch ---
#
#
# patch "agraph.ml"
#  from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e]
#    to [05aa88921481ac9bfe238daeb4374fbc9993caaa]
#
============================================================
--- agraph.ml	8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e
+++ agraph.ml	05aa88921481ac9bfe238daeb4374fbc9993caaa
@@ -50,8 +50,9 @@ let dot_format params agraph =
       agraph.nodes in
 
   !+ "digraph \"monotone-viz\"\n{\n" ;
-  if params.lr_layout then
-    !+ "  graph [rankdir=LR] ;\n" ;
+  if params.lr_layout
+  then  !+ "  graph [rankdir=LR] ;\n"
+  else  !+ "  graph [rankdir=BT] ;\n" ;
   !+ "  graph [ranksep=\"0.25\"] ;\n" ;
   !+ "  node [label=\"\"] ;\n" ;
   
@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb =
   let dot_prg = graph.layout_params.dot_program in
   let cmd = 
     if Viz_misc.debug "dot"
-    then [ "/bin/sh" ; "-c" ; 
+    then [ "/bin/bash" ; "-c" ; 
 	   Printf.sprintf 
 	     "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
+              tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ]
+    else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in
   let error fmt =
     Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in
   try

monotone-viz-1.0.2-new-stdio.patch:
 automate.ml |   52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

--- NEW FILE monotone-viz-1.0.2-new-stdio.patch ---
#
#
# patch "automate.ml"
#  from [bc697ff6c3768259b1838e5638552f448433b53a]
#    to [81cd3139b4ac5a13091737bf47b0c2e1b62eea62]
#
============================================================
--- automate.ml	bc697ff6c3768259b1838e5638552f448433b53a
+++ automate.ml	81cd3139b4ac5a13091737bf47b0c2e1b62eea62
@@ -44,7 +44,7 @@ type output = [
   | `OUTPUT       of string
   | `ERROR        of string
   | `SYNTAX_ERROR of string]
-type chunk = command_id * int * bool * string
+type chunk = command_id * bool * string
 type process = {
     p_in  :  in_watch ;
     p_out : out_watch ;
@@ -152,7 +152,7 @@ let _read_cb w conditions =
     try 
       match Giochannel.read_chars w.out_w.w_chan w.out_sb with
       | `NORMAL read ->
-	  if debug then log "%s cb: read %d" w.out_w.w_name read ;
+	  if debug then log "%s cb: read %d" w.out_w.w_name read;
 	  Buffer.add_substring w.out_buffer w.out_sb 0 read ;
 	  w.out_cb w.out_buffer
       | `EOF ->
@@ -258,8 +258,8 @@ let encode_stdio cmd =
 
 
 
-let find_four_colon b =
-  let to_find = ref 4 in
+let find_three_colon b =
+  let to_find = ref 3 in
   let i = ref 0 in
   while !to_find > 0 do
     let c = Buffer.nth b !i in
@@ -277,22 +277,20 @@ let decode_stdio_chunk b =
 
 let decode_stdio_chunk b =
   try
-    let header_len = find_four_colon b in
+    let header_len = find_three_colon b in
     let h = Buffer.sub b 0 header_len in
     let c1 = String.index_from h 0 ':' in
     let number = int_of_string (string_slice ~e:c1 h) in
-    let code   = int_of_char h.[c1 + 1] - int_of_char '0' in
     let c2 = String.index_from h (c1 + 1) ':' in
-    let last   = h.[c2 + 1] in
+    let last   = h.[c1 + 1] in
     let c3 = String.index_from h (c2 + 1) ':' in
-    let c4 = String.index_from h (c3 + 1) ':' in
-    let len   = int_of_string (string_slice ~s:(c3 + 1) ~e:c4 h) in
+    let len   = int_of_string (string_slice ~s:(c2 + 1) ~e:c3 h) in
     if Buffer.length b < header_len + len
     then
       `INCOMPLETE
     else
       let data = truncate_buffer b header_len len in
-      `CHUNK (number, code, last = 'l', data)
+      `CHUNK (number, last = 'l', data)
   with Invalid_argument _ ->
     `INCOMPLETE
 
@@ -305,11 +303,11 @@ let rec out_cb p b =
   | `INCOMPLETE ->
       ()
 
-  | `CHUNK (nb, _, _, _) when aborted_cmd p nb ->
+  | `CHUNK (nb, _, _) when aborted_cmd p nb ->
       p.chunks <- List.remove_assoc nb p.chunks ;
       out_cb p b
 
-  | `CHUNK ((nb, code, false, data) as chunk) ->
+  | `CHUNK ((nb, false, data) as chunk) ->
       if debug then log "decoded a chunk" ;
       let previous_chunks =
 	try List.assoc nb p.chunks
@@ -320,7 +318,7 @@ let rec out_cb p b =
       previous_chunks := chunk :: !previous_chunks ;
       out_cb p b
 
-  | `CHUNK ((nb, code, true, data) as chunk) ->
+  | `CHUNK ((nb, true, data) as chunk) ->
       if debug then log "decoded last chunk" ;
       let chunks =
 	try 
@@ -333,14 +331,14 @@ let rec out_cb p b =
       p.callbacks <- List.remove_assoc nb p.callbacks ;
       let msg = 
 	String.concat ""
-	  (List.map (fun (_, _, _, d) -> d) chunks) in
-      let data =
-	match code with
-	| 0 -> `OUTPUT msg
-	| 1 -> `SYNTAX_ERROR msg
-	| 2 -> `ERROR msg
+	  (List.map (function (_, false, d) -> d | (_, true, d) -> "") chunks) in
+      let code =
+	match data with
+	| "0" -> `OUTPUT msg
+	| "1" -> `SYNTAX_ERROR msg
+	| "2" -> `ERROR msg
 	| _ -> failwith "invalid_code in automate stdio output" in
-      ignore (Glib.Idle.add ~prio:0 (fun () -> cb data ; false)) ;
+      ignore (Glib.Idle.add ~prio:0 (fun () -> cb code ; false)) ;
       out_cb p b
 
 
@@ -409,6 +407,20 @@ let spawn mtn db = 
       chunks = [] ;
       exit_cb = (fun _ -> assert false)
     } in
+  let rec check_version buf =
+    if String.contains buf '\n' then
+      String.length buf >= 18 && String.sub buf 0 18 = "format-version: 2\n"
+    else
+      match Giochannel.read_chars p.p_out.out_w.w_chan p.p_out.out_sb  with
+      | `NORMAL read -> check_version (buf ^ String.sub p.p_out.out_sb 0 read)
+      | `EOF ->
+	  Giochannel.shutdown p.p_out.out_w.w_chan false;
+	  Giochannel.shutdown p.p_err.out_w.w_chan false;
+	  failwith "mtn version 0.46 or above is required";
+      | `AGAIN -> check_version buf
+  in
+  if not (check_version "")
+  then failwith "mtn stdio uses an unknown format-version";
   let pid = some child.Gspawn.pid in
   ignore (Gspawn.add_child_watch ~prio:50 pid (reap_cb p pid)) ;
   p.p_out.out_cb <- out_cb p ;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/F-13/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	30 Jan 2010 09:18:54 -0000	1.3
+++ import.log	8 Jul 2010 05:37:32 -0000	1.4
@@ -1,3 +1,4 @@
 monotone-viz-1_0_1-4_fc10:HEAD:monotone-viz-1.0.1-4.fc10.src.rpm:1235692446
 monotone-viz-1_0_2-1_fc12:HEAD:monotone-viz-1.0.2-1.fc12.src.rpm:1264062047
 monotone-viz-1_0_2-2_fc12:HEAD:monotone-viz-1.0.2-2.fc12.src.rpm:1264842977
+monotone-viz-1_0_2-3_fc13:F-13:monotone-viz-1.0.2-3.fc13.src.rpm:1278567414


Index: monotone-viz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/F-13/monotone-viz.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- monotone-viz.spec	30 Jan 2010 09:18:54 -0000	1.8
+++ monotone-viz.spec	8 Jul 2010 05:37:32 -0000	1.9
@@ -1,13 +1,14 @@
 Name:           monotone-viz
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME application that visualizes Monotone ancestry graphs
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://oandrieu.nerim.net/monotone-viz/
 Source0:        %{url}/%{name}-%{version}-nolablgtk.tar.gz
 Source1:        monotone-viz.desktop
-Patch0:         monotone-viz-1.0.2-mtn-0.46.patch
+Patch0:         monotone-viz-1.0.2-new-stdio.patch
+Patch1:         monotone-viz-1.0.2-dot.patch
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-lablgtk-devel
@@ -30,7 +31,8 @@ This is a small GNOME application to vis
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .mtn-0.46
+%patch0 -p0 -b .new-stdio
+%patch1 -p0 -b .dot
 
 
 %build
@@ -66,6 +68,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul  6 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.2-3
+- Update patch to better support monotone-0.46 and later.
+- Add patch to workaround broken dot "-y" option.
+
 * Fri Jan 29 2010 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.2-2
 - Add patch from Stéphane Gimenez for monotone >= 0.46.
 


--- monotone-viz-1.0.2-mtn-0.46.patch DELETED ---



More information about the scm-commits mailing list