# 
# patch "Makefile"
#  from [bb3af8407dd3f0b135fbfaecc3872f0af6389e1f]
#    to [c93ddc0881977ec81a5ea63fcd60242c3dc7a89d]
# 
# patch "README"
#  from [6a6a8ab967cbbfa28b2fc6e850289d5c3fc90aa5]
#    to [79507ad7ece9961e199537596e789bb725856fac]
# 
# patch "icon.ml"
#  from [edf2e4191cf2c8f0494f1519246db3a5ad3c13ec]
#    to [15ec5abe4fbc3c4234d48c075d46ef10373568f8]
# 
--- Makefile
+++ Makefile
@@ -37,7 +37,8 @@
           dot_types.mli dot_lexer.mll dot_parser.mly \
           subprocess.ml subprocess.mli icon.ml status.ml ui.ml \
           revision_types.mli revision_lexer.mll revision_parser.mly \
-          database.ml database.mli unidiff.ml unidiff.mli view.ml view.mli main.ml \
+          database.ml database.mli agraph.ml agraph.mli \
+          unidiff.ml unidiff.mli view.ml view.mli main.ml \
           mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli mlsqlite/ocaml-sqlite3.c \
           ocamlnet-0.97.1/base64.ml ocamlnet-0.97.1/base64.mli ocamlnet-0.97.1/LICENSE \
           extlib-1.3/IO.ml extlib-1.3/IO.mli extlib-1.3/unzip.ml extlib-1.3/unzip.mli \
--- README
+++ README
@@ -15,14 +15,18 @@
 To compile from sources, you'll also need:
 - a compiled monotone source tree
 - ocaml compiler (>= 3.07)
-- LablGTK 2.4.0 or lablgtk-20041119
+- LablGTK 2.4.0 or lablgtk-20041119 or lablgtk-20050218
 - libcrypto, from the openssl toolkit
 
 
 COMPILING
 =========
 - compile/install ocaml and LablGTK
-- adjust the MONOTONE_DIR, LABLGTK_DIR and CRYPTO_LIB variables in Makefile
+- if you've pulled this from the monotone repository,
+  run make a first time to generate the configure script
+- run ./configure, with the following options if needed :
+    --with-monotone-dir
+    --with-lablgtk-dir
 - make
 - install the binary monotone-viz somewhere
 
@@ -38,10 +42,7 @@
 MT/ subdirectory), it will automatically use the database and branch
 specified in the MT/options file.
 
