devide getFileContent(): from branch and from revision #1

Author: host6

README.md

@@ -62,10 +62,12 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
 	- Sets proxy parameters if necessary
 - `String getRepoUrl()`
 	- Returns string url of current vcs repository
-- `String getFileContent(String branchName, String fileRelativePath, String revision)`
+- `String getFileContentFromBranch(String branchName, String filePath)`
 	- Returns file content as a string using UTF-8 encoding.
-	- `fileRelativePath` is a path to file within `branchName` branch 
-	- File state at `revision` revision is used. If `revision` is null then Head state is used
+	- HEAD file state within branch `branchName` is used
+- `String getFileContentFromRevision(String revision, String filePath)`
+	- Returns file content as a string using UTF-8 encoding.
+	- File state at `revision` revision is used.
 - `VCSCommit 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

src/main/java/org/scm4j/vcs/api/IVCS.java

@@ -20,7 +20,9 @@ public interface IVCS {
 
 	String getRepoUrl();
 
-	String getFileContent(String branchName, String fileRelativePath, String revision) throws EVCSFileNotFound;
+	String getFileContentFromBranch(String branchName, String filePath) throws EVCSFileNotFound;
+
+	String getFileContentFromRevision(String revision, String filePath) throws EVCSFileNotFound;
 
 	VCSCommit setFileContent(String branchName, String filePath, String content, String commitMessage);
 

src/main/java/org/scm4j/vcs/api/exceptions/EVCSFileNotFound.java

@@ -4,7 +4,7 @@ public class EVCSFileNotFound extends EVCSException {
 
 	private static final long serialVersionUID = 1L;
 
-	public EVCSFileNotFound(String repoUrl, String branchName, String filePath, String revision) {
-		super(String.format("file %s is not found in branch %s at revision %s of repo %s", filePath, branchName, revision == null ? "HEAD" : revision, repoUrl));
+	public EVCSFileNotFound(String repoUrl, String filePath, String revision) {
+		super(String.format("file %s is not found in at revision %s of repo %s", filePath, revision == null ? "HEAD" : revision, repoUrl));
 	}
 }

src/test/java/org/scm4j/vcs/api/exceptions/ExceptionsTest.java

@@ -27,7 +27,7 @@ public void testEVCSBranchExists() {
 
 	@Test
 	public void testEVCSFileNotFound() {
-		EVCSFileNotFound e = new EVCSFileNotFound("test repo", "test branch", "test file", "test revision");
+		EVCSFileNotFound e = new EVCSFileNotFound("test repo", "test file", "test revision");
 		assertFalse(e.getMessage().isEmpty());
 	}