From f6e0bab276621cab744b7c87c9e4b4880bd4753b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 1 Apr 2013 21:33:56 +0200 Subject: [PATCH 1/3] use a initial capacity of one for subversion hook changesets --- .../java/sonia/scm/repository/SvnPostReceiveHookEvent.java | 2 +- .../main/java/sonia/scm/repository/SvnPreReceiveHookEvent.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPostReceiveHookEvent.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPostReceiveHookEvent.java index c930e817c4..03f9fd65d2 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPostReceiveHookEvent.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPostReceiveHookEvent.java @@ -121,7 +121,7 @@ public class SvnPostReceiveHookEvent extends AbstractRepositoryHookEvent */ private List fetchChangesets() { - List result = new ArrayList(); + List result = new ArrayList(1); SVNRepository repository = null; try diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPreReceiveHookEvent.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPreReceiveHookEvent.java index 5dac1495d4..2000029c67 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPreReceiveHookEvent.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnPreReceiveHookEvent.java @@ -35,6 +35,7 @@ package sonia.scm.repository; //~--- non-JDK imports -------------------------------------------------------- +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,7 +120,7 @@ public class SvnPreReceiveHookEvent extends AbstractRepositoryHookEvent */ private Collection fetchChangesets() { - List csets = new ArrayList(); + List csets = new ArrayList(1); SVNClientManager cm = null; try From 6c7e97dba71064dfadab02a1dae838bb3d119f75 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 1 Apr 2013 21:50:03 +0200 Subject: [PATCH 2/3] handle subversion modification type U --- .../src/main/java/sonia/scm/repository/SvnUtil.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java index a303f86ade..8560ce94fc 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnUtil.java @@ -60,6 +60,12 @@ import java.util.Map; public final class SvnUtil { + /** + * svn path updated + * same as modified ({@link SVNLogEntryPath#TYPE_MODIFIED})? + */ + private static final char TYPE_UPDATED = 'U'; + /** * the logger for SvnUtil */ @@ -129,10 +135,14 @@ public final class SvnUtil break; + case TYPE_UPDATED : case SVNLogEntryPath.TYPE_MODIFIED : modifications.getModified().add(path); break; + + default : + logger.debug("unknown modification type {}", type); } } @@ -152,7 +162,7 @@ public final class SvnUtil } catch (Exception ex) { - logger.error("could not close svn repository session"); + logger.error("could not close svn repository session", ex); } } } From 05347744f91ce61b746aea7993063b163f0c7ead Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 11 Apr 2013 13:34:31 +0200 Subject: [PATCH 3/3] close branch issue-353