Merged #88 "Image diff could display before & after images"

James Moger

2014-11-17 dbd9e1538976518e8514961f4dc7d0771eb6634b

 src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java

@@ -31,6 +31,7 @@
import org.eclipse.jgit.revwalk.RevCommit;

import com.gitblit.Constants;
import com.gitblit.Keys;
import com.gitblit.models.GitNote;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.SubmoduleModel;
@@ -59,8 +60,6 @@

      RevCommit commit = getCommit();

      final DiffOutput diff = DiffUtils.getCommitDiff(r, commit, DiffOutputType.HTML);

      List<String> parents = new ArrayList<String>();
      if (commit.getParentCount() > 0) {
         for (RevCommit parent : commit.getParents()) {
@@ -82,6 +81,14 @@

      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

      final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions);
      final ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,
            parents.isEmpty() ? null : parents.get(0), commit.getName(), imageExtensions);
      final DiffOutput diff = DiffUtils.getCommitDiff(r, commit, DiffOutputType.HTML, handler);
      if (handler.getImgDiffCount() > 0) {
         addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs
      }

      // add commit diffstat
      int insertions = 0;
      int deletions = 0;