Implemented compare page for branch/tag/manual diffs (issue-75, issue-133)

James Moger

2013-05-23 722e2325300c7e5d73a93416e28c20354556fec4

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

@@ -136,15 +136,11 @@
               submodulePath = submodule.gitblitPath;
               hasSubmodule = submodule.hasSubmodule;

               item.add(new LinkPanel("pathName", "list", entry.path + " @ " +
                     getShortObjectId(submoduleId), TreePage.class,
                     WicketUtils
                           .newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));
               // add relative link
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#" + entry.path));
            } else {
               // blob
               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,
                     WicketUtils
                           .newPathParameter(repositoryName, entry.commitId, entry.path)));
               // add relative link
               item.add(new LinkPanel("pathName", "list", entry.path, "#" + entry.path));
            }

            // quick links
@@ -155,19 +151,26 @@
                     .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
               item.add(new ExternalLink("blame", "").setEnabled(false));
               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path)));
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
            } else {
               // tree or blob
               item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path)));
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)
                           && !entry.changeType.equals(ChangeType.DELETE)));
               item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path)));
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
               item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path)));
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)
                           && !entry.changeType.equals(ChangeType.DELETE)));
               item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
            }
				
            WicketUtils.setAlternatingBackground(item, counter);
            counter++;
         }
@@ -180,6 +183,11 @@
   protected String getPageName() {
      return getString("gb.commitdiff");
   }
	
   @Override
   protected Class<? extends BasePage> getRepoNavPageClass() {
      return LogPage.class;
   }

   private RevCommit getCommit(Repository r, String rev)
   {