Merge branch 'master' into B1

# Conflicts:
#	build.gradle

Author: host6

.gitignore

@@ -14,3 +14,4 @@ hs_err_pid*
 /.*
 /bin
 build
+/*.iml

README.md

@@ -64,9 +64,10 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
 	- `fileRelativePath` is a path to file within `branchName` branch 
 	- The Head file state is used
 	- Use `String getFileContent(String branchName, String fileRelativePath)` overload to use UTF-8 encoding by default
-- `void setFileContent(String branchName, String filePath, String content, String commitMessage)`
+- `String setFileContent(String branchName, String filePath, String content, String commitMessage)`
 	- Rewrites a file with path `filePath` within branch `branchName` with content `content` and applies `commitMessage` message to commit
 	- Creates the file and its parent folders if doesn't exists
+	- Returns commit id (hash, revision number etc)
 - `List<VCSDiffEntry> getBranchesDiff(String srcBranchName, String destBranchName)`
 	- Returns list of `VCSDiffEntry` showing what was made within branch `srcBranchName` relative to branch `destBranchName`
 	- Note: result is a commit which would be made on merging the branch `srcBranchName` into `destBranchName`
@@ -76,8 +77,11 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
 	- Returns list of commit messages of branch `branchName` limited by `limit` in descending order
 - `String getVCSTypeString`
 	- Returns short name of current IVCS implementation: "git", "svn" etc
-- `void removeFile(String branchName, String filePath, String commitMessage)`
+- `String removeFile(String branchName, String filePath, String commitMessage)`
 	- Removes the file located by `filePath` within branch `branchName`. Operation is executed as separate commit with `commitMessage` message attached. Note: filePath = "folder\file.txt" -> file.txt is removed, folder is kept
+	- Returns commit id (hash, revision number etc)
+- `List<VCSCommit> getCommitsRange(String branchName, String afterCommitId, String untilCommitId);`
+	- Returns ordered list of all commits located between commits specified by `aftercommitId` and `untilCommitId` within branch `branchName` 
 
 # Using Locked Working Copy
 Let's assume we developing a multiuser server which has ability to merge branches of user's repositories. So few users could request to merge theirs branches of different repositories simultaneously. For example, Git merge operation consists of few underlying operations (check in\out, merge itself, push) which must be executed on a local file system in a certain folder. So we have following requirements:

build.gradle

@@ -1,14 +1,12 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 group = 'com.projectkaiser.scm'
 version = '1.1'
 
-
 repositories {
 	mavenCentral()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 10 11:04:58 GMT+03:00 2016
+#Sun Mar 26 13:53:29 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

src/main/java/com/projectkaiser/scm/vcs/api/IVCS.java

@@ -22,7 +22,7 @@ public interface IVCS {
 
 	String getFileContent(String branchName, String fileRelativePath) throws EVCSFileNotFound;
 
-	void setFileContent(String branchName, String filePath, String content, String commitMessage);
+	String setFileContent(String branchName, String filePath, String content, String commitMessage);
 
 	List<VCSDiffEntry> getBranchesDiff(String srcBranchName, String destBranchName);
 
@@ -32,5 +32,7 @@ public interface IVCS {
 
 	String getVCSTypeString();
 
-	void removeFile(String branchName, String filePath, String commitMessage);
+	String removeFile(String branchName, String filePath, String commitMessage);
+	
+	List<VCSCommit> getCommitsRange(String branchName, String afterCommitId, String untilCommitId);
 }

src/main/java/com/projectkaiser/scm/vcs/api/VCSChangeType.java

@@ -12,5 +12,5 @@ public enum VCSChangeType {
 	MODIFY,
 
 	/** Delete an existing file from the project */
-	DELETE;
+	DELETE
 }

src/main/java/com/projectkaiser/scm/vcs/api/VCSCommit.java

@@ -0,0 +1,31 @@
+package com.projectkaiser.scm.vcs.api;
+
+public class VCSCommit {
+	private String id;
+	private String logMessage;
+	private String author;
+	
+	public String getAuthor() {
+		return author;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getLogMessage() {
+		return logMessage;
+	}
+
+	public VCSCommit(String id, String logMessage, String author) {
+		super();
+		this.id = id;
+		this.logMessage = logMessage;
+		this.author = author;
+	}
+
+	@Override
+	public String toString() {
+		return "VCSCommit [id=" + id + ", logMessage=" + logMessage + ", author=" + author + "]";
+	}
+}

src/main/java/com/projectkaiser/scm/vcs/api/workingcopy/VCSLockedWorkingCopy.java

@@ -58,9 +58,7 @@ private void init() {
 				if (!lockFile.exists()) {
 					continue;
 				}
-				if (!tryLockFile(lockFile)) {
-					continue;
-				} else {
+				if (tryLockFile(lockFile)) {
 					folder = file;
 					state = VCSLockedWorkingCopyState.LOCKED;
 					return;

src/test/java/com/projectkaiser/scm/vcs/api/workingcopy/VCSLockedWorkingCopyTest.java

@@ -9,13 +9,12 @@
 import org.junit.Test;
 
 public class VCSLockedWorkingCopyTest extends VCSWCTestBase {
-	
-	private IVCSWorkspace w;
+
 	private IVCSRepositoryWorkspace r;
 
 	@Before
 	public void setUp() {
-		w = new VCSWorkspace(WORKSPACE_DIR);
+		IVCSWorkspace w = new VCSWorkspace(WORKSPACE_DIR);
 		r = w.getVCSRepositoryWorkspace(TEST_REPO_URL);
 	}