Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-23 16:59:48 +01:00
Code Issues Packages Projects Releases Activity

Add minimal error handling

Browse Source
This commit is contained in:
René Pfeuffer
2019-03-29 13:39:55 +01:00
parent bf84037019
commit 89de300137
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBranchCommand.java
View File

@@ -69,14 +69,21 @@ public class GitBranchCommand extends AbstractGitCommand implements BranchComman
.flatMap(pushResult -> pushResult.getRemoteUpdates().stream())
.filter(remoteRefUpdate -> remoteRefUpdate.getStatus() != RemoteRefUpdate.Status.OK)
.findFirst()
.ifPresent(this::handlePushError);
.ifPresent(r -> this.handlePushError(r, request, context.getRepository()));
return Branch.normalBranch(request.getNewBranch(), GitUtil.getId(ref.getObjectId()));
} catch (GitAPIException ex) {
throw new InternalRepositoryException(repository, "could not create branch " + request.getNewBranch(), ex);
}
}
private void handlePushError(RemoteRefUpdate remoteRefUpdate) {
// TODO handle failed remote update
private void handlePushError(RemoteRefUpdate remoteRefUpdate, BranchRequest request, Repository repository) {
if (remoteRefUpdate.getStatus() != RemoteRefUpdate.Status.OK) {
// TODO handle failed remote update
throw new RuntimeException(
String.format("Could not pull new branch '%s' into central repository '%s': %s",
request.getNewBranch(),
repository.getNamespaceAndName(),
remoteRefUpdate.getMessage()));
}
}
}