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

merge with branch issue-97

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-02-24 17:47:08 +01:00
parent e5b8c0e5c6 8d682fefe3
commit 9d158af212
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java
View File

@@ -105,6 +105,9 @@ public class HgImportHandler extends AbstactImportHandler
repository.setContact(web.getParameter("contact")); repository.setContact(web.getParameter("contact"));
handler.setWebParameter(web); handler.setWebParameter(web);
} }
// issue-97
handler.registerMissingHook(c, repositoryName);
INIConfigurationWriter writer = new INIConfigurationWriter(); INIConfigurationWriter writer = new INIConfigurationWriter();

9
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
View File

@@ -483,8 +483,13 @@ public class HgRepositoryHandler
protected ExtendedCommand buildCreateCommand(Repository repository, protected ExtendedCommand buildCreateCommand(Repository repository,
File directory) File directory)
{ {
return new ExtendedCommand(config.getHgBinary(), "init", ExtendedCommand cmd = new ExtendedCommand(config.getHgBinary(), "init",
directory.getPath()); directory.getAbsolutePath());
// issue-97
cmd.setWorkDirectory(baseDirectory);
return cmd;
} }
/** /**

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

@@ -95,6 +95,9 @@ public class HgCGIServlet extends HttpServlet
/** Field description */ /** Field description */
public static final String ENV_URL = "SCM_URL"; public static final String ENV_URL = "SCM_URL";
/** Field description */
public static final String SCM_CREDENTIALS = "SCM_CREDENTIALS";
/** Field description */ /** Field description */
private static final long serialVersionUID = -3492811300905099810L; private static final long serialVersionUID = -3492811300905099810L;
@@ -200,6 +203,12 @@ public class HgCGIServlet extends HttpServlet
env.set(key, session.getAttribute(key).toString()); env.set(key, session.getAttribute(key).toString());
} }
} }
// issue-97
if (!env.containsKey(SCM_CREDENTIALS))
{
env.set(SCM_CREDENTIALS, Util.EMPTY_STRING);
}
} }
/** /**