Skip to content

Commit 681d299

Browse files
host6host6
committed
refactor
1 parent 1aedee8 commit 681d299

File tree

1 file changed

+15
-61
lines changed

1 file changed

+15
-61
lines changed

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

Lines changed: 15 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,30 @@
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.nio.charset.StandardCharsets;
7-
import java.util.ArrayList;
8-
import java.util.Collection;
9-
import java.util.Collections;
10-
import java.util.Comparator;
11-
import java.util.HashSet;
12-
import java.util.Iterator;
13-
import java.util.List;
14-
import java.util.Set;
15-
163
import org.apache.commons.io.FileUtils;
174
import org.apache.commons.lang3.StringUtils;
18-
import org.scm4j.vcs.api.IVCS;
19-
import org.scm4j.vcs.api.VCSChangeType;
20-
import org.scm4j.vcs.api.VCSCommit;
21-
import org.scm4j.vcs.api.VCSDiffEntry;
22-
import org.scm4j.vcs.api.VCSMergeResult;
23-
import org.scm4j.vcs.api.VCSTag;
24-
import org.scm4j.vcs.api.WalkDirection;
5+
import org.scm4j.vcs.api.*;
256
import org.scm4j.vcs.api.exceptions.EVCSBranchExists;
267
import org.scm4j.vcs.api.exceptions.EVCSException;
278
import org.scm4j.vcs.api.exceptions.EVCSFileNotFound;
289
import org.scm4j.vcs.api.exceptions.EVCSTagExists;
2910
import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
3011
import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
3112
import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
32-
import org.tmatesoft.svn.core.ISVNLogEntryHandler;
33-
import org.tmatesoft.svn.core.SVNCommitInfo;
34-
import org.tmatesoft.svn.core.SVNDepth;
35-
import org.tmatesoft.svn.core.SVNDirEntry;
36-
import org.tmatesoft.svn.core.SVNException;
37-
import org.tmatesoft.svn.core.SVNLogEntry;
38-
import org.tmatesoft.svn.core.SVNLogEntryPath;
39-
import org.tmatesoft.svn.core.SVNNodeKind;
40-
import org.tmatesoft.svn.core.SVNProperties;
41-
import org.tmatesoft.svn.core.SVNURL;
13+
import org.tmatesoft.svn.core.*;
4214
import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
4315
import org.tmatesoft.svn.core.auth.SVNAuthentication;
4416
import org.tmatesoft.svn.core.auth.SVNPasswordAuthentication;
4517
import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
4618
import org.tmatesoft.svn.core.io.SVNRepository;
4719
import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
48-
import org.tmatesoft.svn.core.wc.ISVNConflictHandler;
49-
import org.tmatesoft.svn.core.wc.ISVNOptions;
50-
import org.tmatesoft.svn.core.wc.SVNClientManager;
51-
import org.tmatesoft.svn.core.wc.SVNConflictChoice;
52-
import org.tmatesoft.svn.core.wc.SVNConflictDescription;
53-
import org.tmatesoft.svn.core.wc.SVNConflictResult;
54-
import org.tmatesoft.svn.core.wc.SVNCopyClient;
55-
import org.tmatesoft.svn.core.wc.SVNCopySource;
56-
import org.tmatesoft.svn.core.wc.SVNDiffClient;
57-
import org.tmatesoft.svn.core.wc.SVNRevision;
58-
import org.tmatesoft.svn.core.wc.SVNRevisionRange;
59-
import org.tmatesoft.svn.core.wc.SVNStatusType;
60-
import org.tmatesoft.svn.core.wc.SVNUpdateClient;
61-
import org.tmatesoft.svn.core.wc.SVNWCClient;
62-
import org.tmatesoft.svn.core.wc.SVNWCUtil;
63-
import org.tmatesoft.svn.core.wc2.ISvnObjectReceiver;
64-
import org.tmatesoft.svn.core.wc2.SvnDiff;
65-
import org.tmatesoft.svn.core.wc2.SvnDiffStatus;
66-
import org.tmatesoft.svn.core.wc2.SvnDiffSummarize;
67-
import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
68-
import org.tmatesoft.svn.core.wc2.SvnTarget;
20+
import org.tmatesoft.svn.core.wc.*;
21+
import org.tmatesoft.svn.core.wc2.*;
22+
23+
import java.io.ByteArrayOutputStream;
24+
import java.io.File;
25+
import java.io.FileWriter;
26+
import java.nio.charset.StandardCharsets;
27+
import java.util.*;
6928

7029
public class SVNVCS implements IVCS {
7130
private static final int SVN_PATH_IS_NOT_WORKING_COPY_ERROR_CODE = 155007;
@@ -151,10 +110,8 @@ public void createBranch(String srcBranchName, String dstBranchName, String comm
151110
}
152111

153112
public void createBranch(SVNURL fromUrl, SVNURL toUrl, String commitMessage) {
154-
try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
155-
113+
try {
156114
getBranchUrl("test"); // for exceptions rethrowing test only
157-
158115
SVNCopyClient copyClient = clientManager.getCopyClient();
159116
SVNCopySource copySource = new SVNCopySource(SVNRevision.HEAD, SVNRevision.HEAD, fromUrl);
160117
copySource.setCopyContents(false);
@@ -491,13 +448,10 @@ public int compare(SVNDirEntry o1, SVNDirEntry o2) {
491448
return 0;
492449
}
493450
});
494-
Iterator<SVNDirEntry> entriesIterator = entriesList.iterator();
495-
while (entriesIterator.hasNext()) {
496-
SVNDirEntry entry = (SVNDirEntry) entriesIterator.next();
497-
451+
for (SVNDirEntry entry : entriesList) {
498452
if (entry.getKind() == SVNNodeKind.DIR) {
499453
res.add((path.isEmpty() ? "" : StringUtils.appendIfMissing(path, "/")) + entry.getName());
500-
res.addAll(listEntries((path.equals("")) ? entry.getName( ) : path + entry.getName()));
454+
res.addAll(listEntries((path.equals("")) ? entry.getName() : path + entry.getName()));
501455
}
502456
}
503457

@@ -644,8 +598,8 @@ public Boolean fileExists(String branchName, String filePath) {
644598

645599
@Override
646600
public VCSTag createTag(String branchName, String tagName, String tagMessage, String revisionToTag) throws EVCSTagExists {
647-
try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
648-
SVNURL srcURL = getBranchUrl(branchName);
601+
try {
602+
SVNURL srcURL = getBranchUrl(branchName);
649603
SVNURL dstURL = SVNURL.parseURIEncoded(repoUrl + TAGS_PATH + tagName);
650604
SVNLogEntry copyFromEntry = revToSVNEntry(getBranchName(branchName),
651605
revisionToTag == null ? SVNRevision.HEAD.getNumber() : Long.parseLong(revisionToTag));

0 commit comments

Comments
 (0)