Merge branch 'master' into B1

# Conflicts:
#	build.gradle

Author: gdy

README.md

@@ -58,7 +58,6 @@ Features:
 ```
 - Use methods of `IVCS` interface. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
 - Use `vcs.setProxy()` and `vcs.setCredentials()` if necessary
-- Github has some latency for exposing results of previously executed operations. For example if create a new branch and immediately check branches list then Github could return old branches list. Use `GitVCS.setExpectedLatency()` to set delay which will be executed after each operation which may have server latency 
 
 # Implementation details
 - [JGit](https://eclipse.org/jgit/) is used as framework to work with Git repositories
@@ -75,7 +74,6 @@ Features:
   - `PK_VCS_TEST_GITHUB_PASS` environment var or JVM var is used as user password for access to Github
   - New Test Repository is created before each test and deletes automatically after each test
 - To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See  [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
-- NOTE: Github has some latency for exposing results of previously executed operations. For example if create a new branch and immediately check branches list then Github could return old branches list. If a test is failed then try to execute it again. Also use `GitVCS.setExpectedLatency()` to set delay for 'dangerous' operations.
 
 # Limitations
 - Commit messages can not be attached to branch create and delete operations because Git does not exposes these operations as separate commits

build.gradle

@@ -19,7 +19,6 @@ dependencies {
     compile 'commons-logging:commons-logging:1.2'
     compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
 
-    testCompile 'org.kohsuke:github-api:1.75'    
     testCompile 'org.mockito:mockito-core:2.0.62-beta'
     testCompile 'junit:junit:4.12'
     testCompile 'com.github.ProjectKaiser:pk-vcs-test:1.1'

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

@@ -30,6 +30,7 @@
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.diff.DiffEntry.Side;
 import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectReader;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
@@ -55,20 +56,11 @@ public class GitVCS implements IVCS {
 
 	private static final String MASTER_BRANCH_NAME = "master";
 	public static final String GIT_VCS_TYPE_STRING = "git";
-	private static final String REFS_REMOTES_ORIGIN = "refs/remotes/origin/";
-	private Integer expectedLatency = 0;
-
+	private static final String REFS_REMOTES_ORIGIN = Constants.R_REMOTES + Constants.DEFAULT_REMOTE_NAME + "/";
+	
 	private CredentialsProvider credentials;
 	private IVCSRepositoryWorkspace repo;
 
-	public Integer getExpectedLatency() {
-		return expectedLatency;
-	}
-
-	public void setExpectedLatency(Integer expectedLatency) {
-		this.expectedLatency = expectedLatency;
-	}
-
 	public CredentialsProvider getCredentials() {
 		return credentials;
 	}
@@ -110,8 +102,6 @@ public void createBranch(String srcBranchName, String newBranchName, String comm
 								.setRefSpecs(refSpec)
 								.setCredentialsProvider(credentials)
 								.call();
-						Thread.sleep(expectedLatency); // github has some latency on branch operations
-											// so next request branches operation will return old branches list
 					} finally {
 						git.getRepository().close();
 					}
@@ -162,8 +152,6 @@ public void deleteBranch(String branchName, String commitMessage) {
 							.setCredentialsProvider(credentials)
 							.call();
 					git.getRepository().close();
-					Thread.sleep(expectedLatency); // github has some latency on branch operations
-										// so next request branches operation will return old branches list
 				}
 			}
 		} catch (GitAPIException e) {
@@ -174,7 +162,6 @@ public void deleteBranch(String branchName, String commitMessage) {
 	}
 
 	public Git getLocalGit(IVCSLockedWorkingCopy wc) {
-		
 		Repository gitRepo;
 		try {
 			gitRepo = new FileRepositoryBuilder()
@@ -186,6 +173,7 @@ public Git getLocalGit(IVCSLockedWorkingCopy wc) {
 		Boolean repoInited = gitRepo
 				.getObjectDatabase()
 				.exists();
+		Git git = new Git(gitRepo);
 		if (!repoInited) {
 			try {
 				Git
@@ -194,15 +182,16 @@ public Git getLocalGit(IVCSLockedWorkingCopy wc) {
 						.setURI(repo.getRepoUrl())
 						.setCredentialsProvider(credentials)
 						.setNoCheckout(true)
+						.setBranch(Constants.R_HEADS + Constants.MASTER)
 						.call()
 						.close();
-			} catch (GitAPIException e) {
+				return git; 
+			} catch (Exception e) {
 				throw new EVCSException(e);
+				
 			}
-			
 		}
-		Git res = new Git(gitRepo);
-		return res; 
+		return git;
 	}
 
 	@Override
@@ -231,12 +220,12 @@ public VCSMergeResult merge(String srcBranchName, String dstBranchName, String c
 
 					VCSMergeResult res = new VCSMergeResult();
 
-					res.setSuccess(!mr.getMergeStatus().equals(MergeResult.MergeStatus.CONFLICTING) &&
+					res.setSuccess(
+							!mr.getMergeStatus().equals(MergeResult.MergeStatus.CONFLICTING) &&
 							!mr.getMergeStatus().equals(MergeResult.MergeStatus.FAILED) && 
 							!mr.getMergeStatus().equals(MergeResult.MergeStatus.ABORTED) &&
 							!mr.getMergeStatus().equals(MergeResult.MergeStatus.NOT_SUPPORTED));
 
-					
 					if (!res.getSuccess()) {
 						res.getConflictingFiles().addAll(mr.getConflicts().keySet());
 						try {
@@ -348,13 +337,15 @@ public void setFileContent(String branchName, String filePath, String content, S
 							.pull()
 							.setCredentialsProvider(credentials)
 							.call();
-			
+					
 					git
 							.checkout()
 							.setCreateBranch(git.getRepository().exactRef("refs/heads/" + bn) == null)
 							.setName(bn)
 							.call();
 
+					
+					
 					File file = new File(wc.getFolder(), filePath);
 					if (!file.exists()) {
 						FileUtils.forceMkdir(file.getParentFile());

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

@@ -3,13 +3,14 @@
 
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.Repository;
 import org.junit.After;
 import org.junit.BeforeClass;
-import org.kohsuke.github.GHRepository;
-import org.kohsuke.github.GitHub;
 import org.mockito.Mockito;
 
 import com.projectkaiser.scm.vcs.api.IVCS;
@@ -22,17 +23,9 @@ public class GitVCSTest extends VCSAbstractTest {
 			System.getenv("PK_VCS_TEST_GITHUB_USER") : System.getProperty("PK_VCS_TEST_GITHUB_USER");
 	private static final String GITHUB_PASS = System.getProperty("PK_VCS_TEST_GITHUB_PASS") == null ? 
 			System.getenv("PK_VCS_TEST_GITHUB_PASS") : System.getProperty("PK_VCS_TEST_GITHUB_PASS");
-	private static final String PROXY_HOST = getJvmProperty("https.proxyHost");
-	private static final Integer PROXY_PORT = getJvmProperty("https.proxyPort") == null ? null :
-			Integer.parseInt(getJvmProperty("https.proxyPort"));
-	private static final String PROXY_USER = getJvmProperty("https.proxyUser");
-	private static final String PROXY_PASS = getJvmProperty("https.proxyPassword");
-	
-	private GitHub github;
-	
-	private GHRepository gitHubRepo;
-	private String gitUrl = "https://github.com/" + GITHUB_USER + "/";
+
 	private Git mockedGit;
+	private Repository localGitRepo;
 	private RuntimeException testGitResetException = new RuntimeException("test exeption on git.reset()");
 
 	@BeforeClass
@@ -43,68 +36,35 @@ public static void setUpClass() {
 				GITHUB_PASS != null);
 	}
 
-	private static String getJvmProperty(String name) {
-		if (name == null) {
-			return null;
-		}
-		
-		String res = System.getProperty(name);
-		if (res != null) {
-			return res;
-		}
-		
-		res = System.getenv("JAVA_OPTS");
-		if (res == null) {
-			return null;
-		}
-		
-		Integer st = res.indexOf(name);
-		if (st < 0) {
-			return null;
-		}
-		
-		res = res.substring(st + name.length() + 1, res.indexOf(" -D", st + name.length() + 1) < 0 ? name.length() : 
-				res.indexOf(" -D", st + name.length())).trim();
-		return res;
-	}
-	
-	
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		github = GitHub.connectUsingPassword(GITHUB_USER, GITHUB_PASS);
-		gitHubRepo = github.createRepository(repoName)
-				.issues(false)
-				.wiki(false)
-				.autoInit(true)
-				.downloads(false)
-				.create();
+		Git git = Git
+				.init()
+				.setDirectory(new File(localVCSWorkspace.getHomeFolder(), repoName))
+				.setBare(false)
+				.call();
+		localGitRepo = git.getRepository();
+		git
+				.commit()
+				.setMessage("Initial commit")
+				.call();
 	}
 
 	@After
-	public void tearDown() {
-		if (gitHubRepo != null) {
-			try {
-				gitHubRepo.delete();
-			} catch (IOException e) {
-				// do not affect the test
-			}
-		}
+	public void tearDown() throws IOException {
+		localGitRepo.close();
+	    FileUtils.deleteDirectory(localGitRepo.getDirectory());
 	}
 
 	@Override
 	protected String getTestRepoUrl() {
-		return gitUrl;
+		return ("file:///" + localVCSWorkspace.getHomeFolder() + "/").replace("\\", "/");
 	}
 
 	@Override
 	protected IVCS getVCS(IVCSRepositoryWorkspace mockedVCSRepo) {
 		IVCS vcs = Mockito.spy(new GitVCS(mockedVCSRepo));
-		vcs.setCredentials(GITHUB_USER, GITHUB_PASS);
-		if (PROXY_HOST != null) {
-			vcs.setProxy(PROXY_HOST, PROXY_PORT, PROXY_USER, PROXY_PASS);
-		}
-		((GitVCS) vcs).setExpectedLatency(2000);
 		return vcs;
 	}