From cdbbda53e245621065bf142e48737faf88a5fee7 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 17 Mar 2012 11:00:17 -0400 Subject: [PATCH] Incremental commit indexing was missing branch field --- src/com/gitblit/wicket/panels/HistoryPanel.java | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java index 180a248..23eb2b3 100644 --- a/src/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/com/gitblit/wicket/panels/HistoryPanel.java @@ -30,14 +30,18 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +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.GitBlitWebApp; +import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.pages.BasePage; import com.gitblit.wicket.pages.BlobDiffPage; import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.CommitDiffPage; @@ -73,7 +77,7 @@ } 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); List<RevCommit> commits; if (pageResults) { // Paging result set @@ -93,6 +97,9 @@ // breadcrumbs add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId)); + GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication(); + final Class<? extends BasePage> searchPageClass = app.getSearchPageClass(); + ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits); DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) { private static final long serialVersionUID = 1L; @@ -107,9 +114,9 @@ // 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); + searchPageClass, WicketUtils.newSearchParameter(repositoryName, objectId, + author, Constants.SearchType.AUTHOR)); + setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR); item.add(authorLink); // merge icon @@ -120,7 +127,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())); -- Gitblit v1.9.1