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

fix mercurial environment for push and pull commands

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-05-15 21:31:48 +02:00
parent 078328226e
commit b0d917d903
13 changed files with 349 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
View File

@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.HgConfig;
import sonia.scm.repository.HgEnvironment;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgPythonScript;
import sonia.scm.repository.HgRepositoryHandler;
@@ -51,7 +52,6 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.util.AssertUtil;
import sonia.scm.util.Util;
import sonia.scm.web.cgi.CGIExecutor;
import sonia.scm.web.cgi.CGIExecutorFactory;
import sonia.scm.web.cgi.EnvList;
@@ -77,12 +77,6 @@ import javax.servlet.http.HttpSession;
public class HgCGIServlet extends HttpServlet
{
/** Field description */
public static final String ENV_CHALLENGE = "SCM_CHALLENGE";
/** Field description */
public static final String ENV_PYTHON_PATH = "PYTHONPATH";
/** Field description */
public static final String ENV_REPOSITORY_NAME = "REPO_NAME";
@@ -92,12 +86,6 @@ public class HgCGIServlet extends HttpServlet
/** Field description */
public static final String ENV_SESSION_PREFIX = "SCM_";
/** Field description */
public static final String ENV_URL = "SCM_URL";
/** Field description */
public static final String SCM_CREDENTIALS = "SCM_CREDENTIALS";
/** Field description */
private static final long serialVersionUID = -3492811300905099810L;
@@ -240,12 +228,6 @@ public class HgCGIServlet extends HttpServlet
env.set(key, session.getAttribute(key).toString());
}
}
// issue-97
if (!env.containsKey(SCM_CREDENTIALS))
{
env.set(SCM_CREDENTIALS, Util.EMPTY_STRING);
}
}
/**
@@ -265,7 +247,6 @@ public class HgCGIServlet extends HttpServlet
{
String name = repository.getName();
File directory = handler.getDirectory(repository);
String pythonPath = HgUtil.getPythonPath(handler.getConfig());
CGIExecutor executor = cgiExecutorFactory.createExecutor(configuration,
getServletContext(), request, response);
@@ -277,9 +258,15 @@ public class HgCGIServlet extends HttpServlet
executor.getEnvironment().set(ENV_REPOSITORY_NAME, name);
executor.getEnvironment().set(ENV_REPOSITORY_PATH,
directory.getAbsolutePath());
executor.getEnvironment().set(ENV_URL, hookManager.createUrl(request));
executor.getEnvironment().set(ENV_CHALLENGE, hookManager.getChallenge());
executor.getEnvironment().set(ENV_PYTHON_PATH, pythonPath);
// add hook environment
//J-
HgEnvironment.prepareEnvironment(
executor.getEnvironment().asMutableMap(),
handler,
hookManager,
request
);
//J+
HttpSession session = request.getSession();

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
View File

@@ -280,7 +280,7 @@ public class HgHookCallbackServlet extends HttpServlet
repositoryManager.fireHookEvent(HgRepositoryHandler.TYPE_NAME,
repositoryName,
new HgRepositoryHookEvent(handler, repositoryName, node, type));
new HgRepositoryHookEvent(handler, hookManager, repositoryName, node, type));
}
catch (RepositoryNotFoundException ex)
{