From 87c3d714693b216cee9c31cdc5170715c56f541d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 06 Apr 2011 09:27:14 -0400
Subject: [PATCH] Mostly working Diff presentation.
---
src/com/gitblit/wicket/pages/SummaryPage.java | 158 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 134 insertions(+), 24 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 84e78b4..b7be71a 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -1,11 +1,15 @@
package com.gitblit.wicket.pages;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -13,24 +17,46 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.codecommit.wicket.AbstractChartData;
+import com.codecommit.wicket.Chart;
+import com.codecommit.wicket.ChartAxis;
+import com.codecommit.wicket.ChartAxisType;
+import com.codecommit.wicket.ChartProvider;
+import com.codecommit.wicket.ChartType;
+import com.codecommit.wicket.IChartData;
+import com.gitblit.StoredSettings;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.models.RefModel;
-import com.gitblit.wicket.panels.HeadLinksPanel;
+import com.gitblit.wicket.panels.AnnotatedTagLinksPanel;
+import com.gitblit.wicket.panels.BranchLinksPanel;
import com.gitblit.wicket.panels.RefsPanel;
import com.gitblit.wicket.panels.ShortLogLinksPanel;
import com.gitblit.wicket.panels.TagLinksPanel;
-
public class SummaryPage extends RepositoryPage {
public SummaryPage(PageParameters params) {
super(params, "summary");
+
+ int numCommitsDef = 20;
+ int numRefsDef = 5;
+
+ int numberCommits = StoredSettings.getInteger("summaryCommitCount", numCommitsDef);
+ if (numberCommits <= 0) {
+ numberCommits = numCommitsDef;
+ }
+ int numberRefs = StoredSettings.getInteger("summaryRefsCount", numRefsDef);
+ if (numberRefs <= 0) {
+ numberRefs = numRefsDef;
+ }
+
Repository r = getRepository();
final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);
@@ -45,12 +71,10 @@
add(new Label("repositoryLastChange", lastchange));
add(new Label("repositoryCloneUrl", cloneurl));
- int summaryCount = 16;
-
// shortlog
add(new LinkPanel("shortlog", "title", "shortlog", ShortLogPage.class, newRepositoryParameter()));
- List<RevCommit> commits = JGitUtils.getRevLog(r, summaryCount);
+ List<RevCommit> commits = JGitUtils.getRevLog(r, numberCommits);
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
DataView<RevCommit> shortlogView = new DataView<RevCommit>("commit", dp) {
private static final long serialVersionUID = 1L;
@@ -82,10 +106,14 @@
}
};
add(shortlogView);
- add(new LinkPanel("shortlogMore", "link", "...", ShortLogPage.class, newRepositoryParameter()));
+ if (commits.size() < numberCommits) {
+ add(new Label("shortlogMore", "").setVisible(false));
+ } else {
+ add(new LinkPanel("shortlogMore", "link", "more...", ShortLogPage.class, newRepositoryParameter()));
+ }
// tags
- List<RefModel> tags = JGitUtils.getTags(r, summaryCount);
+ List<RefModel> tags = JGitUtils.getTags(r, numberRefs);
add(new LinkPanel("tags", "title", "tags", TagsPage.class, newRepositoryParameter()));
ListDataProvider<RefModel> tagsDp = new ListDataProvider<RefModel>(tags);
@@ -100,45 +128,66 @@
item.add(new LinkPanel("tagName", "list name", entry.getDisplayName(), CommitPage.class, newCommitParameter(entry.getCommitId().getName())));
- if (entry.getCommitId().equals(entry.getObjectId())) {
- // lightweight tag on commit object
- item.add(new Label("tagDescription", ""));
- } else {
- // tag object
+ if (entry.isAnnotatedTag()) {
+ // annotated tag
item.add(new LinkPanel("tagDescription", "list subject", entry.getShortLog(), TagPage.class, newCommitParameter(entry.getObjectId().getName())));
+ item.add(new AnnotatedTagLinksPanel("tagLinks", repositoryName, entry));
+ } else {
+ // simple tag on commit object
+ item.add(new Label("tagDescription", ""));
+ item.add(new TagLinksPanel("tagLinks", repositoryName, entry));
}
-
- item.add(new TagLinksPanel("tagLinks", repositoryName, entry));
setAlternatingBackground(item, counter);
counter++;
}
};
add(tagView);
- add(new LinkPanel("tagsMore", "link", "...", TagsPage.class, newRepositoryParameter()));
- // heads
- List<RefModel> heads = JGitUtils.getHeads(r, summaryCount);
- add(new LinkPanel("heads", "title", "heads", HeadsPage.class, newRepositoryParameter()));
+ if (tags.size() < numberRefs) {
+ add(new Label("allTags", "").setVisible(false));
+ } else {
+ add(new LinkPanel("allTags", "link", "all tags...", TagsPage.class, newRepositoryParameter()));
+ }
- ListDataProvider<RefModel> headsDp = new ListDataProvider<RefModel>(heads);
- DataView<RefModel> headsView = new DataView<RefModel>("head", headsDp) {
+ // branches
+ List<RefModel> branches = new ArrayList<RefModel>();
+ branches.addAll(JGitUtils.getLocalBranches(r, numberRefs));
+ branches.addAll(JGitUtils.getRemoteBranches(r, numberRefs));
+ Collections.sort(branches);
+ Collections.reverse(branches);
+ if (numberRefs > 0 && branches.size() > numberRefs) {
+ branches = new ArrayList<RefModel>(branches.subList(0, numberRefs));
+ }
+
+ add(new LinkPanel("branches", "title", "branches", BranchesPage.class, newRepositoryParameter()));
+
+ ListDataProvider<RefModel> branchesDp = new ListDataProvider<RefModel>(branches);
+ DataView<RefModel> branchesView = new DataView<RefModel>("branch", branchesDp) {
private static final long serialVersionUID = 1L;
int counter = 0;
public void populateItem(final Item<RefModel> item) {
final RefModel entry = item.getModelObject();
- item.add(createDateLabel("headDate", entry.getDate()));
+ item.add(createDateLabel("branchDate", entry.getDate()));
- item.add(new LinkPanel("headName", "list name", entry.getDisplayName(), ShortLogPage.class, newCommitParameter(entry.getName())));
+ item.add(new LinkPanel("branchName", "list name", trimString(entry.getDisplayName(), 28), ShortLogPage.class, newCommitParameter(entry.getName())));
- item.add(new HeadLinksPanel("headLinks", repositoryName, entry));
+ item.add(new BranchLinksPanel("branchLinks", repositoryName, entry));
setAlternatingBackground(item, counter);
counter++;
}
};
- add(headsView);
+ add(branchesView);
+ if (branches.size() < numberRefs) {
+ add(new Label("allBranches", "").setVisible(false));
+ } else {
+ add(new LinkPanel("allBranches", "link", "all branches...", BranchesPage.class, newRepositoryParameter()));
+ }
+
+ // Display an activity line graph
+ insertActivityGraph(r);
// close the repository
r.close();
@@ -146,4 +195,65 @@
// footer
addFooter();
}
+
+ private void insertActivityGraph(Repository r) {
+ if (StoredSettings.getBoolean("generateActivityGraph", true)) {
+ List<Metric> dates = JGitUtils.getDateMetrics(r);
+ IChartData data = getChartData(dates);
+
+ ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);
+ ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
+ dateAxis.setLabels(new String[] { dates.get(0).name, dates.get(dates.size() / 2).name, dates.get(dates.size() - 1).name });
+ provider.addAxis(dateAxis);
+
+ ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
+ commitAxis.setLabels(new String[] { "", String.valueOf((int) maxValue(dates)) });
+ provider.addAxis(commitAxis);
+
+ add(new Chart("commitsChart", provider));
+ } else {
+ add(new ContextImage("commitsChart", "blank.png"));
+ }
+ }
+
+ protected IChartData getChartData(List<Metric> results) {
+ final double[] counts = new double[results.size()];
+ int i = 0;
+ double max = 0;
+ for (Metric m : results) {
+ counts[i++] = m.count;
+ max = Math.max(max, m.count);
+ }
+ final double dmax = max;
+ IChartData data = new AbstractChartData() {
+ private static final long serialVersionUID = 1L;
+
+ public double[][] getData() {
+ return new double[][] { counts };
+ }
+
+ public double getMax() {
+ return dmax;
+ }
+ };
+ return data;
+ }
+
+ protected String[] getNames(List<Metric> results) {
+ String[] names = new String[results.size()];
+ for (int i = 0; i < results.size(); i++) {
+ names[i] = results.get(i).name;
+ }
+ return names;
+ }
+
+ protected double maxValue(List<Metric> metrics) {
+ double max = Double.MIN_VALUE;
+ for (Metric m : metrics) {
+ if (m.count > max) {
+ max = m.count;
+ }
+ }
+ return max;
+ }
}
--
Gitblit v1.9.1