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

Check whether directory already exists as a file

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-09-10 10:50:56 +02:00
parent 5e4496e166
commit 0ab8f52e7f
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java
View File

@@ -77,7 +77,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
@Override @Override
public void create(String toBeCreated, File file, boolean overwrite) throws IOException { public void create(String toBeCreated, File file, boolean overwrite) throws IOException {
Path targetFile = new File(workDir, toBeCreated).toPath(); Path targetFile = new File(workDir, toBeCreated).toPath();
Files.createDirectories(targetFile.getParent()); createDirectories(targetFile);
if (overwrite) { if (overwrite) {
Files.move(file.toPath(), targetFile, REPLACE_EXISTING); Files.move(file.toPath(), targetFile, REPLACE_EXISTING);
} else { } else {
@@ -97,7 +97,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
@Override @Override
public void modify(String path, File file) throws IOException { public void modify(String path, File file) throws IOException {
Path targetFile = new File(workDir, path).toPath(); Path targetFile = new File(workDir, path).toPath();
Files.createDirectories(targetFile.getParent()); createDirectories(targetFile);
if (!targetFile.toFile().exists()) { if (!targetFile.toFile().exists()) {
throw notFound(createFileContext(path)); throw notFound(createFileContext(path));
} }
@@ -124,6 +124,14 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
} }
} }
private void createDirectories(Path targetFile) throws IOException {
try {
Files.createDirectories(targetFile.getParent());
} catch (FileAlreadyExistsException e) {
throw alreadyExists(createFileContext(targetFile.toString()));
}
}
private ContextEntry.ContextBuilder createFileContext(String path) { private ContextEntry.ContextBuilder createFileContext(String path) {
ContextEntry.ContextBuilder contextBuilder = entity("file", path); ContextEntry.ContextBuilder contextBuilder = entity("file", path);
if (!StringUtils.isEmpty(request.getBranch())) { if (!StringUtils.isEmpty(request.getBranch())) {

14
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java
View File

@@ -111,6 +111,20 @@ public class GitModifyCommandTest extends AbstractGitCommandTestBase {
command.execute(request); command.execute(request);
} }
@Test(expected = AlreadyExistsException.class)
public void shouldFailIfPathAlreadyExistsAsAFile() throws IOException {
File newFile = Files.write(temporaryFolder.newFile().toPath(), "new content".getBytes()).toFile();
GitModifyCommand command = createCommand();
ModifyCommandRequest request = new ModifyCommandRequest();
request.setCommitMessage("test commit");
request.addRequest(new ModifyCommandRequest.CreateFileRequest("a.txt/newFile", newFile, false));
request.setAuthor(new Person("Dirk Gently", "dirk@holistic.det"));
command.execute(request);
}
@Test @Test
public void shouldOverwriteExistingFileIfOverwriteFlagSet() throws IOException, GitAPIException { public void shouldOverwriteExistingFileIfOverwriteFlagSet() throws IOException, GitAPIException {
File newFile = Files.write(temporaryFolder.newFile().toPath(), "new content".getBytes()).toFile(); File newFile = Files.write(temporaryFolder.newFile().toPath(), "new content".getBytes()).toFile();