Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-05 04:55:50 +01:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/push_error_handling (pull request #387)

Browse Source 
Fix error handling on git push
This commit is contained in:
Sebastian Sdorra
2020-01-15 12:40:02 +00:00
parent a2499698b3 071095b74f
commit c7320bfcf6
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
View File

@@ -45,6 +45,8 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.GitUtil;
@@ -55,6 +57,8 @@ import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.user.User;
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -72,7 +76,7 @@ import static sonia.scm.NotFoundException.notFound;
*/
class AbstractGitCommand
{
/**
* the logger for AbstractGitCommand
*/
@@ -106,7 +110,7 @@ class AbstractGitCommand
{
return context.open();
}
ObjectId getCommitOrDefault(Repository gitRepository, String requestedCommit) throws IOException {
ObjectId commit;
if ( Strings.isNullOrEmpty(requestedCommit) ) {
@@ -255,10 +259,26 @@ class AbstractGitCommand
void push() {
try {
clone.push().call();
Iterable<PushResult> pushResults = clone.push().call();
Iterator<PushResult> pushResultIterator = pushResults.iterator();
if (!pushResultIterator.hasNext()) {
throw new InternalRepositoryException(repository, "got no result from push");
}
PushResult pushResult = pushResultIterator.next();
Collection<RemoteRefUpdate> remoteUpdates = pushResult.getRemoteUpdates();
if (remoteUpdates.isEmpty()) {
throw new InternalRepositoryException(repository, "push created no update");
}
remoteUpdates
.stream()
.filter(remoteRefUpdate -> remoteRefUpdate.getStatus() != RemoteRefUpdate.Status.OK)
.findAny()
.ifPresent(remoteRefUpdate -> {
logger.info("message for failed push: {}", pushResult.getMessages());
throw new IntegrateChangesFromWorkdirException(repository, "could not push changes into central repository: " + remoteRefUpdate.getStatus());
});
} catch (GitAPIException e) {
throw new IntegrateChangesFromWorkdirException(repository,
"could not push changes into central repository", e);
throw new InternalRepositoryException(repository, "could not push changes into central repository", e);
}
logger.debug("pushed changes");
}