Changeset 834 for trunk/src/jlatexeditor/tools/SVN.java

Timestamp:

09/04/10 07:44:35 (21 months ago)

Author:

stefan

Message:

fixed bug #88: sometimes JLE does not react when after initiating the svn update

Files:

• trunk/src/jlatexeditor/tools/SVN.java (modified) (7 diffs)

trunk/src/jlatexeditor/tools/SVN.java

@@ -3 +3 @@
 import util.Pair;
 import util.ProcessUtil;
+import util.StreamUtils;
 
 import java.io.BufferedReader;
@@ -29 +30 @@
     } catch (Exception e) {
       e.printStackTrace();
-      throw new Exception("SVN update failed!");
+      throw new Exception("SVN update failed!", e);
     }
 
@@ -61 +62 @@
     }
 
+    checkProcessResult(svn, "SVN update");
+
     return results;
   }
 
-  public synchronized Pair<Boolean, String> commit(File dir, String message) {
+  /**
+   * Check if the return code of the svn process is OK.
+   *
+   * @param process svn process
+   */
+  private void checkProcessResult(Process process, String action) throws Exception {
+
+    try {
+      String errorString = new String(StreamUtils.readBytesFromInputStream(process.getErrorStream()));
+      throw new Exception(action + " failed due to the following error:\n" + errorString);
+    } catch (IOException e) {
+      e.printStackTrace();
+      throw new Exception(action + " failed!", e);
+    }
+  }
+
+  public synchronized Pair<Boolean, String> commit(File dir, String message) throws Exception {
     message = message.replace('"', ' ');
     message = message.replace('\\', ' ');
@@ -73 +92 @@
     } catch (Exception e) {
       e.printStackTrace();
-      return new Pair<Boolean, String>(false, "<font color=red><b>Exception: " + e.getMessage() + "</b></font>");
+      throw new Exception("SVN update failed!", e);
+//      return new Pair<Boolean, String>(false, "<font color=red><b>Exception: " + e.getMessage() + "</b></font>");
     }
 
@@ -98 +118 @@
     }
 
+    checkProcessResult(svn, "SVN update");
+
     return new Pair<Boolean, String>(success, builder.toString());
   }
@@ -106 +128 @@
     Process svn;
     try {
-      svn = ProcessUtil.exec(new String[]{"svn", "--show-updates", "status"}, dir);
-    } catch (Exception e) {
-      e.printStackTrace();
-      throw new Exception("SVN status failed!");
+      svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "--show-updates", "status"}, dir);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new Exception("SVN status failed!", e);
     }
 
@@ -152 +174 @@
     Process svn = null;
     try {
-      svn = ProcessUtil.exec(new String[]{"svn", "resolved", file.getName()}, file.getParentFile());
+      svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "resolved", file.getName()}, file.getParentFile());
       svn.waitFor();
     } catch (Exception e) {