From 562e4e6bb49fffac66b89c79fe621644e5ae3c33 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 25 Feb 2014 08:04:31 +0100 Subject: [PATCH] allow retrieving repositories by using type/name instead of repository id --- .../scm/cli/cmd/GetRepositorySubCommand.java | 19 +++++++++++++++++-- .../resources/sonia/resources/i18n.properties | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java index c7c497bacf..2e8227fa60 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java @@ -98,7 +98,22 @@ public class GetRepositorySubCommand extends TemplateSubCommand protected void run() { ScmClientSession session = createSession(); - Repository repository = session.getRepositoryHandler().get(id); + + Repository repository; + + int index = id.indexOf("/"); + + if (index > 0) + { + String type = id.substring(0, index); + String name = id.substring(index + 1); + + repository = session.getRepositoryHandler().get(type, name); + } + else + { + repository = session.getRepositoryHandler().get(id); + } if (repository != null) { @@ -117,7 +132,7 @@ public class GetRepositorySubCommand extends TemplateSubCommand /** Field description */ @Argument( - usage = "optionRepositoryId", + usage = "optionRepositoryIdOrTypeAndName", metaVar = "repositoryid", required = true ) diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties index e80757638b..a094e88efc 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties @@ -44,6 +44,7 @@ optionLoggingLevel = Logging level (DEBUG, INFO, WARN, ERROR) optionTemplate = Template optionTemplateFile = Template file optionRepositoryId = Repository Id +optionRepositoryIdOrTypeAndName = Repository Id or type/name optionRepositoryName = Repository name optionRepositoryType = Repository name optionRepositoryContact = Repository contact