Merge pull request #1104 from vladak/getparent_logging

make parent/branch logging less aggressive

Author: Vladimir Kotal

src/org/opensolaris/opengrok/history/BazaarRepository.java

@@ -358,7 +358,7 @@ String determineParent() throws IOException {
         cmd.add("config");
         cmd.add("parent_location");
         Executor executor = new Executor(cmd, directory);
-        if (executor.exec() != 0) {
+        if (executor.exec(false) != 0) {
             throw new IOException(executor.getErrorString());
         }
 

src/org/opensolaris/opengrok/history/MercurialRepository.java

@@ -122,16 +122,18 @@ public MercurialRepository() {
      * Return name of the branch or "default"
      */
     @Override
-    String determineBranch() {
+    String determineBranch() throws IOException {
         List<String> cmd = new ArrayList<>();
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
         cmd.add(RepoCommand);
         cmd.add("branch");
 
-        Executor e = new Executor(cmd, new File(directoryName));
-        e.exec();
+        Executor executor = new Executor(cmd, new File(directoryName));
+        if (executor.exec(false) != 0) {
+            throw new IOException(executor.getErrorString());
+        }
 
-        return e.getOutputString().trim();
+        return executor.getOutputString().trim();
     }
 
     /**
@@ -673,7 +675,7 @@ String determineParent() throws IOException {
         cmd.add("paths");
         cmd.add("default");
         Executor executor = new Executor(cmd, directory);
-        if (executor.exec() != 0) {
+        if (executor.exec(false) != 0) {
             throw new IOException(executor.getErrorString());
         }
 

src/org/opensolaris/opengrok/history/RepositoryFactory.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
  */
 
 package org.opensolaris.opengrok.history;
@@ -92,7 +92,8 @@ public static Repository getRepository(File file) throws InstantiationException,
                     res.setDirectoryName(file.getCanonicalPath());
                 } catch (IOException e) {
                     LOGGER.log(Level.SEVERE,
-                        "Failed to get canonical path name for " + file.getAbsolutePath(), e);
+                        "Failed to get canonical path name for " +
+			file.getAbsolutePath(), e);
                 }
 
                 if (!res.isWorking()) {
@@ -113,9 +114,9 @@ public static Repository getRepository(File file) throws InstantiationException,
                     try {
                         res.setParent(res.determineParent());
                     } catch (IOException ex) {
-                        LOGGER.log(Level.SEVERE, null, ex);
                         LOGGER.log(Level.WARNING,
-                            "Failed to get parent for " + file.getAbsolutePath());
+                            "Failed to get parent for {0}: {1}",
+                            new Object[]{file.getAbsolutePath(), ex});
                     }
                 }
 
@@ -124,7 +125,8 @@ public static Repository getRepository(File file) throws InstantiationException,
                         res.setBranch(res.determineBranch());
                     } catch (IOException ex) {
                         LOGGER.log(Level.WARNING,
-                            "Failed to get branch for " + file.getAbsolutePath());
+                            "Failed to get branch for {0}: {1}",
+                            new Object[]{file.getAbsolutePath(), ex});
                     }
                 }