Skip to content

Commit f4dab87

Browse files
committed
documentation update
1 parent ae0845f commit f4dab87

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ scm4j-vcs-api is set of base classes and interfaces to build VCS support (Git, S
77
scm4j-vcs-api provides:
88
- A simple interface to implement basic VCS-related operations
99
- Set of functional tests wchich are common to each VCS implementation. Functional tests for a certain VCS implementation are done by implementing few abstract methods of base test class. Implemented in [scm4j-vcs-test](https://github.com/scm4j/scm4j-vcs-test)
10-
- Working copy management for operations which must be executed on local file system
10+
- Working copies management for operations which must be executed on a local file system
1111

1212
# Terms
1313
- `IVCS`
@@ -74,14 +74,14 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
7474
- `List<VCSDiffEntry> getBranchesDiff(String srcBranchName, String destBranchName)`
7575
- Returns list of `VCSDiffEntry` showing what was made within branch `srcBranchName` relative to branch `destBranchName`
7676
- Note: result could be considered as a commit which would be made on merging the branch `srcBranchName` into `destBranchName`
77-
- `Set<String> getBranches()`
78-
- Returns list of names of all branches. Branches here are considered as user-created branches and Master Branch. I.e. any branch for Git, "Trunk" and any branch within "Branches" branch (not "Tags" branches) for SVN etc
77+
- `Set<String> getBranches(String path)`
78+
- Returns list of names of all branches which are started from `path`. Branches here are considered as user-created branches and Master Branch. I.e. any branch for Git, "Trunk" and any branch within "Branches" branch (not "Tags" branches) for SVN etc
7979
- `List<VCSCommit> log(Sting branchName, Integer limit)`
8080
- Returns list of commits of branch `branchName` limited by `limit` in descending order
8181
- `String getVCSTypeString`
8282
- Returns short name of current IVCS implementation: "git", "svn" etc
8383
- `VCSCommit removeFile(String branchName, String filePath, String commitMessage)`
84-
- Removes the file with path `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
84+
- Removes the file with path `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 resulting commit.
8585
- `List<VCSCommit> getCommitsRange(String branchName, String firstCommitId, String untilCommitId)`
8686
- Returns ordered list of all commits located between commits specified by `firstCommitId` and `untilCommitId` inclusively within branch `branchName`
8787
- If `firstCommitId` is null then all commits until commit specified by `untilCommitId` inclusively are fetched
@@ -97,8 +97,12 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
9797
- Creates a tag named `tagName` with log message `tagMessage` on a Head of branch `branchName`
9898
- `List<VCSTag> getTags()`
9999
- Returns list of all tags
100-
- `VCSTag getLastTag()`
101-
- Returns the last created tag
100+
- `void removeTag(String tagName)`
101+
- Removes tag with name `tagName`
102+
- `void checkout(String branchName, String targetPath, String revision)`
103+
- Checks out a branch `branchName` on a revision `revision` into a local folder `targetPath`
104+
- `List<VCSTag> getTagsOnRevision(String revision)`
105+
- returns list of all tags which are related to commit specified by `revision`
102106

103107
# Using Locked Working Copy
104108
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:

0 commit comments

Comments
 (0)