Merge branch 'master' of https://github.com/scm4j/scm4j-vcs-git

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -24,7 +24,6 @@
 import org.scm4j.vcs.api.exceptions.*;
 import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
 import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
-import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
 
 import java.io.*;
 import java.net.*;
@@ -48,15 +47,15 @@ public GitVCS(IVCSRepositoryWorkspace repo) {
 		this.repo = repo;
 	}
 
-	public void setCredentials(CredentialsProvider credentials) {
+	private void setCredentials(CredentialsProvider credentials) {
 		this.credentials = credentials;
 	}
 
 	private String getRealBranchName(String branchName) {
 		return branchName == null ? MASTER_BRANCH_NAME : branchName;
 	}
 
-	protected Git getLocalGit(String folder) throws Exception {
+	Git getLocalGit(String folder) throws Exception {
 		Repository gitRepo = new FileRepositoryBuilder()
 				.setGitDir(new File(folder, ".git"))
 				.build();
@@ -75,7 +74,7 @@ protected Git getLocalGit(String folder) throws Exception {
 		return new Git(gitRepo);
 	}
 
-	protected Git getLocalGit(IVCSLockedWorkingCopy wc) throws Exception {
+	Git getLocalGit(IVCSLockedWorkingCopy wc) throws Exception {
 		return getLocalGit(wc.getFolder().getPath());
 	}
 
@@ -143,7 +142,7 @@ public void createBranch(String srcBranchName, String newBranchName, String comm
 
 			push(git, refSpec);
 		} catch (RefAlreadyExistsException e) {
-			throw new EVCSBranchExists (e);
+			throw new EVCSBranchExists(newBranchName);
 		} catch (GitAPIException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {
@@ -176,7 +175,7 @@ public void deleteBranch(String branchName, String commitMessage) {
 	}
 
 	private void push(Git git, RefSpec refSpec) throws GitAPIException {
-		PushCommand cmd =  git
+		PushCommand cmd = git
 				.push();
 		if (refSpec != null) {
 			cmd.setRefSpecs(refSpec);
@@ -295,7 +294,7 @@ public String getFileContent(String branchName, String fileRelativePath, String
 					.setCredentialsProvider(credentials)
 					.call();
 
-			ObjectId revisionCommitId = gitRepo.resolve(revision == null ? "refs/heads/" + getRealBranchName(branchName)  : revision);
+			ObjectId revisionCommitId = gitRepo.resolve(revision == null ? "refs/heads/" + getRealBranchName(branchName) : revision);
 			if (revision == null && revisionCommitId == null) {
 				throw new EVCSBranchNotFound(getRepoUrl(), getRealBranchName(branchName));
 			}
@@ -313,7 +312,9 @@ public String getFileContent(String branchName, String fileRelativePath, String
 			ObjectLoader loader = gitRepo.open(objectId);
 			InputStream in = loader.openStream();
 			String res = IOUtils.toString(in, StandardCharsets.UTF_8);
+
 			if (revision != null) {
+				// need to prevent "checkout conflict with files" exception on scm4j-releaser testTagExistsOnExecute() test
 				git
 						.reset()
 						.setMode(ResetType.HARD)
@@ -409,7 +410,7 @@ public VCSCommit setFileContent(String branchName, String filePath, String conte
 		}
 	}
 
-	void checkout(Git git, Repository gitRepo, String branchName, String revision) throws Exception {
+	private void checkout(Git git, Repository gitRepo, String branchName, String revision) throws Exception {
 		String bn = getRealBranchName(branchName);
 		CheckoutCommand cmd = git.checkout();
 		git
@@ -537,10 +538,10 @@ public List<VCSCommit> log(String branchName, int limit) {
 				log.setMaxCount(limit);
 			}
 
-			Iterable<RevCommit> logs = log.call();
+			Iterable<RevCommit> commits = log.call();
 
 			List<VCSCommit> res = new ArrayList<>();
-			for (RevCommit commit : logs) {
+			for (RevCommit commit : commits) {
 				res.add(getVCSCommit(commit));
 			}
 
@@ -586,11 +587,11 @@ public VCSCommit removeFile(String branchName, String filePath, String commitMes
 		}
 	}
 
-	protected VCSCommit getVCSCommit(RevCommit revCommit) {
+	private VCSCommit getVCSCommit(RevCommit revCommit) {
 		return new VCSCommit(revCommit.getName(), revCommit.getFullMessage(), revCommit.getAuthorIdent().getName());
 	}
 
-	public List<VCSCommit> getCommitsRange(String branchName, String afterCommitId, String untilCommitId) {
+	public List<VCSCommit> getCommitsRange(String branchName, String startRevision, String endRevision) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
 			 Git git = getLocalGit(wc);
 			 Repository gitRepo = git.getRepository()) {
@@ -599,18 +600,18 @@ public List<VCSCommit> getCommitsRange(String branchName, String afterCommitId,
 
 			String bn = getRealBranchName(branchName);
 
-			ObjectId sinceCommit = afterCommitId == null ?
+			ObjectId startCommit = startRevision == null ?
 					getInitialCommit(gitRepo, bn).getId() :
-					ObjectId.fromString(afterCommitId);
+					ObjectId.fromString(startRevision);
 
-			ObjectId untilCommit = untilCommitId == null ?
+			ObjectId endCommit = endRevision == null ?
 					gitRepo.exactRef("refs/heads/" + bn).getObjectId() :
-					ObjectId.fromString(untilCommitId);
+					ObjectId.fromString(endRevision);
 
 			Iterable<RevCommit> commits;
 			commits = git
 					.log()
-					.addRange(sinceCommit, untilCommit)
+					.addRange(startCommit, endCommit)
 					.call();
 
 			List<VCSCommit> res = new ArrayList<>();
@@ -640,13 +641,8 @@ private RevCommit getInitialCommit(Repository gitRepo, String branchName) throws
 	}
 
 	@Override
-	public IVCSWorkspace getWorkspace() {
-		return repo.getWorkspace();
-	}
-
-	@Override
-	public List<VCSCommit> getCommitsRange(String branchName, String startFromCommitId, WalkDirection direction,
-			int limit) {
+	public List<VCSCommit> getCommitsRange(String branchName, String startRevision, WalkDirection direction,
+										   int limit) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
 			 Git git = getLocalGit(wc);
 			 Repository gitRepo = git.getRepository();
@@ -661,15 +657,15 @@ public List<VCSCommit> getCommitsRange(String branchName, String startFromCommit
 			if (direction == WalkDirection.ASC) {
 				ObjectId headCommitId = gitRepo.exactRef("refs/remotes/origin/" + bn).getObjectId();
 				startCommit = rw.parseCommit( headCommitId );
-				ObjectId sinceCommit = startFromCommitId == null ?
+				ObjectId startCommitObjectId = startRevision == null ?
 						getInitialCommit(gitRepo, bn).getId() :
-						ObjectId.fromString(startFromCommitId);
-				endCommit = rw.parseCommit(sinceCommit);
+						ObjectId.fromString(startRevision);
+				endCommit = rw.parseCommit(startCommitObjectId);
 			} else {
-				ObjectId sinceCommit = startFromCommitId == null ?
+				ObjectId endCommitObjectId = startRevision == null ?
 						gitRepo.exactRef("refs/remotes/origin/" + bn).getObjectId() :
-						ObjectId.fromString(startFromCommitId);
-				startCommit = rw.parseCommit( sinceCommit );
+						ObjectId.fromString(startRevision);
+				startCommit = rw.parseCommit( endCommitObjectId );
 				endCommit = getInitialCommit(gitRepo, bn);
 			}
 

version

@@ -1 +1 @@
-13.0-SNAPSHOT
+16.0-SNAPSHOT