getFileContent() speed improved: branch existing is checked only if

requested file is not found
getBranchFirstCommit() speed improved: from head to first and take last
-> from first to head, limit 1 and take first

Author: host6

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

@@ -247,16 +247,18 @@ public void setProxy(String host, int port, String proxyUser, String proxyPasswo
 	public String getFileContent(String branchName, String filePath, String revision) {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		try {
-			if (repository.checkPath(getBranchName(branchName), -1L) == SVNNodeKind.NONE) {
-				throw new EVCSBranchNotFound(getRepoUrl(), getBranchName(branchName));
-			}
 			repository.getFile(new File(getBranchName(branchName), filePath).getPath().replace("\\", "/"),
 					(revision == null || revision.isEmpty()) ? -1 : Long.parseLong(revision), new SVNProperties(), baos);
 			return baos.toString(StandardCharsets.UTF_8.name());
-		} catch (EVCSBranchNotFound e) {
-			throw e;
 		} catch (SVNException e) {
 			if (e.getErrorMessage().getErrorCode().getCode() == SVN_FILE_NOT_FOUND_ERROR_CODE) {
+				try {
+					if (repository.checkPath(getBranchName(branchName), -1L) == SVNNodeKind.NONE) {
+						throw new EVCSBranchNotFound(getRepoUrl(), getBranchName(branchName));
+					}
+				} catch (SVNException e1) {
+					throw new EVCSException(e1);
+				}
 				throw new EVCSFileNotFound(getRepoUrl(), getBranchName(branchName), filePath, revision);
 			}
 			throw new EVCSException(e);
@@ -348,15 +350,15 @@ private List<VCSDiffEntry> fillUnifiedDiffs(final String srcBranchName, final St
 	}
 
 	protected SVNLogEntry getBranchFirstCommit(final String branchPath) throws Exception {
-		final List<SVNLogEntry> logEntries = new ArrayList<>();
-		repository.log(new String[] { getBranchName(branchPath) }, -1 /* start from head descending */,
-				0, true, true, -1, new ISVNLogEntryHandler() {
+		final SVNLogEntry[] firstEntryHolder = new SVNLogEntry[1]; 
+		repository.log(new String[] { getBranchName(branchPath) }, 0 /* start from first commit */,
+				-1 /* to the head commit */, true, true, 1 /* limit */, new ISVNLogEntryHandler() {
 			@Override
 			public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
-				logEntries.add(logEntry);
+				firstEntryHolder[0] = logEntry;
 			}
 		});
-		return logEntries.get(logEntries.size() - 1);
+		return firstEntryHolder[0];
 	}
 
 

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

@@ -285,6 +285,14 @@ public void testGetFileContentExceptions() throws Exception {
 		} catch (EVCSException e) {
 			checkEVCSException(e);
 		}
+		doCallRealMethod().when(mockedRepo).getFile(anyString(), anyLong(), any(SVNProperties.class), any(OutputStream.class));
+		doThrow(testSVNException).when(mockedRepo).checkPath(anyString(), anyLong());
+		try {
+			vcs.getFileContent("wrong-branch", "", "");
+			fail();
+		} catch (EVCSException e) {
+			checkEVCSException(e);
+		}
 	}
 
 	@Test