Merge branch 'ticket/245' into develop

James Moger

2015-03-07 d40a44c8c8df8f6bd81c93e72314224f85656f18

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

@@ -37,10 +37,12 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;

import com.gitblit.Keys;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
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;
@@ -110,7 +112,14 @@
         fromCommitId.setObject(startId);
         toCommitId.setObject(endId);

         final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, DiffOutputType.HTML);
         final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions);
         final ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName,
               fromCommit.getName(), toCommit.getName(), imageExtensions);

         final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, DiffOutputType.HTML, handler);
         if (handler.getImgDiffCount() > 0) {
            addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs
         }

         // add compare diffstat
         int insertions = 0;
@@ -159,10 +168,10 @@
                  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
@@ -171,6 +180,7 @@
                  item.add(new ExternalLink("patch", "").setEnabled(false));
                  item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
                        .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
                  item.add(new ExternalLink("raw", "").setEnabled(false));
                  item.add(new ExternalLink("blame", "").setEnabled(false));
                  item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
@@ -183,8 +193,8 @@
                  item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
                        .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
                  item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
                  String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, endId, 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, endId, entry.path))