return revision on merge

scm-core/src/main/java/sonia/scm/repository/api/MergeCommandResult.java

@@ -13,17 +13,19 @@ import static java.util.Collections.unmodifiableCollection;
  */
 public class MergeCommandResult {
   private final Collection<String> filesWithConflict;
+  private static String mergeCommitRevision;
 
-  private MergeCommandResult(Collection<String> filesWithConflict) {
+  public MergeCommandResult(Collection<String> filesWithConflict, String mergeCommitRevision) {
     this.filesWithConflict = filesWithConflict;
+    this.mergeCommitRevision = mergeCommitRevision;
   }
 
   public static MergeCommandResult success() {
-    return new MergeCommandResult(emptyList());
+    return new MergeCommandResult(emptyList(), mergeCommitRevision);
   }
 
   public static MergeCommandResult failure(Collection<String> filesWithConflict) {
-    return new MergeCommandResult(new HashSet<>(filesWithConflict));
+    return new MergeCommandResult(new HashSet<>(filesWithConflict), "");
   }
 
   /**
@@ -41,4 +43,8 @@ public class MergeCommandResult {
   public Collection<String> getFilesWithConflict() {
     return unmodifiableCollection(filesWithConflict);
   }
+
+  public String getMergeCommitRevision() {
+    return mergeCommitRevision;
+  }
 }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/Differ.java

@@ -2,6 +2,7 @@ package sonia.scm.repository.spi;
 
 import com.google.common.base.Strings;
 import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -10,6 +11,8 @@ import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.EmptyTreeIterator;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
+import sonia.scm.ContextEntry;
+import sonia.scm.NotFoundException;
 import sonia.scm.repository.GitUtil;
 import sonia.scm.util.Util;
 
@@ -38,7 +41,15 @@ final class Differ implements AutoCloseable {
     RevWalk walk = new RevWalk(repository);
 
     ObjectId revision = repository.resolve(request.getRevision());
-      RevCommit commit = walk.parseCommit(revision);
+    if (revision == null) {
+      throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("revision not found", request.getRevision()));
+    }
+    RevCommit commit;
+    try {
+      commit = walk.parseCommit(revision);
+    } catch (MissingObjectException ex) {
+      throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("revision not found", request.getRevision()));
+    }
 
     walk.markStart(commit);
     commit = walk.next();
@@ -46,34 +57,25 @@ final class Differ implements AutoCloseable {
     treeWalk.reset();
     treeWalk.setRecursive(true);
 
-      if (Util.isNotEmpty(request.getPath()))
-      {
+    if (Util.isNotEmpty(request.getPath())) {
       treeWalk.setFilter(PathFilter.create(request.getPath()));
     }
 
 
-      if (!Strings.isNullOrEmpty(request.getAncestorChangeset()))
-      {
+    if (!Strings.isNullOrEmpty(request.getAncestorChangeset())) {
       ObjectId otherRevision = repository.resolve(request.getAncestorChangeset());
       ObjectId ancestorId = GitUtil.computeCommonAncestor(repository, revision, otherRevision);
       RevTree tree = walk.parseCommit(ancestorId).getTree();
       treeWalk.addTree(tree);
-      }
-      else if (commit.getParentCount() > 0)
-      {
+    } else if (commit.getParentCount() > 0) {
       RevTree tree = commit.getParent(0).getTree();
 
-        if (tree != null)
-        {
+      if (tree != null) {
         treeWalk.addTree(tree);
-        }
-        else
-        {
+      } else {
         treeWalk.addTree(new EmptyTreeIterator());
       }
-      }
-      else
-      {
+    } else {
       treeWalk.addTree(new EmptyTreeIterator());
     }
 

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java

@@ -7,6 +7,7 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.MergeCommandResult;
 
 import java.io.IOException;
+import java.util.Collections;
 
 class GitFastForwardIfPossible extends GitMergeStrategy {
 
@@ -22,7 +23,7 @@ class GitFastForwardIfPossible extends GitMergeStrategy {
     MergeResult fastForwardResult = mergeWithFastForwardOnlyMode();
     if (fastForwardResult.getMergeStatus().isSuccessful()) {
       push();
-      return MergeCommandResult.success();
+      return new MergeCommandResult(Collections.emptyList(), "");
     } else {
       return fallbackMerge.run();
     }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java

@@ -3,10 +3,17 @@ package sonia.scm.repository.spi;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.MergeCommand;
 import org.eclipse.jgit.api.MergeResult;
+import org.eclipse.jgit.revwalk.RevCommit;
+import sonia.scm.ContextEntry;
+import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.MergeCommandResult;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.Optional;
+
+import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit;
 
 class GitMergeCommit extends GitMergeStrategy {
 
@@ -21,11 +28,12 @@ class GitMergeCommit extends GitMergeStrategy {
     MergeResult result = doMergeInClone(mergeCommand);
 
     if (result.getMergeStatus().isSuccessful()) {
-      doCommit();
+      Optional<RevCommit> revCommit = doCommit();
       push();
-      return MergeCommandResult.success();
+      return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
     } else {
       return analyseFailure(result);
     }
   }
+
 }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java

@@ -6,6 +6,7 @@ import org.eclipse.jgit.api.MergeCommand;
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.InternalRepositoryException;
@@ -14,6 +15,7 @@ import sonia.scm.repository.api.MergeCommandResult;
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.Optional;
 
 abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeCommandResult> {
 
@@ -52,9 +54,9 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
     return result;
   }
 
-  void doCommit() {
+  Optional<RevCommit> doCommit() {
     logger.debug("merged branch {} into {}", toMerge, target);
-    doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author);
+    return doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author);
   }
 
   private String determineMessageTemplate() {

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java

@@ -2,11 +2,16 @@ package sonia.scm.repository.spi;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.MergeResult;
+import org.eclipse.jgit.revwalk.RevCommit;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.MergeCommandResult;
 import org.eclipse.jgit.api.MergeCommand;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.Optional;
+
+import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit;
 
 class GitMergeWithSquash extends GitMergeStrategy {
 
@@ -21,9 +26,9 @@ class GitMergeWithSquash extends GitMergeStrategy {
     MergeResult result = doMergeInClone(mergeCommand);
 
     if (result.getMergeStatus().isSuccessful()) {
-      doCommit();
+      Optional<RevCommit> revCommit = doCommit();
       push();
-      return MergeCommandResult.success();
+      return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
     } else {
       return analyseFailure(result);
     }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java

@@ -0,0 +1,17 @@
+package sonia.scm.repository.spi;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+import sonia.scm.ContextEntry;
+import sonia.scm.repository.InternalRepositoryException;
+
+import java.util.Optional;
+
+public class GitMerger {
+
+  static String evaluateRevisionFromMergeCommit(Optional<RevCommit> revCommit) {
+    if (revCommit.isPresent()) {
+      return revCommit.get().toString().split(" ")[1];
+    }
+    throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity(GitMergeCommit.class, "merge commit failed"), "could not create commit on merge");
+  }
+}

scm-ui/ui-components/src/repos/LoadingDiff.tsx

@@ -7,8 +7,11 @@ import parser from "gitdiff-parser";
 import Loading from "../Loading";
 import Diff from "./Diff";
 import { DiffObjectProps, File } from "./DiffTypes";
+import { NotFoundError } from "../errors";
+import { Notification } from "../index";
+import {withTranslation, WithTranslation} from "react-i18next";
 
-type Props = DiffObjectProps & {
+type Props = WithTranslation & DiffObjectProps & {
   url: string;
   defaultCollapse?: boolean;
 };
@@ -43,7 +46,7 @@ class LoadingDiff extends React.Component<Props, State> {
 
   fetchDiff = () => {
     const { url } = this.props;
-    this.setState({loading: true});
+    this.setState({ loading: true });
     apiClient
       .get(url)
       .then(response => response.text())
@@ -66,6 +69,9 @@ class LoadingDiff extends React.Component<Props, State> {
   render() {
     const { diff, loading, error } = this.state;
     if (error) {
+      if (error instanceof NotFoundError) {
+        return <Notification type="info">{this.props.t("changesets.noChangesets")}</Notification>;
+      }
       return <ErrorNotification error={error} />;
     } else if (loading) {
       return <Loading />;
@@ -77,4 +83,4 @@ class LoadingDiff extends React.Component<Props, State> {
   }
 }
 
-export default LoadingDiff;
+export default withTranslation("repos")(LoadingDiff);

scm-ui/ui-components/src/repos/changesets/ChangesetDiff.tsx

@@ -28,7 +28,7 @@ class ChangesetDiff extends React.Component<Props> {
       return <Notification type="danger">{t("changeset.diffNotSupported")}</Notification>;
     } else {
       const url = this.createUrl(changeset);
-      return <LoadingDiff url={url} defaultCollapse={defaultCollapse} />;
+      return <LoadingDiff url={url} defaultCollapse={defaultCollapse} sideBySide={false}/>;
     }
   }
 }

scm-ui/ui-webapp/public/locales/de/repos.json

@@ -72,7 +72,7 @@
   "changesets": {
     "errorTitle": "Fehler",
     "errorSubtitle": "Changesets konnten nicht abgerufen werden",
-    "noChangesets": "Keine Changesets in diesem Branch gefunden.",
+    "noChangesets": "Keine Changesets in diesem Branch gefunden. Die Commits könnten gelöscht wurden sein.",
     "branchSelectorLabel": "Branches",
     "collapseDiffs": "Auf-/Zuklappen"
   },

scm-ui/ui-webapp/public/locales/en/repos.json

@@ -72,7 +72,7 @@
   "changesets": {
     "errorTitle": "Error",
     "errorSubtitle": "Could not fetch changesets",
-    "noChangesets": "No changesets found for this branch.",
+    "noChangesets": "No changesets found for this branch. The commits could have been removed.",
     "branchSelectorLabel": "Branches",
     "collapseDiffs": "Collapse"
   },