From 090dfdaaa9134aeb0f2bf83aa02971b0d217851d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 13 Jun 2012 11:39:57 +0200 Subject: [PATCH] remove leading slash from svn modification paths --- .../java/sonia/scm/repository/SvnUtil.java | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) 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 ebd05a6926..7d1c533d2e 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 @@ -89,35 +89,6 @@ public class SvnUtil { appendModification(modifications, entry.getType(), entry.getPath()); } - - /** - * Method description - * - * - * @param revision - * - * @return - * - * @throws RepositoryException - */ - public static long getRevisionNumber(String revision) throws RepositoryException - { - long revisionNumber = -1; - - if (Util.isNotEmpty(revision)) - { - try - { - revisionNumber = Long.parseLong(revision); - } - catch (NumberFormatException ex) - { - throw new RepositoryException("given revision is not a svnrevision"); - } - } - - return revisionNumber; - } /** * Method description @@ -130,6 +101,11 @@ public class SvnUtil public static void appendModification(Modifications modifications, char type, String path) { + if (path.startsWith("/")) + { + path = path.substring(1); + } + switch (type) { case SVNLogEntryPath.TYPE_ADDED : @@ -227,4 +203,36 @@ public class SvnUtil } } } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param revision + * + * @return + * + * @throws RepositoryException + */ + public static long getRevisionNumber(String revision) + throws RepositoryException + { + long revisionNumber = -1; + + if (Util.isNotEmpty(revision)) + { + try + { + revisionNumber = Long.parseLong(revision); + } + catch (NumberFormatException ex) + { + throw new RepositoryException("given revision is not a svnrevision"); + } + } + + return revisionNumber; + } }