createTag() fixed

checkout() fixed

Author: host6

src/main/java/org/scm4j/vcs/svn/SVNVCS.java

@@ -110,7 +110,7 @@ public void createBranch(String srcBranchName, String dstBranchName, String comm
 
 	public void createBranch(SVNURL fromUrl, SVNURL toUrl, String commitMessage) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
-			checkout(fromUrl, wc.getFolder());
+			checkout(fromUrl, wc.getFolder(), null);
 
 			SVNCopyClient copyClient = new SVNCopyClient(authManager, options);
 			SVNCopySource copySource = new SVNCopySource(SVNRevision.WORKING, SVNRevision.WORKING,
@@ -151,7 +151,7 @@ public void deleteBranch(String branchName, String commitMessage) {
 	public VCSMergeResult merge(String srcBranchName, String dstBranchName, String commitMessage) {
 		SVNDiffClient diffClient = clientManager.getDiffClient();
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
-			checkout(getBranchUrl(dstBranchName), wc.getFolder());
+			checkout(getBranchUrl(dstBranchName), wc.getFolder(), null);
 
 			DefaultSVNOptions options = (DefaultSVNOptions) diffClient.getOptions();
 			final List<String> conflictingFiles = new ArrayList<>();
@@ -203,14 +203,14 @@ public SVNWCClient getRevertClient(DefaultSVNOptions options) {
 		return new SVNWCClient(authManager, options);
 	}
 
-	public void checkout(SVNURL sourceUrl, File destPath) throws Exception {
+	public void checkout(SVNURL sourceUrl, File destPath, String revision) throws Exception {
 		SVNUpdateClient updateClient = clientManager.getUpdateClient();
 		updateClient.setIgnoreExternals(false);
+		SVNRevision svnRevision = revision == null ? SVNRevision.HEAD : SVNRevision.parse(revision);
 		if (isWorkingCopyInited(destPath)) {
-			updateClient.doSwitch(destPath, sourceUrl, SVNRevision.HEAD, 
-					SVNRevision.HEAD, SVNDepth.INFINITY, false, false);
+			updateClient.doSwitch(destPath, sourceUrl, svnRevision, svnRevision, SVNDepth.INFINITY, false, false);
 		} else {
-			updateClient.doCheckout(sourceUrl, destPath, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.UNKNOWN, false);
+			updateClient.doCheckout(sourceUrl, destPath, svnRevision, svnRevision, SVNDepth.UNKNOWN, false);
 		}
 	}
 
@@ -232,6 +232,8 @@ public void setCredentials(String user, String password) {
 		userPassAuth = SVNPasswordAuthentication.newInstance(user, password == null ? null : password.toCharArray(),
 				true, trunkSVNUrl, false);
 		authManager.setAuthentications(new SVNAuthentication[] {userPassAuth});
+		clientManager = SVNClientManager.newInstance(
+				options, repository.getAuthenticationManager());
 	}
 
 	@Override
@@ -269,7 +271,7 @@ public String getFileContent(String branchName, String filePath) {
 	@Override
 	public VCSCommit setFileContent(String branchName, String filePath, String content, String commitMessage) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
-			checkout(getBranchUrl(branchName), wc.getFolder());
+			checkout(getBranchUrl(branchName), wc.getFolder(), null);
 			File file = new File(wc.getFolder(), filePath);
 			Boolean needToAdd = !file.exists();
 			if (!file.exists()) {
@@ -399,7 +401,7 @@ public VCSChangeType SVNChangeTypeToVCSChangeType(SVNStatusType modificationType
 	@Override
 	public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final String dstBranchName) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
-			checkout(getBranchUrl(dstBranchName), wc.getFolder());
+			checkout(getBranchUrl(dstBranchName), wc.getFolder(), null);
 			List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName);
 			entries = fillUnifiedDiffs(srcBranchName, dstBranchName, entries);
 			return entries;
@@ -602,12 +604,13 @@ public Boolean fileExists(String branchName, String filePath) {
 	}
 
 	@Override
-	public VCSTag createTag(String branchName, String tagName, String tagMessage) throws EVCSTagExists {
+	public VCSTag createTag(String branchName, String tagName, String tagMessage, String revisionToTag) throws EVCSTagExists {
 		try {
 			SVNURL srcURL = getBranchUrl(branchName); 
-			SVNURL dstURL = SVNURL.parseURIEncoded(repoUrl + TAGS_PATH + tagName); 
-			SVNCopySource copySource = 
-					new SVNCopySource(SVNRevision.HEAD, SVNRevision.HEAD, srcURL); 
+			SVNURL dstURL = SVNURL.parseURIEncoded(repoUrl + TAGS_PATH + tagName);
+			SVNCopySource copySource = revisionToTag == null ?
+					new SVNCopySource(SVNRevision.HEAD, SVNRevision.HEAD, srcURL) :
+					new SVNCopySource(SVNRevision.parse(revisionToTag), SVNRevision.parse(revisionToTag), srcURL);
 
 			clientManager.getCopyClient().doCopy(new SVNCopySource[] {copySource}, dstURL, 
 			        false, false, true, tagMessage, null);
@@ -717,11 +720,35 @@ public void removeTag(String tagName) {
 		}
 	}
 
+	@Override
+	public void checkout(String branchName, String targetPath, String revision) {
+		try {
+			checkout(getBranchUrl(branchName), new File(targetPath), revision);
+		} catch (SVNException e) {
+			throw new EVCSException(e);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
 
 	@Override
-	public void checkout(String branchName, String targetPath) {
+	public Boolean isRevisionTagged(String revision) {
+		List<String> entries = new ArrayList<>();
 		try {
-			checkout(getBranchUrl(branchName), new File(targetPath));
+			listEntries(entries, TAGS_PATH, "");
+			SVNTagBaseCommit handler;
+			for (String entryStr : entries) {
+				handler = new SVNTagBaseCommit();
+				
+				repository.log(new String[] { entryStr }, -1 /* start from head descending */,
+						0, true, true, -1, handler);
+				
+				SVNDirEntry copyFromEntry = repository.info("", handler.copyFromRevision);
+				if (copyFromEntry.getRevision() == Long.parseLong(revision)) {
+					return true;
+				}
+			}
+			return false;
 		} catch (SVNException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {

src/test/java/org/scm4j/vcs/svn/SVNVCSTest.java

@@ -152,7 +152,7 @@ public void testExceptions() throws Exception {
 
 	private void testExceptionThrowing(Exception testException, Method m, Object[] params) throws Exception {
 		reset(svn);
-		doThrow(testException).when(svn).checkout(any(SVNURL.class), any(File.class));
+		doThrow(testException).when(svn).checkout(any(SVNURL.class), any(File.class), (String) isNull());
 		doThrow(testException).when(svn).getBranchUrl(null);
 		doThrow(testException).when(svn).listEntries(Matchers.<List<String>>any(), anyString(), anyString());
 		doThrow(testException).when(svn).getBranchFirstCommit(null);
@@ -176,7 +176,7 @@ private void testExceptionThrowing(Exception testException, Method m, Object[] p
 
 	private boolean wasMockedMethodInvoked() throws Exception {
 		try {
-			verify(svn).checkout(any(SVNURL.class), any(File.class));
+			verify(svn).checkout(any(SVNURL.class), any(File.class), (String) isNull());
 			return true;
 		} catch (WantedButNotInvoked e1) {
 		}
@@ -224,14 +224,14 @@ public void testDefaultChangeTypeToVCSType() throws IllegalAccessException {
 
 	@Test
 	public void testCreateBranchExceptions() throws Exception {
-		doThrow(testCommonException).when(svn).checkout(any(SVNURL.class), any(File.class));
+		doThrow(testCommonException).when(svn).checkout(any(SVNURL.class), any(File.class), (String) isNull());
 		try {
 			vcs.createBranch("", "", "");
 			fail();
 		} catch (RuntimeException e) {
 			checkCommonException(e);
 		}
-		doThrow(testSVNException).when(svn).checkout(any(SVNURL.class), any(File.class));
+		doThrow(testSVNException).when(svn).checkout(any(SVNURL.class), any(File.class), (String) isNull());
 		try {
 			vcs.createBranch("", "", "");
 			fail();