Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 03:25:56 +01:00
Code Issues Packages Projects Releases Activity

Keep ParentAndClone inside working copy factories

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-14 23:01:48 +02:00
parent 73ef559213
commit 7e945afc43
12 changed files with 206 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnWorkingCopyInitializer.java
View File

@@ -31,7 +31,7 @@ import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
import org.tmatesoft.svn.core.wc2.SvnTarget;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory.ParentAndClone;
import java.io.File;
@@ -43,7 +43,7 @@ class SvnWorkingCopyInitializer implements SimpleWorkingCopyFactory.WorkingCopyI
}
@Override
public WorkingCopyPool.ParentAndClone<File, File> initialize(File workingCopy, String initialBranch) {
public ParentAndClone<File, File> initialize(File workingCopy, String initialBranch) {
final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
SVNURL source;
@@ -64,6 +64,6 @@ class SvnWorkingCopyInitializer implements SimpleWorkingCopyFactory.WorkingCopyI
svnOperationFactory.dispose();
}
return new WorkingCopyPool.ParentAndClone<>(context.getDirectory(), workingCopy, workingCopy);
return new ParentAndClone<>(context.getDirectory(), workingCopy, workingCopy);
}
}

6
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnWorkingCopyReclaimer.java
View File

@@ -28,7 +28,7 @@ import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNRevision;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory.ParentAndClone;
import java.io.File;
@@ -42,7 +42,7 @@ class SvnWorkingCopyReclaimer implements SimpleWorkingCopyFactory.WorkingCopyRec
}
@Override
public WorkingCopyPool.ParentAndClone<File, File> reclaim(File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
public ParentAndClone<File, File> reclaim(File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
SVNClientManager clientManager = SVNClientManager.newInstance();
try {
clientManager.getWCClient().doRevert(new File[] {target}, INFINITY, null);
@@ -51,6 +51,6 @@ class SvnWorkingCopyReclaimer implements SimpleWorkingCopyFactory.WorkingCopyRec
} catch (SVNException e) {
throw new SimpleWorkingCopyFactory.ReclaimFailedException(e);
}
return new WorkingCopyPool.ParentAndClone<>(context.getDirectory(), target, target);
return new ParentAndClone<>(context.getDirectory(), target, target);
}
}