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

fix mercurial pre-receive hooks

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-10-12 08:26:03 +02:00
parent 965df35f18
commit fe6a033b54
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
View File

@@ -71,7 +71,7 @@ public class AbstractHgHandler
/** Field description */
public static final String ENV_PENDING = "HG_PENDING";
/** Field description */
public static final String ENV_PYTHON_PATH = "SCM_PYTHON_PATH";
@@ -80,6 +80,21 @@ public class AbstractHgHandler
/** Field description */
public static final String ENV_REVISION = "SCM_REVISION";
/** Field description */
public static final String ENV_PAGE_LIMIT = "SCM_PAGE_LIMIT";
/** Field description */
public static final String ENV_PAGE_START = "SCM_PAGE_START";
/** Field description */
public static final String ENV_REVISION_END = "SCM_REVISION_END";
/** Field description */
public static final String ENV_REVISION_START = "SCM_REVISION_START";
/** Field description */
public static final String ENV_NODE = "HG_NODE";
/** the logger for AbstractHgHandler */
private static final Logger logger =
@@ -396,6 +411,11 @@ public class AbstractHgHandler
if (context.isPending())
{
env.put(ENV_PENDING, directory.getAbsolutePath());
if ( extraEnv.containsKey( ENV_REVISION_START ) )
{
env.put(ENV_NODE, extraEnv.get(ENV_REVISION_START));
}
}
env.put(ENV_PYTHON_PATH, Util.nonNull(config.getPythonPath()));

12
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgChangesetViewer.java
View File

@@ -55,18 +55,6 @@ public class HgChangesetViewer extends AbstractHgHandler
implements ChangesetViewer
{
/** Field description */
public static final String ENV_PAGE_LIMIT = "SCM_PAGE_LIMIT";
/** Field description */
public static final String ENV_PAGE_START = "SCM_PAGE_START";
/** Field description */
public static final String ENV_REVISION_END = "SCM_REVISION_END";
/** Field description */
public static final String ENV_REVISION_START = "SCM_REVISION_START";
/** Field description */
public static final String RESOURCE_LOG = "/sonia/scm/hglog.py";

4
scm-server/src/main/conf/server-config.xml
View File

@@ -111,8 +111,8 @@
-->
<!--
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
<Arg>
<New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
<Set name="Port">8181</Set>
<Set name="maxIdleTime">30000</Set>
<Set name="requestHeaderSize">16384</Set>