Skip to content

Commit 464b5aa

Browse files
committed
Merge branch 'develop' of https://github.com/scm4j/scm4j-vcs-svn into develop
# Conflicts: # src/main/java/org/scm4j/vcs/svn/SVNVCS.java
2 parents 348ab22 + 3ce6149 commit 464b5aa

File tree

2 files changed

+60
-8
lines changed

2 files changed

+60
-8
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ defaultTasks 'build';
1919

2020
dependencies {
2121
compile 'com.github.scm4j:scm4j-vcs-api:master-SNAPSHOT'
22-
compile 'org.tmatesoft.svnkit:svnkit:1.8.14'
23-
24-
testCompile 'junit:junit:4.12'
22+
compile 'org.tmatesoft.svnkit:svnkit:1.8.6'
23+
24+
testCompile 'junit:junit:4.12'
2525
testCompile 'com.github.scm4j:scm4j-vcs-test:master-SNAPSHOT'
26-
testCompile 'org.mockito:mockito-core:2.0.62-beta'
26+
testCompile 'org.mockito:mockito-core:2.0.62-beta'
2727
}
2828

2929
task sourcesJar(type: Jar, dependsOn: classes) {

src/main/java/org/scm4j/vcs/svn/SVNVCS.java

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,66 @@
11
package org.scm4j.vcs.svn;
22

3+
import java.io.ByteArrayOutputStream;
4+
import java.io.File;
5+
import java.io.FileWriter;
6+
import java.io.UnsupportedEncodingException;
7+
import java.nio.charset.StandardCharsets;
8+
import java.util.ArrayList;
9+
import java.util.Collection;
10+
import java.util.Collections;
11+
import java.util.HashSet;
12+
import java.util.List;
13+
import java.util.Set;
14+
315
import org.apache.commons.io.FileUtils;
4-
import org.scm4j.vcs.api.*;
16+
import org.scm4j.vcs.api.IVCS;
17+
import org.scm4j.vcs.api.VCSChangeType;
18+
import org.scm4j.vcs.api.VCSCommit;
19+
import org.scm4j.vcs.api.VCSDiffEntry;
20+
import org.scm4j.vcs.api.VCSMergeResult;
21+
import org.scm4j.vcs.api.WalkDirection;
522
import org.scm4j.vcs.api.exceptions.EVCSBranchExists;
623
import org.scm4j.vcs.api.exceptions.EVCSException;
724
import org.scm4j.vcs.api.exceptions.EVCSFileNotFound;
825
import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
926
import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
1027
import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
11-
import org.tmatesoft.svn.core.*;
28+
import org.tmatesoft.svn.core.ISVNLogEntryHandler;
29+
import org.tmatesoft.svn.core.SVNCommitInfo;
30+
import org.tmatesoft.svn.core.SVNDepth;
31+
import org.tmatesoft.svn.core.SVNDirEntry;
32+
import org.tmatesoft.svn.core.SVNException;
33+
import org.tmatesoft.svn.core.SVNLogEntry;
34+
import org.tmatesoft.svn.core.SVNNodeKind;
35+
import org.tmatesoft.svn.core.SVNProperties;
36+
import org.tmatesoft.svn.core.SVNURL;
1237
import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
1338
import org.tmatesoft.svn.core.auth.SVNAuthentication;
1439
import org.tmatesoft.svn.core.auth.SVNPasswordAuthentication;
1540
import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
1641
import org.tmatesoft.svn.core.io.SVNRepository;
1742
import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
18-
import org.tmatesoft.svn.core.wc.*;
19-
import org.tmatesoft.svn.core.wc2.*;
43+
import org.tmatesoft.svn.core.wc.ISVNConflictHandler;
44+
import org.tmatesoft.svn.core.wc.ISVNOptions;
45+
import org.tmatesoft.svn.core.wc.SVNClientManager;
46+
import org.tmatesoft.svn.core.wc.SVNConflictChoice;
47+
import org.tmatesoft.svn.core.wc.SVNConflictDescription;
48+
import org.tmatesoft.svn.core.wc.SVNConflictResult;
49+
import org.tmatesoft.svn.core.wc.SVNCopyClient;
50+
import org.tmatesoft.svn.core.wc.SVNCopySource;
51+
import org.tmatesoft.svn.core.wc.SVNDiffClient;
52+
import org.tmatesoft.svn.core.wc.SVNRevision;
53+
import org.tmatesoft.svn.core.wc.SVNRevisionRange;
54+
import org.tmatesoft.svn.core.wc.SVNStatusType;
55+
import org.tmatesoft.svn.core.wc.SVNUpdateClient;
56+
import org.tmatesoft.svn.core.wc.SVNWCClient;
57+
import org.tmatesoft.svn.core.wc.SVNWCUtil;
58+
import org.tmatesoft.svn.core.wc2.ISvnObjectReceiver;
59+
import org.tmatesoft.svn.core.wc2.SvnDiff;
60+
import org.tmatesoft.svn.core.wc2.SvnDiffStatus;
61+
import org.tmatesoft.svn.core.wc2.SvnDiffSummarize;
62+
import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
63+
import org.tmatesoft.svn.core.wc2.SvnTarget;
2064

2165
import java.io.ByteArrayOutputStream;
2266
import java.io.File;
@@ -416,6 +460,14 @@ public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final Stri
416460
}
417461
}
418462

463+
public void createTrunk(String commitMessage) throws SVNException {
464+
createBranch(SVNURL.parseURIEncoded(repoUrl), SVNURL.parseURIEncoded(repoUrl + MASTER_PATH), commitMessage);
465+
}
466+
467+
public void createBranches(String commitMessage) throws SVNException {
468+
createBranch(SVNURL.parseURIEncoded(repoUrl), SVNURL.parseURIEncoded(repoUrl + BRANCHES_PATH), commitMessage);
469+
}
470+
419471
@Override
420472
public Set<String> getBranches() {
421473
try {

0 commit comments

Comments
 (0)