From ab07d0d86d8b64b4f7c88b45bc81f1eec22105db Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Preserve key index when re-adding an existing key
---
src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
index 4798c6d..f2fbabb 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
@@ -22,7 +22,8 @@
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.commands.CommandMetaData;
import com.gitblit.transport.ssh.commands.DispatchCommand;
-import com.gitblit.transport.ssh.commands.ListRegexCommand;
+import com.gitblit.transport.ssh.commands.ListFilterCommand;
+import com.gitblit.transport.ssh.commands.UsageExample;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.FlipTable;
import com.gitblit.utils.FlipTable.Borders;
@@ -38,7 +39,8 @@
/* List repositories */
@CommandMetaData(name = "list", aliases = { "ls" }, description = "List repositories")
- public static class ListRepositories extends ListRegexCommand<RepositoryModel> {
+ @UsageExample(syntax = "${cmd} mirror/.* -v", description = "Verbose list of all repositories in the 'mirror' directory")
+ public static class ListRepositories extends ListFilterCommand<RepositoryModel> {
@Override
protected List<RepositoryModel> getItems() {
@@ -49,8 +51,8 @@
}
@Override
- protected boolean matches(RepositoryModel r) {
- return r.name.matches(regexFilter);
+ protected boolean matches(String filter, RepositoryModel r) {
+ return r.name.matches(filter);
}
@Override
@@ -72,7 +74,7 @@
String size = r.size;
if (!r.hasCommits) {
lm = "";
- size = "(empty)";
+ size = FlipTable.EMPTY;
}
if (verbose) {
String owners = "";
--
Gitblit v1.9.1