Skip to content

Commit fb8734e

Browse files
author
Denis
committed
refactoring
Terms in documentation and method arguments updated
1 parent 48d2bbf commit fb8734e

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,5 @@ Features:
6767
- Branches/Br1/Folder/file.txt
6868
- Branches/Br2/Folder/file.txt
6969
- Trunk/Folder/file.txt
70+
- Tags/Tag1/
7071
- Then `SVNVCS.getBranches()` method will return [Br1, Br2, Trunk]

src/main/java/com/projectkaiser/scm/vcs/svn/SVNVCS.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ private SVNURL getBranchUrl(String branchPath) throws SVNException {
121121
}
122122

123123
@Override
124-
public void createBranch(String srcBranchPath, String dstBranchPath, String commitMessage) {
124+
public void createBranch(String srcBranchName, String dstBranchName, String commitMessage) {
125125
try {
126-
SVNURL fromUrl = getBranchUrl(srcBranchPath);
127-
SVNURL toUrl = getBranchUrl(dstBranchPath);
126+
SVNURL fromUrl = getBranchUrl(srcBranchName);
127+
SVNURL toUrl = getBranchUrl(dstBranchName);
128128
createBranch(fromUrl, toUrl, commitMessage);
129129
} catch (SVNException e) {
130130
throw new EVCSException(e);
@@ -159,22 +159,22 @@ public void createBranch(SVNURL fromUrl, SVNURL toUrl, String commitMessage) {
159159
}
160160

161161
@Override
162-
public void deleteBranch(String branchPath, String commitMessage) {
162+
public void deleteBranch(String branchName, String commitMessage) {
163163
try {
164164
clientManager
165165
.getCommitClient()
166-
.doDelete(new SVNURL[] { getBranchUrl(branchPath) }, commitMessage);
166+
.doDelete(new SVNURL[] { getBranchUrl(branchName) }, commitMessage);
167167
} catch (SVNException e) {
168168
throw new EVCSException(e);
169169
}
170170
}
171171

172172
@Override
173-
public VCSMergeResult merge(String srcBranchPath, String dstBranchPath, String commitMessage) {
173+
public VCSMergeResult merge(String srcBranchÒôüó, String dstBranchName, String commitMessage) {
174174
SVNDiffClient diffClient = clientManager.getDiffClient();
175175
try {
176176
try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
177-
checkout(getBranchUrl(dstBranchPath), wc.getFolder());
177+
checkout(getBranchUrl(dstBranchName), wc.getFolder());
178178

179179
DefaultSVNOptions options = (DefaultSVNOptions) diffClient.getOptions();
180180
final VCSMergeResult res = new VCSMergeResult();
@@ -190,7 +190,7 @@ public SVNConflictResult handleConflict(SVNConflictDescription conflictDescripti
190190

191191
try {
192192
SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
193-
diffClient.doMerge(getBranchUrl(srcBranchPath),
193+
diffClient.doMerge(getBranchUrl(srcBranchÒôüó),
194194
SVNRevision.HEAD, Collections.singleton(range),
195195
wc.getFolder(), SVNDepth.UNKNOWN, true, false, false, false);
196196

@@ -328,7 +328,7 @@ public String getRepoUrl() {
328328
}
329329

330330
@Override
331-
public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final String destBranchName) {
331+
public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final String dstBranchName) {
332332
try {
333333
final List<SVNLogEntry> entries = new ArrayList<>();
334334
repository.log(new String[] { "branches/" + srcBranchName }, -1 /* start from head descending */,

0 commit comments

Comments
 (0)