Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-08 05:10:20 +01:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-14 17:47:45 +02:00
parent 37ea231340 3c08fcb42e
commit a5dcc8cf8a
74 changed files with 1639 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java
View File

@@ -14,6 +14,8 @@ import sonia.scm.repository.client.api.RepositoryClientFactory;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.UUID;
public class RepositoryUtil {
@@ -42,11 +44,53 @@ public class RepositoryUtil {
}
static Changeset createAndCommitFile(RepositoryClient repositoryClient, String username, String fileName, String content) throws IOException {
writeAndAddFile(repositoryClient, fileName, content);
return commit(repositoryClient, username, "added " + fileName);
}
/**
* Bundle multiple File modification in one changeset
*
* @param repositoryClient
* @param username
* @param addedFiles map.key: path of the file, value: the file content
* @param modifiedFiles map.key: path of the file, value: the file content
* @param removedFiles list of file paths to be removed
* @return the changeset with all modifications
* @throws IOException
*/
static Changeset commitMultipleFileModifications(RepositoryClient repositoryClient, String username, Map<String, String> addedFiles, Map<String, String> modifiedFiles, List<String> removedFiles) throws IOException {
for (String fileName : addedFiles.keySet()) {
writeAndAddFile(repositoryClient, fileName, addedFiles.get(fileName));
}
for (String fileName : modifiedFiles.keySet()) {
writeAndAddFile(repositoryClient, fileName, modifiedFiles.get(fileName));
}
for (String fileName : removedFiles) {
deleteFileAndApplyRemoveCommand(repositoryClient, fileName);
}
return commit(repositoryClient, username, "multiple file modifications" );
}
private static File writeAndAddFile(RepositoryClient repositoryClient, String fileName, String content) throws IOException {
File file = new File(repositoryClient.getWorkingCopy(), fileName);
Files.createParentDirs(file);
Files.write(content, file, Charsets.UTF_8);
addWithParentDirectories(repositoryClient, file);
return commit(repositoryClient, username, "added " + fileName);
return file;
}
static Changeset removeAndCommitFile(RepositoryClient repositoryClient, String username, String fileName) throws IOException {
deleteFileAndApplyRemoveCommand(repositoryClient, fileName);
return commit(repositoryClient, username, "removed " + fileName);
}
private static void deleteFileAndApplyRemoveCommand(RepositoryClient repositoryClient, String fileName) throws IOException {
File file = new File(repositoryClient.getWorkingCopy(), fileName);
if (repositoryClient.isCommandSupported(ClientCommand.REMOVE)) {
repositoryClient.getRemoveCommand().remove(fileName);
}
file.delete();
}
private static String addWithParentDirectories(RepositoryClient repositoryClient, File file) throws IOException {