#
#
# patch "contrib/monotree/GXLViewer.java"
#  from [70b94b679c9d2a877d8eab9964b2c537e41426b7]
#    to [42d39023c467b3d748ba7ec0a05e2d0be3d0512f]
# 
# patch "contrib/monotree/Monotone.java"
#  from [6d75d8c42c435cf9b103b630dd20631c3264f77f]
#    to [6faa86e22665fd73677e613dd1aa907fd7af689f]
#
============================================================
--- contrib/monotree/GXLViewer.java	70b94b679c9d2a877d8eab9964b2c537e41426b7
+++ contrib/monotree/GXLViewer.java	42d39023c467b3d748ba7ec0a05e2d0be3d0512f
@@ -317,7 +317,7 @@ public class GXLViewer {
 		    // Check that our selection is a leaf node (all heads are leaf nodes) and ignore if not
 		    if(!((DefaultMutableTreeNode)node).isLeaf()) return;
 		    // Extract the id from the leaf node (should really use a proper user object for this!)
-		    final String id=node.toString().substring(0,node.toString().indexOf(' ')-1);
+		    final String id=node.toString();
 		    label.setText("Reading log...");
 		    new DisplayLog(GXLViewer.this,id);
 		    setProgressWindow("Reading log for revision");
============================================================
--- contrib/monotree/Monotone.java	6d75d8c42c435cf9b103b630dd20631c3264f77f
+++ contrib/monotree/Monotone.java	6faa86e22665fd73677e613dd1aa907fd7af689f
@@ -71,7 +71,7 @@ public class Monotone {
      * @return a list of strings which enumerates the branches in the current monotone database
      */
     public List<String> listBranches() throws IOException {
-	List<String> result=runMonotone(new String[] { "list", "branches"});
+	List<String> result=runMonotone(new String[] { "automate", "branches"});
 	return result;
     }
 
@@ -82,7 +82,7 @@ public class Monotone {
      * @return a list of strings which enumerates the heads of the specified branch in the current monotone database
      */
     public List<String> listHeads(String branch) throws IOException {
-	List<String>result=runMonotone(new String[] { "heads", "--branch", branch});
+	List<String>result=runMonotone(new String[] { "automate", "heads", branch});
 	return result;
     }
 
@@ -135,7 +135,7 @@ public class Monotone {
      * @return a stream from which an SVG format graph may be read
      */
     public InputStream getSVGLog(final String id,final HighlightTypes highlight) throws IOException {
-	final String[] command=new String[] { "log","--revision",id };
+	final String[] command=new String[] { "log", "--no-graph", "--from",id };
 	
 	// Start the inferior processes
 	final Process monotone=Runtime.getRuntime().exec(getCommand(command));