Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity

use HgUtil for repository browser

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-22 18:58:13 +02:00
parent 99fd08ef49
commit c5a3e34fb6
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryBrowser.java
View File

@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
import sonia.scm.util.Util; import sonia.scm.util.Util;
import sonia.scm.web.HgUtil;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -48,8 +49,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Map;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
@@ -171,25 +170,7 @@ public class HgRepositoryBrowser implements RepositoryBrowser
public BrowserResult getResult(String revision, String path) public BrowserResult getResult(String revision, String path)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
HgConfig config = handler.getConfig(); Process p = HgUtil.createPythonProcess(handler, repository, revision, path);
ProcessBuilder pb = new ProcessBuilder(config.getPythonBinary());
Map<String, String> 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();
BrowserResult result = null; BrowserResult result = null;
InputStream resource = null; InputStream resource = null;
InputStream input = null; InputStream input = null;