From c5a3e34fb685c27447e0f2a2909c45101be67ddc Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 22 Sep 2011 18:58:13 +0200 Subject: [PATCH] use HgUtil for repository browser --- .../scm/repository/HgRepositoryBrowser.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryBrowser.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryBrowser.java index 838f23c03a..8daafe6c01 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryBrowser.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryBrowser.java @@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory; import sonia.scm.util.IOUtil; import sonia.scm.util.Util; +import sonia.scm.web.HgUtil; //~--- JDK imports ------------------------------------------------------------ @@ -48,8 +49,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Map; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -171,25 +170,7 @@ public class HgRepositoryBrowser implements RepositoryBrowser public BrowserResult getResult(String revision, String path) throws IOException, RepositoryException { - HgConfig config = handler.getConfig(); - ProcessBuilder pb = new ProcessBuilder(config.getPythonBinary()); - Map env = pb.environment(); - - env.put(ENV_PYTHON_PATH, Util.nonNull(config.getPythonPath())); - - String directory = handler.getDirectory(repository).getAbsolutePath(); - - env.put(ENV_REPOSITORY_PATH, directory); - - if (Util.isEmpty(revision)) - { - revision = DEFAULT_REVISION; - } - - env.put(ENV_REVISION, revision); - env.put(ENV_PATH, Util.nonNull(path)); - - Process p = pb.start(); + Process p = HgUtil.createPythonProcess(handler, repository, revision, path); BrowserResult result = null; InputStream resource = null; InputStream input = null;