diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-14 12:28:24 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-04-10 18:58:08 -0400 |
| commit | 030fd739b3151162c4e84e9c63ce57532af45219 (patch) | |
| tree | e575b57eec5191307395bd9a62d7adcf929facaf /src/main/java/com/gitblit | |
| parent | 8982e6e0738c6991b9a4b864423bd4f75383c7f4 (diff) | |
| download | gitblit-030fd739b3151162c4e84e9c63ce57532af45219.tar.gz gitblit-030fd739b3151162c4e84e9c63ce57532af45219.zip | |
Support hidden commands and hide create-repo and review
Diffstat (limited to 'src/main/java/com/gitblit')
4 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/com/gitblit/transport/ssh/CommandMetaData.java b/src/main/java/com/gitblit/transport/ssh/CommandMetaData.java index 52231b3b..2dd189c1 100644 --- a/src/main/java/com/gitblit/transport/ssh/CommandMetaData.java +++ b/src/main/java/com/gitblit/transport/ssh/CommandMetaData.java @@ -28,4 +28,5 @@ import java.lang.annotation.Target; public @interface CommandMetaData { String name(); String description() default ""; +boolean hidden() default false; } diff --git a/src/main/java/com/gitblit/transport/ssh/commands/CreateRepository.java b/src/main/java/com/gitblit/transport/ssh/commands/CreateRepository.java index 802905f2..f422b18b 100644 --- a/src/main/java/com/gitblit/transport/ssh/commands/CreateRepository.java +++ b/src/main/java/com/gitblit/transport/ssh/commands/CreateRepository.java @@ -20,7 +20,7 @@ import org.kohsuke.args4j.Option; import com.gitblit.transport.ssh.CommandMetaData; -@CommandMetaData(name = "create-repository", description = "Create new GIT repository") +@CommandMetaData(name = "create-repository", description = "Create new GIT repository", hidden = true) public class CreateRepository extends SshCommand { @Option(name = "--name", aliases = {"-n"}, required = true, metaVar = "NAME", usage = "name of repository to be created") diff --git a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java index 672ecd61..83707f77 100644 --- a/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java +++ b/src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java @@ -160,9 +160,12 @@ public class DispatchCommand extends BaseCommand { String format = "%-" + maxLength + "s %s"; for (String name : Sets.newTreeSet(m.keySet())) { final Class<? extends Command> c = m.get(name); - usage.append(" "); CommandMetaData meta = c.getAnnotation(CommandMetaData.class); if (meta != null) { + if (meta.hidden()) { + continue; + } + usage.append(" "); usage.append(String.format(format, name, Strings.nullToEmpty(meta.description()))); } diff --git a/src/main/java/com/gitblit/transport/ssh/commands/ReviewCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/ReviewCommand.java index 9ce73315..b088a2e6 100644 --- a/src/main/java/com/gitblit/transport/ssh/commands/ReviewCommand.java +++ b/src/main/java/com/gitblit/transport/ssh/commands/ReviewCommand.java @@ -28,7 +28,7 @@ import com.gitblit.models.UserModel; import com.gitblit.transport.ssh.CommandMetaData; import com.gitblit.wicket.GitBlitWebSession; -@CommandMetaData(name = "review", description = "Verify, approve and/or submit one or more patch sets") +@CommandMetaData(name = "review", description = "Verify, approve and/or submit one or more patch sets", hidden = true) public class ReviewCommand extends SshCommand { private final static short REV_ID_LEN = 40; @@ -58,13 +58,14 @@ public class ReviewCommand extends SshCommand { @Override public void run() throws UnloggedFailure { UserModel user = GitBlitWebSession.get().getUser(); - for (Patchset ps : patchSets) { + // TODO ensure user has permission to score +2/-2 + for (Patchset ps : patchSets) { // review - Change change = new Change(user.username); + Change change = new Change(user.username); change.review(ps, Score.fromScore(vote), false); // TODO(davido): add patchset comment if (submitChange) { - // TODO(davido): merge (when desired and the change is mergeable) + // TODO(davido): merge (when desired and the change is mergeable) } } } |