Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-22 16:29:51 +01:00
Code Issues Packages Projects Releases Activity

added support for git diff output format to the subversion repository provider

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-08-23 13:24:38 +02:00
parent 86c6ecd9e8
commit 896684b578
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnDiffCommand.java
View File

@@ -30,6 +30,7 @@
*/ */
package sonia.scm.repository.spi; package sonia.scm.repository.spi;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -51,6 +52,7 @@ import org.tmatesoft.svn.core.wc.SVNRevision;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException; import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.SvnUtil; import sonia.scm.repository.SvnUtil;
import sonia.scm.repository.api.DiffFormat;
import sonia.scm.util.Util; import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -101,7 +103,7 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
*/ */
@Override @Override
public void getDiffResult(DiffCommandRequest request, OutputStream output) public void getDiffResult(DiffCommandRequest request, OutputStream output)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
@@ -139,10 +141,11 @@ public class SvnDiffCommand extends AbstractSvnCommand implements DiffCommand
long currentRev = SvnUtil.getRevisionNumber(request.getRevision()); long currentRev = SvnUtil.getRevisionNumber(request.getRevision());
diffClient.setGitDiffFormat(request.getFormat() == DiffFormat.GIT);
diffClient.doDiff(svnurl, SVNRevision.HEAD, diffClient.doDiff(svnurl, SVNRevision.HEAD,
SVNRevision.create(currentRev - 1), SVNRevision.create(currentRev - 1), SVNRevision.create(currentRev),
SVNRevision.create(currentRev), SVNDepth.INFINITY, SVNDepth.INFINITY, false, output);
false, output);
} }
catch (SVNException ex) catch (SVNException ex)
{ {