-Set the MONOTONE environment variable to the name of the monotone
-executable if  it is not `monotone' or cannot be found in the PATH.
 
-
 STYLE FILE
 ==========
 Appearance can be controlled via a style file, named
@@ -51,8 +52,6 @@
 grammar: 
   "font" <font_name>
   "cert" cert_name <regexp> "[" ( attribute "=" <string> ";" )+ "]"
-  "bibble_babble" <yes|no>
-  "short_labels"  <yes|no>
   "autocolor"     <none|key|author|branch>
   "layout"        <LR|TB>
   comments are delimited by "(*" and "*)"
--- icon.ml
+++ icon.ml
@@ -1,173 +1,55 @@
 (* XPM *)
 let monotone_xpm = [|
-(* columns rows colors chars-per-pixel *)
-"24 32 133 2";
-"   c black";
-".  c #1C1A22";
-"X  c #35303F";
-"o  c #373140";
-"O  c #3C3646";
-"+  c #464053";
-"@  c #50485E";
-"#  c #5A526A";
-"$  c #665C77";
-"%  c #2B4E98";
-"&  c #2D509A";
-"*  c #4664A4";
-"=  c #536FAA";
-"-  c #5471AC";
-";  c #776C8C";
-":  c #657EB3";
-">  c #7187B6";
-";  c #7C8FBB";
-"<  c #7D92BE";
-"1  c #807497";
-"2  c #827699";
-"3  c #8A7CA1";
-"4  c #967FA0";
-"5  c #8D80AD";
-"6  c #9582A5";
-"7  c #9483AC";
-"8  c #9983A6";
-"9  c #9C8DAF";
-"0  c #9687B4";
-"q  c #9688B3";
-"w  c #9B8BB4";
-"e  c #9B8CB9";
-"r  c #9D91B5";
-"t  c #9E90BB";
-"y  c #A183A2";
-"u  c #A38AAB";
-"i  c #AA8AAA";
-"p  c #A18CB2";
-"a  c #A091AF";
-"s  c #AA9BAE";
-"d  c #A093B4";
-"f  c #A091BC";
-"g  c #A79ABC";
-"h  c #AA9FBB";
-"j  c #B586A2";
-"k  c #BD8DA6";
-"l  c #BA8DAA";
-"z  c #B298AA";
-"x  c #BF91AC";
-"c  c #BB9FB0";
-"v  c #AEA4BC";
-"b  c #B3A0B4";
-"n  c #B0A4BE";
-"m  c #BBAFBE";
-"M  c #8FA0C4";
-"N  c #96A6C6";
-"B  c #A495C1";
-"V  c #A798C4";
-"C  c #A899C6";
-"Z  c #AA9AC8";
-"A  c #A4B1CD";
-"S  c #ADB8CF";
-"D  c #AEB9D1";
-"F  c #B2A9C4";
-"G  c #B4AACA";
-"H  c #B8AECC";
-"J  c #B9B1C5";
-"K  c #BDB5CB";
-"L  c #BDB9C7";
-"P  c #B1BAD2";
-"I  c #BBC5DB";
-"U  c #C4859D";
-"Y  c #C18DA6";
-"T  c #CB8BA1";
-"R  c #C193AD";
-"E  c #CA91A6";
-"W  c #CE95AB";
-"Q  c #D490A5";
-"!  c #D197AC";
-"~  c #D39AAD";
-"^  c #DD95A9";
-"/  c #D99AAC";
-"(  c #DD9DB2";
-")  c #C3B1BD";
-"_  c #DDAEBC";
-"`  c #D3B0BB";
-"'  c #E095AA";
-"]  c #E19FB4";
-"[  c #E99FB4";
-"{  c #E7A0B4";
-"}  c #EBA3B6";
-"|  c #EDA5B8";
-" . c #F0A1B4";
-".. c #F0A6B9";
-"X. c #F3A8BA";
-"o. c #C5BBC5";
-"O. c #C1BBCC";
-"+. c #CFB8C2";
-"@. c #CABFC8";
-"#. c #D1BAC4";
-"$. c #CAC1CB";
-"%. c #C0C8D9";
-"&. c #D1C9CE";
-"*. c #D1CDD5";
-"=. c #D9CAD1";
-"-. c #D5D1D6";
-";. c #D9D6DB";
-":. c #DBD9DD";
-">. c #C3CDE2";
-";. c #CED5E2";
-"<. c #D0D5E1";
-"1. c #D6DAE3";
-"2. c #D6DDE8";
-"3. c #D9DBE2";
-"4. c #D9DFE9";
-"5. c #DCE0E6";
-"6. c #DCE1EC";
-"7. c #E4D2D6";
-"8. c #E0D5DA";
-"9. c #E1DEE0";
-"0. c #F1DDE1";
-"q. c #E1E2E5";
-"w. c #E2E5EB";
-"e. c #E4E8EA";
-"r. c #E8E7E7";
-"t. c #ECECEC";
-"y. c #EFF0EE";
-"u. c #F0EFEE";
-"i. c #F1F0EE";
-"p. c #F2F3F1";
-"a. c #F4F8F5";
-"s. c #F8F5F1";
-"d. c None";
-(* pixels *)
-"d.= A P D P P P P P P D P D P P P P P D P P > = ";
-"* N w.q.q.w.q.q.w.5.q.q.q.w.q.w.w.q.w.e.e.r.I < ";
-"N 5.i.i.a.t.t.y.y.y.y.r.y.t.t.t.t.t.i.#.=.t.p.%.";
-"D q.a.#.c t.t.t.t.y.y.p.a.p.i.y.e.p.#.^ Q ;.p.;.";
-"D e.8./ ^ 8.a.i.r.r.r.o.s m -.9.s.e.~ } ..E ;.1.";
-"D t.7.' | / $.v 6 r r 7 7 5 6 8 L ) ^ } ..U $.4.";
-"P e.0.} } } Q 8 t f f f f f f f 5 j  .[ ..T o.2.";
-"D e.7.' } } X.R e f f f t f f f p _ ..[ | T o.2.";
-"S e.8._ ..} ..R e f f f f t f f e l ..} ..T $.2.";
-"D e.o.i } | } i e f f f f f f f f w W X.[ _ e.<.";
-"P 3.6 w R X.( w f f f f t f f f f e w !  .` p.<.";
-"P 5.d e w ! W e f f f f f f f f f f f p Y z i.<.";
-"P e.g e f p u e f f f f f f f f f f f f 0 G i.<.";
-"P e.a f f f e f f f f f f f f f f f f f e G s.<.";
-"D e.J 0 f f f f f f f f t f t f f f f f e H i.<.";
-"D e.9.d f f f f f f f f f f f f f B f f w O.p.<.";
-"P q.a.L w t e f B f f f f f f f f q f f e J p.<.";
-"P q.i.r.J e B q O 3 B p t f f V 3 . ; V e O.i.<.";
-"P e.y.y.e.f V 2   @ Z f t e e C +   ; Z w :.i.<.";
-"P w.y.r.p.$.e e o o f f f f t B $ # f V 7 ;.p.<.";
-"P q.y.r.t.t.h e B e f t f f f f V C f e r r.i.<.";
-"P r.y.t.t.t.;.r e t B t f f f f t t w 9 -.i.t.<.";
-"P q.y.t.t.t.i.*.w e t f f f f f w e G q.y.t.u.<.";
-"P w.y.t.t.t.t.r.F w 4 f f f f 6 7 w -.a.e.t.t.<.";
-"P w.y.t.t.t.t.y.L e u u w q w y f w -.i.t.t.i.<.";
-"P r.y.y.t.t.t.y.:.r e x ~ { W u e n i.t.t.t.t.<.";
-"P q.y.r.t.t.t.t.y.v 0 x X.| | w f ;.u.e.t.e.u.<.";
-"P q.y.t.t.t.t.t.p.3.t l X.| | 8 O.p.t.t.t.u.t.<.";
-"D q.t.t.t.t.t.t.t.u.3.c T / k F t.t.t.t.t.t.t.<.";
-"M 4.s.u.t.i.i.t.u.u.i.u.*.&.-.u.u.u.u.u.u.i.i.I ";
-"% , 1.1.2.2.1.1.2.2.1.4.q.4.4.4.1.4.1.1.2.3.D : ";
-"d.>.6.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.,.>."
+"25 32 17 1";
+" 	c None";
+".	c #040606";
+"+	c #443E50";
+"@	c #5F5269";
+"#	c #695E7B";
+"$	c #8D7EA4";
+"%	c #9C7F9D";
+"&	c #A48AAD";
+"*	c #9F8EB5";
+"=	c #9D91B0";
+"-	c #9E92BE";
+";	c #B78EAB";
+">	c #AB98B2";
+",	c #C890A5";
+"'	c #DE9DB0";
+")	c #EEA2B6";
+"!	c #EAA5B6";
+"                         ";
+"                    ,!'  ";
+"  !'                !)), ";
+" ,)!,      $--     ,)))! ";
+" )))),%----------  !)))) ";
+" )))!!,*---------*;!)))) ";
+" ,)!!!'*---------*,!!))! ";
+"  !!!!'*----------&!!!)! ";
+"  ;!!!,*-----------;!!)' ";
+" -*'!!;------------*;!!, ";
+" --&'!&--------------;'  ";
+" ---&,---------------*&  ";
+" ----*------------------ ";
+" ----------------------- ";
+"  ---------------------- ";
+"  ---------------------* ";
+"  =--------------------  ";
+"   *---$#--------*+#---  ";
+"    *--+.$-------#.+---  ";
+"    address@hidden@---  ";
+"     *-*+#-------$$---   ";
+"     >----------------   ";
+"      =--------------$   ";
+"       =------------*    ";
+"       >-*%-----*$-*     ";
+"        =-%&---*%--      ";
+"        >-*;&;;;&--      ";
+"         *-;'!!'*-       ";
+"         =-;!!!'*-       ";
+"          =;!!!'**       ";
+"           %''';=        ";
+"                         "
 |]
 
 let monotone = lazy (GdkPixbuf.from_xpm_data monotone_xpm)