Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

James Moger

2014-11-04 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0

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

@@ -31,21 +31,25 @@
import org.eclipse.jgit.revwalk.RevCommit;

import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel.PathChangeModel;
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;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.CacheControl;
import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.CommitHeaderPanel;
import com.gitblit.wicket.panels.CommitLegendPanel;
import com.gitblit.wicket.panels.DiffStatPanel;
import com.gitblit.wicket.panels.GravatarImage;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.RefsPanel;

@CacheControl(LastModified.BOOT)
public class CommitDiffPage extends RepositoryPage {

   public CommitDiffPage(PageParameters params) {
@@ -53,12 +57,9 @@

      Repository r = getRepository();

      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,
            DiffOutputType.GITBLIT.name()));

      RevCommit commit = getCommit();

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

      List<String> parents = new ArrayList<String>();
      if (commit.getParentCount() > 0) {
@@ -81,23 +82,53 @@

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

      addFullText("fullMessage", commit.getFullMessage(), true);
      // add commit diffstat
      int insertions = 0;
      int deletions = 0;
      for (PathChangeModel pcm : diff.stat.paths) {
         insertions += pcm.insertions;
         deletions += pcm.deletions;
      }
      add(new DiffStatPanel("diffStat", insertions, deletions));

      addFullText("fullMessage", commit.getFullMessage());

      // git notes
      List<GitNote> notes = JGitUtils.getNotesOnCommit(r, commit);
      ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);
      DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {
         private static final long serialVersionUID = 1L;

         @Override
         public void populateItem(final Item<GitNote> item) {
            GitNote entry = item.getModelObject();
            item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));
            item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),
                  Constants.SearchType.AUTHOR));
            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,
                  entry.content)).setEscapeModelStrings(false));
         }
      };
      add(notesView.setVisible(notes.size() > 0));

      // changed paths list
      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);

      add(new CommitLegendPanel("commitLegend", paths));
      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);
      add(new CommitLegendPanel("commitLegend", diff.stat.paths));
      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(diff.stat.paths);
      DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {
         private static final long serialVersionUID = 1L;
         int counter;

         @Override
         public void populateItem(final Item<PathChangeModel> item) {
            final PathChangeModel entry = item.getModelObject();
            Label changeType = new Label("changeType", "");
            WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);
            setChangeTypeTooltip(changeType, entry.changeType);
            item.add(changeType);
            item.add(new DiffStatPanel("diffStat", entry.insertions, entry.deletions, true));

            boolean hasSubmodule = false;
            String submodulePath = null;
@@ -122,6 +153,7 @@

            // 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
@@ -139,6 +171,9 @@
               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))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)
@@ -147,20 +182,25 @@
                     .newPathParameter(repositoryName, entry.commitId, entry.path))
                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
            }
				

            WicketUtils.setAlternatingBackground(item, counter);
            counter++;
         }
      };
      add(pathsView);
      add(new Label("diffText", diff).setEscapeModelStrings(false));
      add(new Label("diffText", diff.content).setEscapeModelStrings(false));
   }

   @Override
   protected String getPageName() {
      return getString("gb.commitdiff");
   }
	

   @Override
   protected boolean isCommitPage() {
      return true;
   }

   @Override
   protected Class<? extends BasePage> getRepoNavPageClass() {
      return LogPage.class;