getBranchesDiff() is implemented, documentation updated

Author: Denis

README.md

@@ -1,10 +1,12 @@
+[![Release](https://jitpack.io/v/ProjectKaiser/pk-vcs-svn.svg)](https://jitpack.io/#ProjectKaiser/pk-vcs-svn)	
+
 # Overview
 Pk-vcs-svn is lightweight library for execute basic SVN VCS operations (merge, branch create etc). It uses [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) exposing IVCS implementation for SVN repositories and [SVNKit](https://svnkit.com/) as framework to work with SVN repositories.
 Features:
 - Branch create and remove
 - Branch merge returning result(success or list of conflicted files)
 - Commit messages list
-- Summarized branch changes list
+- Summarized diff between branches
 - Branches list
 - File content getting and setting
 - File create and remove
@@ -68,4 +70,4 @@ Features:
 		- Branches/Br2/Folder/file.txt
 		- Trunk/Folder/file.txt
 		- Tags/Tag1/
-	- Then `SVNVCS.getBranches()` method will return [Br1, Br2, Trunk] 
+	- Then `SVNVCS.getBranches()` method will return [Br1, Br2, Trunk]

build.gradle

@@ -19,7 +19,7 @@ defaultTasks 'build';
 
 dependencies {
 	compile 'com.github.ProjectKaiser:pk-vcs-api:master-SNAPSHOT'
-    compile 'org.tmatesoft.svnkit:svnkit:1.8.10'
+    compile 'org.tmatesoft.svnkit:svnkit:1.8.14'
     compile 'commons-logging:commons-logging:1.2'
 
     testCompile 'junit:junit:4.12'

src/main/java/com/projectkaiser/scm/vcs/svn/SVNVCS.java

@@ -24,9 +24,7 @@
 import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
 import org.tmatesoft.svn.core.auth.SVNAuthentication;
 import org.tmatesoft.svn.core.auth.SVNPasswordAuthentication;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
 import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
-import org.tmatesoft.svn.core.internal.wc.SVNFileType;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 import org.tmatesoft.svn.core.wc.ISVNConflictHandler;
@@ -45,6 +43,7 @@
 import org.tmatesoft.svn.core.wc.SVNWCClient;
 import org.tmatesoft.svn.core.wc.SVNWCUtil;
 import org.tmatesoft.svn.core.wc2.ISvnObjectReceiver;
+import org.tmatesoft.svn.core.wc2.SvnDiff;
 import org.tmatesoft.svn.core.wc2.SvnDiffStatus;
 import org.tmatesoft.svn.core.wc2.SvnDiffSummarize;
 import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
@@ -92,7 +91,6 @@ public SVNVCS(IVCSRepositoryWorkspace repo, String user, String password) {
 		if (!repoUrl.endsWith("/") && !repoUrl.endsWith("\\")) {
 			repoUrl += "/";
 		}
-		DAVRepositoryFactory.setup(); 
         options = SVNWCUtil.createDefaultOptions(true); 
 		try {
 			trunkSVNUrl = SVNURL.parseURIEncoded(repo.getRepoUrl().replace("\\", "/"));
@@ -108,8 +106,6 @@ public SVNVCS(IVCSRepositoryWorkspace repo, String user, String password) {
 
 		clientManager = SVNClientManager.newInstance(
 				options, repository.getAuthenticationManager());
-		
-		SVNFileType.setSymlinkSupportEnabled(false);
 	}
 
 	public SVNRepository getRepository() {
@@ -120,6 +116,10 @@ private SVNURL getBranchUrl(String branchPath) throws SVNException {
 		return SVNURL.parseURIEncoded(repoUrl + (branchPath == null ? MASTER_PATH : BRANCHES_PATH + branchPath));
 	}
 
+	private String getBranchPath(String branchPath) {
+		return branchPath == null ? MASTER_PATH : BRANCHES_PATH + branchPath;
+	}
+	
 	@Override
 	public void createBranch(String srcBranchName, String dstBranchName, String commitMessage) {
 		try {
@@ -170,7 +170,7 @@ public void deleteBranch(String branchName, String commitMessage) {
 	}
 
 	@Override
-	public VCSMergeResult merge(String srcBranchÒôüó, String dstBranchName, String commitMessage) {
+	public VCSMergeResult merge(String srcBranchName, String dstBranchName, String commitMessage) {
 		SVNDiffClient diffClient = clientManager.getDiffClient();
 		try {
 			try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
@@ -190,7 +190,7 @@ public SVNConflictResult handleConflict(SVNConflictDescription conflictDescripti
 
 				try {
 					SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
-					diffClient.doMerge(getBranchUrl(srcBranchÒôüó),
+					diffClient.doMerge(getBranchUrl(srcBranchName),
 							SVNRevision.HEAD, Collections.singleton(range),
 							wc.getFolder(), SVNDepth.UNKNOWN, true, false, false, false);
 
@@ -326,47 +326,99 @@ public void setFileContent(String branchName, String filePath, String content, S
 	public String getRepoUrl() {
 		return repo.getRepoUrl();
 	}
-
-	@Override
-	public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final String dstBranchName) {
-		try {
-			final List<SVNLogEntry> entries = new ArrayList<>();
-			repository.log(new String[] { "branches/" + srcBranchName }, -1 /* start from head descending */, 
-					0, true, true, -1, new ISVNLogEntryHandler() {
-				@Override
-				public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
-					entries.add(logEntry);
-				}
-			});
-			SVNLogEntry branchFirstCommit = entries.get(entries.size() - 1);
+	
+	private void fillUnifiedDiffs(final String srcBranchName, final String dstBranchName, List<VCSDiffEntry> entries, 
+			IVCSLockedWorkingCopy wc) throws SVNException {
+		for (VCSDiffEntry entry : entries) {
+			ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-			SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
-			SvnDiffSummarize diff = svnOperationFactory.createDiffSummarize();
-			diff.setSources(
-					SvnTarget.fromURL(getBranchUrl(srcBranchName), SVNRevision.create(branchFirstCommit.getRevision())),
-					SvnTarget.fromURL(getBranchUrl(srcBranchName), SVNRevision.HEAD));
+			final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
+			final SvnDiff diff = svnOperationFactory.createDiff();
 
-			final List<VCSDiffEntry> res = new ArrayList<>();
-			diff.setReceiver(new ISvnObjectReceiver<SvnDiffStatus>() {
-	            public void receive(SvnTarget target, SvnDiffStatus diffStatus) throws SVNException {
-	                res.add(new VCSDiffEntry(diffStatus.getPath(),
-	                		SVNChangeTypeToVCSChangeType(diffStatus.getModificationType())));
-	            }
+			if (entry.getChangeType() == VCSChangeType.ADD) {
+				SVNLogEntry firstCommit = getBranchFirstCommit(getBranchPath(dstBranchName));
+				diff.setSource(SvnTarget.fromURL(getBranchUrl(srcBranchName).appendPath(entry.getFilePath(), true), SVNRevision.HEAD), 
+						SVNRevision.create(firstCommit.getRevision()), 
+						SVNRevision.create(repository.info(getBranchPath(dstBranchName), -1).getRevision()));
+			} else if (entry.getChangeType() == VCSChangeType.DELETE) {
+				SVNLogEntry firstCommit = getBranchFirstCommit(getBranchPath(dstBranchName));
+				diff.setSource(SvnTarget.fromURL(getBranchUrl(dstBranchName).appendPath(entry.getFilePath(), true), SVNRevision.HEAD), 
+						SVNRevision.create(repository.info(getBranchPath(dstBranchName), -1).getRevision()),
+						SVNRevision.create(firstCommit.getRevision()));
+			} else {
+				diff.setSources(
+					SvnTarget.fromURL(getBranchUrl(dstBranchName).appendPath(entry.getFilePath(), true), SVNRevision.HEAD),
+					SvnTarget.fromURL(getBranchUrl(srcBranchName).appendPath(entry.getFilePath(), true), SVNRevision.HEAD));
+			}
+            diff.setOutput(baos);
+            diff.run();
 
-				private VCSChangeType SVNChangeTypeToVCSChangeType(SVNStatusType modificationType) {
-					if (SVNStatusType.STATUS_ADDED.equals(modificationType)) {
-						return VCSChangeType.ADD;
-					} else if (SVNStatusType.STATUS_DELETED.equals(modificationType)) {
-						return VCSChangeType.DELETE;
-					} else if (SVNStatusType.STATUS_MODIFIED.equals(modificationType)) {
-						return VCSChangeType.MODIFY;
-					} else {
-						return VCSChangeType.UNKNOWN;
-					}
+            try {
+				entry.setUnifiedDiff(baos.toString("UTF-8"));
+			} catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	private SVNLogEntry getBranchFirstCommit(final String branchPath) throws SVNException {
+		final List<SVNLogEntry> logEntries = new ArrayList<>();
+		repository.log(new String[] { branchPath }, -1 /* start from head descending */, 
+				0, true, true, -1, new ISVNLogEntryHandler() {
+			@Override
+			public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
+				logEntries.add(logEntry);
+			}
+		});
+		return logEntries.get(logEntries.size() - 1);
+	}
+	
+	
+	private List<VCSDiffEntry> getDiffEntries(final String srcBranchName, final String dstBranchName, 
+			final IVCSLockedWorkingCopy wc) throws SVNException {
+		final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
+		final SvnDiffSummarize summarizeDiff = svnOperationFactory.createDiffSummarize();
+		final List<VCSDiffEntry> res = new ArrayList<>();
+		
+		summarizeDiff.setSources(
+				SvnTarget.fromURL(getBranchUrl(dstBranchName), SVNRevision.HEAD),
+				SvnTarget.fromURL(getBranchUrl(srcBranchName), SVNRevision.HEAD));
+		
+		summarizeDiff.setReceiver(new ISvnObjectReceiver<SvnDiffStatus>() {
+            public void receive(SvnTarget target, SvnDiffStatus diffStatus) throws SVNException {
+            	if (diffStatus.getPath().length() == 0) {
+            		return;
+            	}
+            	VCSDiffEntry entry = new VCSDiffEntry(diffStatus.getPath(),
+                		SVNChangeTypeToVCSChangeType(diffStatus.getModificationType()));
+                res.add(entry);
+            }
+
+			private VCSChangeType SVNChangeTypeToVCSChangeType(SVNStatusType modificationType) {
+				if (SVNStatusType.STATUS_ADDED.equals(modificationType)) {
+					return VCSChangeType.ADD;
+				} else if (SVNStatusType.STATUS_DELETED.equals(modificationType)) {
+					return VCSChangeType.DELETE;
+				} else if (SVNStatusType.STATUS_MODIFIED.equals(modificationType)) {
+					return VCSChangeType.MODIFY;
+				} else {
+					return VCSChangeType.UNKNOWN;
 				}
-	        });
-			diff.run();
-			return res;
+			}
+        });
+
+		return res;
+	}
+
+	@Override
+	public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final String dstBranchName) {
+		try {
+			try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
+				checkout(getBranchUrl(dstBranchName), wc.getFolder());
+				List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName, wc);
+				fillUnifiedDiffs(srcBranchName, dstBranchName, entries, wc);
+				return entries;
+			}
 		} catch (SVNException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {