Selectable diff presentation: gitblit, gitweb, or plain.

James Moger

2011-04-20 3df3496185d229e6f1cdeb6f182f7933884ca29c

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

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



import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.models.PathModel.PathChangeModel;



public class CommitPage extends RepositoryPage {



@@ -48,10 +49,12 @@


      addRefs(r, c);



      add(new Label("commitAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));

      // author

      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), SearchType.AUTHOR));

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



      add(new Label("commitCommitter", JGitUtils.getDisplayName(c.getCommitterIdent())));

      // committer

      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER));		
      add(WicketUtils.createTimestampLabel("commitCommitterDate", c.getCommitterIdent().getWhen(), getTimeZone()));



      add(new Label("commitId", c.getName()));

@@ -75,14 +78,18 @@
      addFullText("fullMessage", c.getFullMessage(), true);



      // changed paths list

      List<PathModel> paths = JGitUtils.getFilesInCommit(r, c);

      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);

      DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {

      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);

      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);

      DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;



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

            final PathModel entry = item.getModelObject();

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

            if (entry.isTree()) {

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, newPathParameter(entry.path)));

            } else {

@@ -92,7 +99,7 @@
            item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

@@ -100,7 +107,7 @@
      };

      add(pathsView);

   }



	
   @Override

   protected String getPageName() {

      return getString("gb.commit");