Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity

fix bug in SvnRepositoryClient

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-10-19 10:30:16 +02:00
parent f1752c0403
commit a67abfa5fe
1 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
scm-test/src/main/java/sonia/scm/repository/client/SvnRepositoryClient.java
View File

@@ -44,13 +44,13 @@ import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNCommitClient;
import org.tmatesoft.svn.core.wc.SVNRevision;
import org.tmatesoft.svn.core.wc.SVNUpdateClient;
import org.tmatesoft.svn.core.wc.SVNWCClient;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -107,12 +107,22 @@ public class SvnRepositoryClient extends AbstractRepositoryClient
public void add(String file, String... others)
throws RepositoryClientException
{
files.add(file);
checkout();
List<File> files = new ArrayList<File>();
files.add(new File(localRepository, file));
if (others != null)
{
files.addAll(Arrays.asList(others));
for (String f : others)
{
files.add(new File(localRepository, f));
}
}
addFiles(files);
pendingFiles.addAll(files);
}
/**
@@ -155,13 +165,9 @@ public class SvnRepositoryClient extends AbstractRepositoryClient
try
{
for (String name : files)
{
File file = new File(localRepository, name);
cc.doImport(file, remoteRepositoryURL.appendPath(name, true), message,
null, false, true, SVNDepth.FILES);
}
cc.doCommit(pendingFiles.toArray(new File[0]), true, message, null, null,
true, true, SVNDepth.INFINITY);
pendingFiles.clear();
}
catch (SVNException ex)
{
@@ -182,14 +188,38 @@ public class SvnRepositoryClient extends AbstractRepositoryClient
// do nothing
}
/**
* Method description
*
*
*
* @param files
*
* @throws RepositoryClientException
*/
private void addFiles(List<File> files) throws RepositoryClientException
{
SVNWCClient wClient = client.getWCClient();
try
{
wClient.doAdd(files.toArray(new File[0]), true, false, false,
SVNDepth.INFINITY, false, false, false);
}
catch (SVNException ex)
{
throw new RepositoryClientException(ex);
}
}
//~--- fields ---------------------------------------------------------------
/** Field description */
List<File> pendingFiles = new ArrayList<File>();
/** Field description */
private SVNClientManager client;
/** Field description */
private List<String> files = new ArrayList<String>();
/** Field description */
private SVNURL remoteRepositoryURL;
}