merge with branch 1.x

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
   )

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
@@ -56,7 +57,7 @@ optionPermissionName = Group or user name
 optionPermissionType = Permission type (READ,WRITE or OWNER)
 
 optionUserName = Username
-optionUserDisplayName = "Diesplay name
+optionUserDisplayName = Display name
 optionUserMail = E-Mail address 
 optionUserPassword = Password
 optionUserType = Type