Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-09 00:27:27 +02:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-12 08:51:28 +01:00
parent 6b9aabd3ff f0f134daeb
commit d8d7d993e3
15 changed files with 282 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
View File

@@ -1,12 +0,0 @@
package sonia.scm.api.v2.resources;
import lombok.Getter;
import lombok.Setter;
import java.util.Collection;
@Getter
@Setter
public class MergeResultDto {
private Collection<String> filesWithConflict;
}

9
scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
View File

@@ -1,9 +0,0 @@
package sonia.scm.api.v2.resources;
import org.mapstruct.Mapper;
import sonia.scm.repository.api.MergeCommandResult;
@Mapper
public interface MergeResultToDtoMapper {
MergeResultDto map(MergeCommandResult result);
}

4
scm-core/src/main/java/sonia/scm/repository/api/BranchCommandBuilder.java
View File

@@ -68,6 +68,10 @@ public final class BranchCommandBuilder {
return command.branch(request);
}
public void delete(String branchName) {
command.deleteOrClose(branchName);
}
private BranchCommand command;
private BranchRequest request = new BranchRequest();
}

2
scm-core/src/main/java/sonia/scm/repository/spi/BranchCommand.java
View File

@@ -41,4 +41,6 @@ import sonia.scm.repository.api.BranchRequest;
*/
public interface BranchCommand {
Branch branch(BranchRequest name);
void deleteOrClose(String branchName);
}

19
scm-core/src/main/java/sonia/scm/repository/spi/CannotDeleteDefaultBranchException.java Normal file
View File

@@ -0,0 +1,19 @@
package sonia.scm.repository.spi;
import sonia.scm.ContextEntry;
import sonia.scm.ExceptionWithContext;
import sonia.scm.repository.Repository;
public class CannotDeleteDefaultBranchException extends ExceptionWithContext {
public static final String CODE = "78RhWxTIw1";
public CannotDeleteDefaultBranchException(Repository repository, String branchName) {
super(ContextEntry.ContextBuilder.entity("Branch", branchName).in(repository).build(), "default branch cannot be deleted");
}
@Override
public String getCode() {
return CODE;
}
}