From 32539684194f55a76ec171852f582bdafa4c5631 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Create a Gitblit aggregate manager delegate for git upload/receive tasks
---
src/main/java/com/gitblit/wicket/panels/RefsPanel.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index e477b65..7a16f4a 100644
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -43,7 +43,7 @@
public class RefsPanel extends Panel {
private static final long serialVersionUID = 1L;
-
+
public RefsPanel(String id, final String repositoryName, RevCommit c,
Map<ObjectId, List<RefModel>> refs) {
this(id, repositoryName, refs.get(c.getId()));
@@ -65,7 +65,7 @@
boolean remote2 = o2.displayName.startsWith(Constants.R_REMOTES);
if (remote1 && remote2) {
// both are remote heads, sort by name
- return o1.displayName.compareTo(o2.displayName);
+ return o1.displayName.compareTo(o2.displayName);
}
if (remote1) {
// o1 is remote, o2 comes first
@@ -79,7 +79,7 @@
return o1.displayName.compareTo(o2.displayName);
}
});
-
+
// count remote and determine if we should insert a break
int remoteCount = 0;
for (RefModel ref : refs) {
@@ -88,12 +88,13 @@
}
}
final boolean shouldBreak = remoteCount < refs.size();
-
+
ListDataProvider<RefModel> refsDp = new ListDataProvider<RefModel>(refs);
DataView<RefModel> refsView = new DataView<RefModel>("ref", refsDp) {
private static final long serialVersionUID = 1L;
private boolean alreadyInsertedBreak = !shouldBreak;
+ @Override
public void populateItem(final Item<RefModel> item) {
RefModel entry = item.getModelObject();
String name = entry.displayName;
@@ -121,11 +122,13 @@
cssClass = "otherRef";
} else if (name.startsWith(Constants.R_PULL)) {
// Pull Request ref
- name = "pull #" + name.substring(Constants.R_PULL.length());
- if (name.endsWith("/head")) {
- // strip pull request head from name
- name = name.substring(0, name.length() - "/head".length());
- }
+ String num = name.substring(Constants.R_PULL.length());
+ if (num.endsWith("/head")) {
+ // strip pull request head from name
+ num = num.substring(0, num.length() - "/head".length());
+ }
+ name = "pr #" + num;
+ tooltip = "pull request #" + num;
cssClass = "pullRef";
} else if (name.startsWith(Constants.R_REMOTES)) {
// remote branch
--
Gitblit v1.9.1