Image diffs

Tom

2014-11-11 7dd99fe7474604f314c01bcd4123eb7cbacfb583

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

@@ -15,12 +15,15 @@
 */

package com.gitblit.wicket.pages;



import java.util.List;



import org.apache.wicket.PageParameters;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Keys;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

@@ -43,16 +46,23 @@
      Repository r = getRepository();

      RevCommit commit = getCommit();



      final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions);



      String diff;

      if (StringUtils.isEmpty(baseObjectId)) {

         // use first parent

         diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML).content;

         RevCommit parent = commit.getParentCount() == 0 ? null : commit.getParent(0);

         ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,

               parent.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML, handler).content;

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

      } else {

         // base commit specified

         RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML).content;

         ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,

               baseCommit.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML, handler).content;

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

               WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,

                     blobPath)));