specify username for all hg commands

this avoids interactive mode and errors due to no user being set

fixes #4849

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java

@@ -33,6 +33,7 @@
 import java.io.Reader;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -67,6 +68,7 @@ public class Executor {
     private byte[] stdout;
     private byte[] stderr;
     private int timeout; // in milliseconds, 0 means no timeout
+    private final Map<String, String> environ;
 
     /**
      * Create a new instance of the Executor.
@@ -88,38 +90,44 @@ public Executor(List<String> cmdList) {
      * Create a new instance of the Executor with default command timeout value.
      * The timeout value will be based on the running context (indexer or web application).
      * @param cmdList A list containing the command to execute
-     * @param workingDirectory The directory the process should have as the
-     *                         working directory
+     * @param workingDirectory The directory the process should have as the working directory
      */
     public Executor(List<String> cmdList, File workingDirectory) {
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
-        int timeoutSec = env.isIndexer() ? env.getIndexerCommandTimeout() : env.getInteractiveCommandTimeout();
-
-        this.cmdList = cmdList;
-        this.workingDirectory = workingDirectory;
-        this.timeout = timeoutSec * 1000;
+        this(cmdList, workingDirectory, new HashMap<>());
     }
 
     /**
      * Create a new instance of the Executor with specific timeout value.
      * @param cmdList A list containing the command to execute
-     * @param workingDirectory The directory the process should have as the
-     *                         working directory
+     * @param workingDirectory The directory the process should have as the working directory
      * @param timeout If the command runs longer than the timeout (seconds),
      *                it will be terminated. If the value is 0, no timer
      *                will be set up.
      */
     public Executor(List<String> cmdList, File workingDirectory, int timeout) {
+        this(cmdList, workingDirectory, new HashMap<>());
+
+        this.timeout = timeout * 1000;
+    }
+
+    /**
+     * Create a new instance of the Executor with default command timeout value.
+     * The timeout value will be based on the running context (indexer or web application).
+     * @param cmdList A list containing the command to execute
+     * @param workingDirectory The directory the process should have as the working directory
+     */
+    public Executor(List<String> cmdList, File workingDirectory, Map<String, String> environ) {
         this.cmdList = cmdList;
         this.workingDirectory = workingDirectory;
-        this.timeout = timeout * 1000;
+        this.environ = environ;
+
+        setDefaultTimeout();
     }
 
     /**
      * Create a new instance of the Executor with or without timeout.
      * @param cmdList A list containing the command to execute
-     * @param workingDirectory The directory the process should have as the
-     *                         working directory
+     * @param workingDirectory The directory the process should have as the working directory
      * @param useTimeout terminate the process after default timeout or not
      */
     public Executor(List<String> cmdList, File workingDirectory, boolean useTimeout) {
@@ -129,6 +137,13 @@ public Executor(List<String> cmdList, File workingDirectory, boolean useTimeout)
         }
     }
 
+    private void setDefaultTimeout() {
+        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        int timeoutSec = env.isIndexer() ? env.getIndexerCommandTimeout() : env.getInteractiveCommandTimeout();
+
+        this.timeout = timeoutSec * 1000;
+    }
+
     /**
      * Execute the command and collect the output. All exceptions will be
      * logged.
@@ -180,6 +195,8 @@ public int exec(final boolean reportExceptions, StreamHandler handler) {
                 .map(File::toString)
                 .orElseGet(() -> System.getProperty("user.dir"));
 
+        processBuilder.environment().putAll(environ);
+
         String envStr = "";
         if (LOGGER.isLoggable(Level.FINER)) {
             Map<String, String> envMap = processBuilder.environment();

opengrok-indexer/src/test/java/org/opengrok/indexer/history/MercurialRepositoryTest.java

@@ -50,7 +50,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
@@ -193,7 +195,9 @@ public static void runHgCommand(File reposRoot, String... args) {
         cmdargs.add(repo.getRepoCommand());
         cmdargs.addAll(Arrays.asList(args));
 
-        Executor exec = new Executor(cmdargs, reposRoot);
+        Map<String, String> env = new HashMap<>();
+        env.put("HGUSER", "foo <[email protected]>");
+        Executor exec = new Executor(cmdargs, reposRoot, env);
         int exitCode = exec.exec();
         assertEquals(0, exitCode, "hg command '" + cmdargs + "' failed."
                 + "\nexit code: " + exitCode