Added short commit id column to log and history tables (issue 168)

James Moger

2012-11-27 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5

 src/com/gitblit/wicket/panels/HistoryPanel.java

@@ -15,6 +15,7 @@
 */

package com.gitblit.wicket.panels;



import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;

@@ -26,16 +27,20 @@
import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.apache.wicket.model.StringResourceModel;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.ObjectId;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;

import org.eclipse.jgit.treewalk.TreeWalk;

import org.eclipse.jgit.treewalk.filter.PathFilterGroup;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.PathModel;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.RefModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BlobDiffPage;

@@ -43,7 +48,7 @@
import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.HistoryPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.GitSearchPage;

import com.gitblit.wicket.pages.TreePage;



public class HistoryPanel extends BasePanel {

@@ -53,7 +58,7 @@
   private boolean hasMore;



   public HistoryPanel(String wicketId, final String repositoryName, final String objectId,

         final String path, Repository r, int limit, int pageOffset) {

         final String path, Repository r, int limit, int pageOffset, boolean showRemoteRefs) {

      super(wicketId);

      boolean pageResults = limit <= 0;

      int itemsPerPage = GitBlit.getInteger(Keys.web.itemsPerPage, 50);

@@ -71,9 +76,29 @@
            break;

         }

      }

      if (matchingPath == null) {

         // path not in commit

         // manually locate path in tree

         TreeWalk tw = new TreeWalk(r);

         tw.reset();

         tw.setRecursive(true);

         try {

            tw.addTree(commit.getTree());

            tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));

            while (tw.next()) {

               matchingPath = new PathChangeModel(tw.getPathString(), tw.getPathString(), 0, tw

                     .getRawMode(0), tw.getObjectId(0).getName(), commit.getId().getName(),

                     ChangeType.MODIFY);

            }

         } catch (Exception e) {

         } finally {

            tw.release();

         }

      }

		
      final boolean isTree = matchingPath == null ? true : matchingPath.isTree();



      final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

      final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r, showRemoteRefs);

      List<RevCommit> commits;

      if (pageResults) {

         // Paging result set

@@ -93,6 +118,7 @@
      // breadcrumbs

      add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));



      final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);

      ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);

      DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) {

         private static final long serialVersionUID = 1L;

@@ -102,16 +128,25 @@
            final RevCommit entry = item.getModelObject();

            final Date date = JGitUtils.getCommitDate(entry);



            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone()));

            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));



            // author search link

            String author = entry.getAuthorIdent().getName();

            LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author,

                  SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,

                        author, SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);

                  GitSearchPage.class,

                  WicketUtils.newSearchParameter(repositoryName, objectId,

                        author, Constants.SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);

            item.add(authorLink);



            // commit hash link

            LinkPanel commitHash = new LinkPanel("commitHash", null, entry.getName().substring(0, hashLen),

                  CommitPage.class, WicketUtils.newObjectParameter(

                        repositoryName, entry.getName()));

            WicketUtils.setCssClass(commitHash, "sha1");

            WicketUtils.setHtmlTooltip(commitHash, entry.getName());

            item.add(commitHash);

				
            // merge icon

            if (entry.getParentCount() > 1) {

               item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

@@ -120,7 +155,12 @@
            }



            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            String trimmedMessage = shortMessage;

            if (allRefs.containsKey(entry.getId())) {

               trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS);

            } else {

               trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);

            }

            LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",

                  trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(

                        repositoryName, entry.getName()));