tests completed

Author: Denis

src/main/java/com/projectkaiser/scm/vcs/GitVCS.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Proxy.Type;
@@ -21,19 +20,11 @@
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.api.ResetCommand.ResetType;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevTree;
-import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.treewalk.filter.PathFilter;
 
 import com.projectkaiser.scm.vcs.api.AbstractVCS;
 import com.projectkaiser.scm.vcs.api.IVCS;
@@ -69,7 +60,6 @@ public void createBranch(String srcBranchName, String newBranchName, String comm
 					git
 							.branchCreate()
 							.setName(newBranchName)
-							.setForce(true)
 							.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
 							.setStartPoint("origin/" + srcBranchName)
 							.call();
@@ -107,7 +97,6 @@ public void deleteBranch(String branchName, String commitMessage) {
 					git
 							.branchDelete()
 							.setBranchNames(branchName)
-							.setForce(true)
 							.call();
 
 					git
@@ -121,7 +110,6 @@ public void deleteBranch(String branchName, String commitMessage) {
 					git
 							.push()
 							.setPushAll()
-							.setForce(true)
 							.setRefSpecs(refSpec)
 							.setRemote("origin")
 							.setCredentialsProvider(credentials)
@@ -160,8 +148,6 @@ public Git getLocalGit(VCSWorkspace workspace) {
 						.setDirectory(workspace.getFolder())
 						.setURI(baseUrl)
 						.setCredentialsProvider(credentials)
-						.setBranch("refs/heads/master")
-						//.setCloneAllBranches(true)
 						.setNoCheckout(true)
 						.call();
 			} catch (GitAPIException e) {
@@ -211,7 +197,7 @@ public PKVCSMergeResult merge(String sourceBranchUrl, String destBranchUrl, Stri
 									.setMode(ResetType.HARD)
 									.call();
 						} catch(Exception e) {
-							workspace.setIsCorrupt(true);
+							workspace.setCorrupt(true);
 						}
 					} else {
 						git
@@ -239,10 +225,7 @@ private void checkout(String destBranchUrl, Git git) throws GitAPIException {
 		git
 				.checkout()
 				.setCreateBranch(false)
-				.setForce(true)
 				.setName(destBranchUrl)
-				//.setStartPoint("origin/" + destBranchUrl)
-				.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
 				.call(); 
 	}
 
@@ -297,11 +280,8 @@ public String getFileContent(String branchName, String filePath, String encoding
 					git
 							.checkout()
 							.setCreateBranch(false)
-							.setForce(true)
 							.addPath(filePath)
 							.setName(branchName)
-							//.setStartPoint("origin/" + destBranchUrl)
-							//.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
 							.call();
 					File file = new File(workspace.getFolder(), filePath);
 
@@ -333,11 +313,8 @@ public void setFileContent(String branchName, String filePath, String content, S
 					git
 							.checkout()
 							.setCreateBranch(false)
-							.setForce(true)
 							.addPath(filePath)
 							.setName(branchName)
-							//.setStartPoint("origin/" + destBranchUrl)
-							//.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
 							.call();
 
 					File file = new File(workspace.getFolder(), filePath);
@@ -355,7 +332,6 @@ public void setFileContent(String branchName, String filePath, String content, S
 
 					git
 							.push()
-							.setForce(true)
 							.setRefSpecs(refSpec)
 							.setRemote("origin")
 							.setCredentialsProvider(credentials)

src/test/java/com/projectkaiser/scm/vcs/GitVCSTest.java

@@ -11,7 +11,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-import org.eclipse.jgit.api.CreateBranchCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.NoFilepatternException;
@@ -152,55 +151,59 @@ public void testGitMerge() throws IOException, NoFilepatternException, GitAPIExc
 		VCSWorkspace w = VCSWorkspace.getLockedWorkspace(gitVCS.getRepoFolder());
 		try {
 			try (Git git = gitVCS.getLocalGit(w)) {
+				
+				git
+						.checkout()
+						.setCreateBranch(true)
+						.setStartPoint("refs/remotes/origin/" + SRC_BRANCH)
+						.setName(SRC_BRANCH)
+						.call(); // switch to master
+				
 				File file1 = new File(w.getFolder(), "file1.txt");
 				file1.createNewFile();
 
 				git
 						.add()
 						.addFilepattern("file1.txt")
 						.call();
+				
 				git
 						.commit()
 						.setMessage(FILE1_ADDED_COMMIT_MESSAGE)
 						.call();
 
 				git
+				
 						.checkout()
 						.setCreateBranch(false)
-						
-						.setName(NEW_BRANCH) // create NEW_BRANCH locally
-						.setForce(true)
-						//.setStartPoint()
-						.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
+						.setName(NEW_BRANCH) 
 						.call(); // switch to new-branch
 
 				File file2 = new File(w.getFolder(), "file2.txt");
 				file2.createNewFile();
+				
 				git
 						.add()
 						.addFilepattern("file2.txt")
 						.call();
+				
 				git
 						.commit()
 						.setMessage(FILE2_ADDED_COMMIT_MESSAGE)
 						.call();
 
-				
 				git
 						.push()
 						.setPushAll()
-						//.setForce(true)
 						.setRemote("origin")
 						.setCredentialsProvider(gitVCS.getCredentials())
 						.call();
 
 				git
 						.checkout()
 						.setCreateBranch(false)
-						.setForce(true)
+						.setForce(false)
 						.setName(SRC_BRANCH)
-						//.setStartPoint("origin/" + SRC_BRANCH)
-						.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
 						.call(); // switch to master
 
 				vcs.merge(NEW_BRANCH, SRC_BRANCH, MERGE_COMMIT_MESSAGE);
@@ -213,6 +216,7 @@ public void testGitMerge() throws IOException, NoFilepatternException, GitAPIExc
 
 				assertTrue(file1.exists());
 				assertTrue(file2.exists());
+				
 				Iterable<RevCommit> commits = git
 						.log()
 						.all()