From e81f8928e2ea1260fe40ccffc8717b05df00b42c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 23 Feb 2012 18:13:19 +0100 Subject: [PATCH 1/5] fix missing hooks of mercurial repository import --- .../src/main/java/sonia/scm/repository/HgImportHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java index 6960ab43e5..b7a80620c2 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java @@ -105,6 +105,9 @@ public class HgImportHandler extends AbstactImportHandler repository.setContact(web.getParameter("contact")); handler.setWebParameter(web); } + + // issue-97 + handler.registerMissingHook(c, repositoryName); INIConfigurationWriter writer = new INIConfigurationWriter(); From a4464be18fdcbd22ae5a7a453d45adedbf1af7f0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 23 Feb 2012 18:19:42 +0100 Subject: [PATCH 2/5] fix anonymous push to public mercurial repositories --- .../src/main/java/sonia/scm/web/HgCGIServlet.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java index e116aafcc5..a87e4c27c7 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java @@ -49,6 +49,7 @@ 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; @@ -86,6 +87,9 @@ public class HgCGIServlet extends HttpServlet /** Field description */ public static final String ENV_SESSION_PREFIX = "SCM_"; + /** Field description */ + public static final String SCM_CREDENTIALS = "SCM_CREDENTIALS"; + /** Field description */ private static final long serialVersionUID = -3492811300905099810L; @@ -191,6 +195,12 @@ 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); + } } /** From 84200ab501068ba4b621254383d4d765a523d6bb Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 23 Feb 2012 18:23:52 +0100 Subject: [PATCH 3/5] execute "hg init" in the scm home directory instead of current working directory --- .../java/sonia/scm/repository/HgRepositoryHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java index 21a086f28f..0d25cb4408 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java @@ -480,8 +480,13 @@ public class HgRepositoryHandler protected ExtendedCommand buildCreateCommand(Repository repository, File directory) { - return new ExtendedCommand(config.getHgBinary(), "init", - directory.getPath()); + ExtendedCommand cmd = new ExtendedCommand(config.getHgBinary(), "init", + directory.getPath()); + + // issue-97 + cmd.setWorkDirectory(baseDirectory); + + return cmd; } /** From 5505f39f9051b8ea326004cf5002573424a54f37 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 23 Feb 2012 18:38:33 +0100 Subject: [PATCH 4/5] use absolute path for mercurial repository creation --- .../src/main/java/sonia/scm/repository/HgRepositoryHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java index 0d25cb4408..7e3f08d352 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java @@ -481,7 +481,7 @@ public class HgRepositoryHandler File directory) { ExtendedCommand cmd = new ExtendedCommand(config.getHgBinary(), "init", - directory.getPath()); + directory.getAbsolutePath()); // issue-97 cmd.setWorkDirectory(baseDirectory); From 8d682fefe320946cb2d818d6167ff6c9cfbdd89a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 24 Feb 2012 17:45:05 +0100 Subject: [PATCH 5/5] close branch issue-97