From 896684b578d5e9daae2f1ba22da4551a588e08ea Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 23 Aug 2013 13:24:38 +0200 Subject: [PATCH] added support for git diff output format to the subversion repository provider --- .../java/sonia/scm/repository/spi/SvnDiffCommand.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java index e85782c957..f7af17326d 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java @@ -30,6 +30,7 @@ */ + package sonia.scm.repository.spi; //~--- non-JDK imports -------------------------------------------------------- @@ -51,6 +52,7 @@ import org.tmatesoft.svn.core.wc.SVNRevision; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryException; import sonia.scm.repository.SvnUtil; +import sonia.scm.repository.api.DiffFormat; import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ @@ -101,7 +103,7 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand */ @Override public void getDiffResult(DiffCommandRequest request, OutputStream output) - throws IOException, RepositoryException + throws IOException, RepositoryException { if (logger.isDebugEnabled()) { @@ -139,10 +141,11 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand long currentRev = SvnUtil.getRevisionNumber(request.getRevision()); + diffClient.setGitDiffFormat(request.getFormat() == DiffFormat.GIT); + diffClient.doDiff(svnurl, SVNRevision.HEAD, - SVNRevision.create(currentRev - 1), - SVNRevision.create(currentRev), SVNDepth.INFINITY, - false, output); + SVNRevision.create(currentRev - 1), SVNRevision.create(currentRev), + SVNDepth.INFINITY, false, output); } catch (SVNException ex) {