From 5637c1a8a24ebc343f9dade7b6934848b8e6d6ae Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 1 Oct 2013 21:40:27 +0200 Subject: [PATCH] allow multi line mercurial messages --- .../src/main/java/sonia/scm/web/HgHookCallbackServlet.java | 1 - .../src/main/resources/sonia/scm/python/scmhooks.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java index b42f8440ec..38240eb876 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java @@ -55,7 +55,6 @@ import sonia.scm.repository.RepositoryNotFoundException; import sonia.scm.repository.RepositoryUtil; import sonia.scm.repository.api.HgHookMessage; import sonia.scm.repository.api.HgHookMessage.Severity; -import sonia.scm.repository.api.HookMessageProvider; import sonia.scm.repository.spi.HgHookContextProvider; import sonia.scm.repository.spi.HookEventFacade; import sonia.scm.security.CipherUtil; diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py index 2a6998efef..e9a58d589f 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py @@ -45,7 +45,8 @@ credentials = os.environ['SCM_CREDENTIALS'] def printMessages(ui, msgs): for line in msgs: if line.startswith("_e") or line.startswith("_n"): - ui.warn(line[2:]); + line = line[2:]; + ui.warn(line); def callHookUrl(ui, repo, hooktype, node): abort = True