You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+10-6Lines changed: 10 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,7 +7,7 @@ scm4j-vcs-api is set of base classes and interfaces to build VCS support (Git, S
7
7
scm4j-vcs-api provides:
8
8
- A simple interface to implement basic VCS-related operations
9
9
- 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
11
11
12
12
# Terms
13
13
-`IVCS`
@@ -74,14 +74,14 @@ Note: null passed as a branch name is considered as Master Branch. Any non-null
- Returns list of `VCSDiffEntry` showing what was made within branch `srcBranchName` relative to branch `destBranchName`
76
76
- 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
- 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.
- returns list of all tags which are related to commit specified by `revision`
102
106
103
107
# Using Locked Working Copy
104
108
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