Tom
2014-11-12 bae957cd80e59f16fe011dda45ce2624e2ffd4d2
src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -31,10 +31,11 @@
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.GitNote;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.servlet.RawServlet;
import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.DiffUtils.DiffOutput;
import com.gitblit.utils.DiffUtils.DiffOutputType;
@@ -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()) {
@@ -81,6 +80,11 @@
            WicketUtils.newObjectParameter(repositoryName, objectId)));
      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);
      // add commit diffstat
      int insertions = 0;
@@ -108,7 +112,7 @@
            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
            item.add(new Label("noteContent", GitBlit.self().processPlainCommitMessage(repositoryName,
            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,
                  entry.content)).setEscapeModelStrings(false));
         }
      };
@@ -145,14 +149,15 @@
               hasSubmodule = submodule.hasSubmodule;
               // add relative link
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#" + entry.path));
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#n" + entry.objectId));
            } else {
               // add relative link
               item.add(new LinkPanel("pathName", "list", entry.path, "#" + entry.path));
               item.add(new LinkPanel("pathName", "list", entry.path, "#n" + entry.objectId));
            }
            // quick links
            if (entry.isSubmodule()) {
               item.add(new ExternalLink("raw", "").setEnabled(false));
               // submodule
               item.add(new ExternalLink("patch", "").setEnabled(false));
               item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
@@ -169,6 +174,9 @@
                           && !entry.changeType.equals(ChangeType.DELETE)));
               item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
               String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path);
               item.add(new ExternalLink("raw", rawUrl)
                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
@@ -193,6 +201,11 @@
   }
   @Override
   protected boolean isCommitPage() {
      return true;
   }
   @Override
   protected Class<? extends BasePage> getRepoNavPageClass() {
      return LogPage.class;
   }