Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -32,10 +32,10 @@
import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

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.JGitUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.CacheControl.LastModified;

@@ -43,7 +43,8 @@
import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;

import com.gitblit.wicket.panels.CompressedDownloadsPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.DiffStatPanel;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.RefsPanel;



@@ -55,7 +56,7 @@


      Repository r = getRepository();

      RevCommit c = getCommit();

		


      List<String> parents = new ArrayList<String>();

      if (c.getParentCount() > 0) {

         for (RevCommit parent : c.getParents()) {

@@ -85,7 +86,7 @@
      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR));

      add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(),

            getTimeZone(), getTimeUtils()));

		


      // committer

      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER));

      add(WicketUtils.createTimestampLabel("commitCommitterDate",

@@ -97,7 +98,7 @@
            newCommitParameter()));

      add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));

      final String baseUrl = WicketUtils.getGitblitURL(getRequest());

		


      add(new CompressedDownloadsPanel("compressedLinks", baseUrl, repositoryName, objectId, null));



      // Parent Commits

@@ -105,6 +106,7 @@
      DataView<String> parentsView = new DataView<String>("commitParents", parentsDp) {

         private static final long serialVersionUID = 1L;



         @Override

         public void populateItem(final Item<String> item) {

            String entry = item.getModelObject();

            item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class,

@@ -117,7 +119,7 @@
      };

      add(parentsView);



      addFullText("fullMessage", c.getFullMessage(), true);

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



      // git notes

      List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);

@@ -125,35 +127,48 @@
      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(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef

                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));

            item.add(new Label("noteContent", GitBlit.self().processCommitMessage(

                  repositoryName, entry.content)).setEscapeModelStrings(false));

            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, c);



      // add commit diffstat

      int insertions = 0;

      int deletions = 0;

      for (PathChangeModel pcm : paths) {

         insertions += pcm.insertions;

         deletions += pcm.deletions;

      }

      add(new DiffStatPanel("diffStat", insertions, deletions));



      add(new CommitLegendPanel("commitLegend", paths));

      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(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;

            if (entry.isTree()) {

@@ -167,7 +182,7 @@
               SubmoduleModel submodule = getSubmodule(entry.path);

               submodulePath = submodule.gitblitPath;

               hasSubmodule = submodule.hasSubmodule;

					


               item.add(new LinkPanel("pathName", "list", entry.path + " @ " +

                     getShortObjectId(submoduleId), TreePage.class,

                     WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));

@@ -183,10 +198,13 @@
                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, path)));

            }

				




            // quick links

            if (entry.isSubmodule()) {

               // submodule					
               item.add(new ExternalLink("raw", "").setEnabled(false));



               // submodule

               item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.ADD)));

@@ -204,6 +222,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))

@@ -225,7 +246,12 @@
   protected String getPageName() {

      return getString("gb.commit");

   }

	


   @Override

   protected boolean isCommitPage() {

      return true;

   }



   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return LogPage.class;