From ada1a326fa36ceb46922006f87d4cff0c49e071f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 12 Jun 2013 17:19:15 -0400
Subject: [PATCH] Fixed double enumeration of repositories on dashboard page
---
src/main/java/com/gitblit/wicket/panels/PushesPanel.java | 230 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 174 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
index 22addfd..5c473f7 100644
--- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
@@ -15,9 +15,14 @@
*/
package com.gitblit.wicket.panels;
+import java.text.DateFormat;
import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
+import java.util.TimeZone;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -29,11 +34,13 @@
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.DailyLogEntry;
import com.gitblit.models.PushLogEntry;
import com.gitblit.models.RepositoryCommit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.PushLogUtils;
import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.ComparePage;
@@ -51,7 +58,7 @@
private boolean hasMore;
- public PushesPanel(String wicketId, final RepositoryModel model, Repository r, int limit, int pageOffset) {
+ public PushesPanel(String wicketId, final RepositoryModel model, Repository r, int limit, int pageOffset, boolean showRepo) {
super(wicketId);
boolean pageResults = limit <= 0;
int pushesPerPage = GitBlit.getInteger(Keys.web.pushesPerPage, 10);
@@ -59,20 +66,59 @@
pushesPerPage = 10;
}
- final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
List<PushLogEntry> pushes;
if (pageResults) {
pushes = PushLogUtils.getPushLogByRef(model.name, r, pageOffset * pushesPerPage, pushesPerPage);
} else {
pushes = PushLogUtils.getPushLogByRef(model.name, r, limit);
}
-
+
// inaccurate way to determine if there are more commits.
// works unless commits.size() represents the exact end.
hasMore = pushes.size() >= pushesPerPage;
-
hasPushes = pushes.size() > 0;
+
+ setup(pushes, showRepo);
+
+ // determine to show pager, more, or neither
+ if (limit <= 0) {
+ // no display limit
+ add(new Label("morePushes").setVisible(false));
+ } else {
+ if (pageResults) {
+ // paging
+ add(new Label("morePushes").setVisible(false));
+ } else {
+ // more
+ if (pushes.size() == limit) {
+ // show more
+ add(new LinkPanel("morePushes", "link", new StringResourceModel("gb.morePushes",
+ this, null), PushesPage.class,
+ WicketUtils.newRepositoryParameter(model.name)));
+ } else {
+ // no more
+ add(new Label("morePushes").setVisible(false));
+ }
+ }
+ }
+ }
+
+ public PushesPanel(String wicketId, List<PushLogEntry> pushes) {
+ super(wicketId);
+ hasPushes = pushes.size() > 0;
+ setup(pushes, true);
+ add(new Label("morePushes").setVisible(false));
+ }
+
+ protected void setup(List<PushLogEntry> pushes, final boolean showRepo) {
+ final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
+ String dateFormat = GitBlit.getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");
+ final TimeZone timezone = getTimeZone();
+ final DateFormat df = new SimpleDateFormat(dateFormat);
+ df.setTimeZone(timezone);
+ final Calendar cal = Calendar.getInstance(timezone);
+
ListDataProvider<PushLogEntry> dp = new ListDataProvider<PushLogEntry>(pushes);
DataView<PushLogEntry> pushView = new DataView<PushLogEntry>("push", dp) {
private static final long serialVersionUID = 1L;
@@ -82,46 +128,109 @@
String fullRefName = push.getChangedRefs().get(0);
String shortRefName = fullRefName;
boolean isTag = false;
- if (shortRefName.startsWith(org.eclipse.jgit.lib.Constants.R_HEADS)) {
- shortRefName = shortRefName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length());
- } else if (shortRefName.startsWith(org.eclipse.jgit.lib.Constants.R_TAGS)) {
- shortRefName = shortRefName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length());
+ boolean isPull = false;
+ if (shortRefName.startsWith(Constants.R_HEADS)) {
+ shortRefName = shortRefName.substring(Constants.R_HEADS.length());
+ } else if (shortRefName.startsWith(Constants.R_TAGS)) {
+ shortRefName = shortRefName.substring(Constants.R_TAGS.length());
isTag = true;
+ } else if (shortRefName.startsWith(Constants.R_PULL)) {
+ shortRefName = "#" + shortRefName.substring(Constants.R_PULL.length());
+ if (shortRefName.endsWith("/head")) {
+ // strip pull request head from name
+ shortRefName = shortRefName.substring(0, shortRefName.length() - "/head".length());
+ }
+ isPull = true;
}
+ boolean isDigest = push instanceof DailyLogEntry;
- pushItem.add(WicketUtils.createDateLabel("whenPushed", push.date, getTimeZone(), getTimeUtils()));
+ String fuzzydate;
+ TimeUtils tu = getTimeUtils();
+ Date pushDate = push.date;
+ if (TimeUtils.isToday(pushDate, timezone)) {
+ fuzzydate = tu.today();
+ } else if (TimeUtils.isYesterday(pushDate, timezone)) {
+ fuzzydate = tu.yesterday();
+ } else {
+ // calculate a fuzzy time ago date
+ cal.setTime(pushDate);
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ pushDate = cal.getTime();
+ fuzzydate = getTimeUtils().timeAgo(pushDate);
+ }
+ pushItem.add(new Label("whenPushed", fuzzydate + ", " + df.format(pushDate)));
+
Label pushIcon = new Label("pushIcon");
+ if (showRepo) {
+ // if we are showing the repo, we are showing multiple
+ // repos. use the repository hash color to differentiate
+ // the icon.
+ String color = StringUtils.getColor(StringUtils.stripDotGit(push.repository));
+ WicketUtils.setCssStyle(pushIcon, "color: " + color);
+ }
if (isTag) {
WicketUtils.setCssClass(pushIcon, "iconic-tag");
- } else {
+ } else if (isPull) {
+ WicketUtils.setCssClass(pushIcon, "iconic-share");
+ } else if (isDigest) {
WicketUtils.setCssClass(pushIcon, "iconic-loop");
+ } else {
+ WicketUtils.setCssClass(pushIcon, "iconic-upload");
}
pushItem.add(pushIcon);
- if (push.user.username.equals(push.user.emailAddress) && push.user.emailAddress.indexOf('@') > -1) {
- // username is an email address - 1.2.1 push log bug
- pushItem.add(new Label("whoPushed", push.user.getDisplayName()));
- } else {
- // link to user acount page
- pushItem.add(new LinkPanel("whoPushed", null, push.user.getDisplayName(),
- UserPage.class, WicketUtils.newUsernameParameter(push.user.username)));
- }
+
+ if (isDigest && !isTag) {
+ pushItem.add(new Label("whoPushed").setVisible(false));
+ } else {
+ if (push.user.username.equals(push.user.emailAddress) && push.user.emailAddress.indexOf('@') > -1) {
+ // username is an email address - 1.2.1 push log bug
+ pushItem.add(new Label("whoPushed", push.user.getDisplayName()));
+ } else {
+ // link to user account page
+ pushItem.add(new LinkPanel("whoPushed", null, push.user.getDisplayName(),
+ UserPage.class, WicketUtils.newUsernameParameter(push.user.username)));
+ }
+ }
- String preposition = "gb.at";
+ String preposition = "gb.of";
boolean isDelete = false;
boolean isRewind = false;
String what;
+ String by = null;
switch(push.getChangeType(fullRefName)) {
case CREATE:
if (isTag) {
- what = getString("gb.pushedNewTag");
+ // new tag
+ if (isDigest) {
+ what = getString("gb.createdNewTag");
+ preposition = "gb.in";
+ } else {
+ what = getString("gb.pushedNewTag");
+ preposition = "gb.to";
+ }
+ } else if (isPull) {
+ // merged pull request
+ what = getString("gb.mergedPullRequest");
+ preposition = "gb.in";
} else {
- what = getString("gb.pushedNewBranch");
+ // new branch
+ if (isDigest) {
+ what = getString("gb.createdNewBranch");
+ preposition = "gb.in";
+ } else {
+ what = getString("gb.pushedNewBranch");
+ preposition = "gb.to";
+ }
}
- preposition = "gb.to";
break;
case DELETE:
isDelete = true;
if (isTag) {
+ what = getString("gb.deletedTag");
+ } if (isPull) {
what = getString("gb.deletedTag");
} else {
what = getString("gb.deletedBranch");
@@ -131,10 +240,21 @@
case UPDATE_NONFASTFORWARD:
isRewind = true;
default:
- what = MessageFormat.format(push.getCommitCount() > 1 ? getString("gb.pushedNCommitsTo") : getString("gb.pushedOneCommitTo") , push.getCommitCount());
+ if (isDigest) {
+ what = MessageFormat.format(push.getCommitCount() > 1 ? getString("gb.commitsTo") : getString("gb.oneCommitTo"), push.getCommitCount());
+ } else {
+ what = MessageFormat.format(push.getCommitCount() > 1 ? getString("gb.pushedNCommitsTo") : getString("gb.pushedOneCommitTo") , push.getCommitCount());
+ }
+
+ if (push.getAuthorCount() == 1) {
+ by = MessageFormat.format(getString("gb.byOneAuthor"), push.getAuthorIdent().getName());
+ } else {
+ by = MessageFormat.format(getString("gb.byNAuthors"), push.getAuthorCount());
+ }
break;
}
pushItem.add(new Label("whatPushed", what));
+ pushItem.add(new Label("byAuthors", by).setVisible(!StringUtils.isEmpty(by)));
pushItem.add(new Label("refRewind", getString("gb.rewind")).setVisible(isRewind));
@@ -144,20 +264,31 @@
} else if (isTag) {
// link to tag
pushItem.add(new LinkPanel("refPushed", null, shortRefName,
- TagPage.class, WicketUtils.newObjectParameter(model.name, fullRefName)));
+ TagPage.class, WicketUtils.newObjectParameter(push.repository, fullRefName)));
+ } else if (isPull) {
+ // link to pull request
+ pushItem.add(new LinkPanel("refPushed", null, shortRefName,
+ TagPage.class, WicketUtils.newObjectParameter(push.repository, fullRefName)));
} else {
// link to tree
pushItem.add(new LinkPanel("refPushed", null, shortRefName,
- TreePage.class, WicketUtils.newObjectParameter(model.name, fullRefName)));
+ TreePage.class, WicketUtils.newObjectParameter(push.repository, fullRefName)));
}
- // to/from/etc
- pushItem.add(new Label("repoPreposition", getString(preposition)));
-
- String repoName = StringUtils.stripDotGit(model.name);
- pushItem.add(new LinkPanel("repoPushed", null, repoName,
- SummaryPage.class, WicketUtils.newRepositoryParameter(model.name)));
+ if (showRepo) {
+ // to/from/etc
+ pushItem.add(new Label("repoPreposition", getString(preposition)));
+ String repoName = StringUtils.stripDotGit(push.repository);
+ pushItem.add(new LinkPanel("repoPushed", null, repoName,
+ SummaryPage.class, WicketUtils.newRepositoryParameter(push.repository)));
+ } else {
+ // do not display repository name if we are viewing the push
+ // log of a repository.
+ pushItem.add(new Label("repoPreposition").setVisible(false));
+ pushItem.add(new Label("repoPushed").setVisible(false));
+ }
+
int maxCommitCount = 5;
List<RepositoryCommit> commits = push.getCommits();
if (commits.size() > maxCommitCount) {
@@ -179,6 +310,8 @@
String startRangeId = push.getOldId(fullRefName);
pushItem.add(new LinkPanel("compareLink", null, compareLinkText, ComparePage.class, WicketUtils.newRangeParameter(push.repository, startRangeId, endRangeId)));
}
+
+ final boolean showSwatch = showRepo && GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);
ListDataProvider<RepositoryCommit> cdp = new ListDataProvider<RepositoryCommit>(commits);
DataView<RepositoryCommit> commitsView = new DataView<RepositoryCommit>("commit", cdp) {
@@ -208,7 +341,7 @@
}
LinkPanel shortlog = new LinkPanel("commitShortMessage", "list",
trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
- model.name, commit.getName()));
+ push.repository, commit.getName()));
if (!shortMessage.equals(trimmedMessage)) {
WicketUtils.setHtmlTooltip(shortlog, shortMessage);
}
@@ -217,39 +350,24 @@
// commit hash link
LinkPanel commitHash = new LinkPanel("hashLink", null, commit.getName().substring(0, hashLen),
CommitPage.class, WicketUtils.newObjectParameter(
- model.name, commit.getName()));
+ push.repository, commit.getName()));
WicketUtils.setCssClass(commitHash, "shortsha1");
WicketUtils.setHtmlTooltip(commitHash, commit.getName());
commitItem.add(commitHash);
+
+ if (showSwatch) {
+ // set repository color
+ String color = StringUtils.getColor(StringUtils.stripDotGit(push.repository));
+ WicketUtils.setCssStyle(commitItem, MessageFormat.format("border-left: 2px solid {0};", color));
+ }
}
};
-
+
pushItem.add(commitsView);
}
};
+
add(pushView);
-
- // determine to show pager, more, or neither
- if (limit <= 0) {
- // no display limit
- add(new Label("morePushes").setVisible(false));
- } else {
- if (pageResults) {
- // paging
- add(new Label("morePushes").setVisible(false));
- } else {
- // more
- if (pushes.size() == limit) {
- // show more
- add(new LinkPanel("morePushes", "link", new StringResourceModel("gb.morePushes",
- this, null), PushesPage.class,
- WicketUtils.newRepositoryParameter(model.name)));
- } else {
- // no more
- add(new Label("morePushes").setVisible(false));
- }
- }
- }
}
public boolean hasMore() {
--
Gitblit v1.9.1