From e21181a6e65a96108a85e9eecca5f04e348760a0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 08 Jan 2012 13:04:11 -0500
Subject: [PATCH] Include the username in the Gitblit repository url, if appropriate
---
src/com/gitblit/models/FederationModel.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java
index efb1b32..61c8576 100644
--- a/src/com/gitblit/models/FederationModel.java
+++ b/src/com/gitblit/models/FederationModel.java
@@ -73,6 +73,8 @@
*/
public FederationModel(String serverName) {
this.name = serverName;
+ bare = true;
+ mirror = true;
this.lastPull = new Date(0);
this.nextPull = new Date(0);
}
@@ -196,22 +198,7 @@
@Override
public int compareTo(RepositoryStatus o) {
if (status.equals(o.status)) {
- // sort root repositories first, alphabetically
- // then sort grouped repositories, alphabetically
- int s1 = name.indexOf('/');
- int s2 = o.name.indexOf('/');
- if (s1 == -1 && s2 == -1) {
- // neither grouped
- return name.compareTo(o.name);
- } else if (s1 > -1 && s2 > -1) {
- // both grouped
- return name.compareTo(o.name);
- } else if (s1 == -1) {
- return -1;
- } else if (s2 == -1) {
- return 1;
- }
- return 0;
+ return StringUtils.compareRepositoryNames(name, o.name);
}
return status.compareTo(o.status);
}
--
Gitblit v1.9.1