Merge pull request #1802 from vladak/message_get_repos

Message get repos

Author: tarzanek

README.md

@@ -139,6 +139,8 @@ Currently supported message types:
   * **delete** – removes project(s) and its repositores from the configuration.
     Also deletes its data under data root (but not the source code).
   * **indexed** – mark the project(s) as indexed so it becomes visible in the UI
+  * **get-repos** – get list of repositories in the form of relative paths to source root for given project(s)
+  * **get-repos-type** – get repository type(s) for given project(s)
 
 ## 4. OpenGrok install
 

src/org/opensolaris/opengrok/configuration/messages/ProjectMessage.java

@@ -26,13 +26,13 @@
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import org.opensolaris.opengrok.configuration.Group;
 import org.opensolaris.opengrok.configuration.Project;
@@ -44,7 +44,6 @@
 import org.opensolaris.opengrok.index.IndexDatabase;
 import org.opensolaris.opengrok.logger.LoggerFactory;
 import org.opensolaris.opengrok.util.IOUtils;
-import org.opensolaris.opengrok.web.ProjectHelper;
 
 
 /**
@@ -257,6 +256,42 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
             case "list-indexed":
                 return (env.getProjectList().stream().filter(p -> p.isIndexed()).
                         map(p -> p.getName()).collect(Collectors.joining("\n")).getBytes());
+            case "get-repos":
+                List<String> repos = new ArrayList<>();
+
+                for (String projectName : getTags()) {
+                    Project project;
+                    if ((project = env.getProjects().get(projectName)) == null) {
+                        continue;
+                    }
+                    List<RepositoryInfo> infos = env.getProjectRepositoriesMap().
+                            get(project);
+                    if (infos != null) {
+                        repos.addAll(infos.stream().
+                                map(ri -> ri.getDirectoryNameRelative()).
+                                collect(Collectors.toList()));
+                    }
+                }
+
+                return repos.stream().collect(Collectors.joining("\n")).getBytes();
+            case "get-repos-type":
+                Set<String> types = new TreeSet<>();
+
+                for (String projectName : getTags()) {
+                    Project project;
+                    if ((project = env.getProjects().get(projectName)) == null) {
+                        continue;
+                    }
+                    List<RepositoryInfo> infos = env.getProjectRepositoriesMap().
+                            get(project);
+                    if (infos != null) {
+                        types.addAll(infos.stream().
+                                map(ri -> ri.getType()).
+                                collect(Collectors.toList()));
+                    }
+                }
+
+                return types.stream().collect(Collectors.joining("\n")).getBytes();
         }
 
         return ("command \"" + getText() + "\" for projects " +
@@ -271,20 +306,20 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
     @Override
     public void validate() throws Exception {
         String command = getText();
+        Set<String> allowedText = new TreeSet<>(Arrays.asList("add", "delete",
+                "list", "list-indexed", "indexed", "get-repos",
+                "get-repos-type"));
 
         // Text field carries the command.
         if (command == null) {
             throw new Exception("The message must contain a text - \"add\", \"delete\" or \"indexed\"");
         }
-        if (command.compareTo("add") != 0 &&
-            command.compareTo("delete") != 0 &&
-            command.compareTo("list") != 0 &&
-            command.compareTo("list-indexed") != 0 &&
-            command.compareTo("indexed") != 0) {
-            throw new Exception("The message must contain either 'add', 'delete' or 'indexed' text");
+        if (!allowedText.contains(command)) {
+            throw new Exception("The message must contain either 'add', " +
+                    "'delete', 'indexed', 'list', 'list-indexed' or 'get-repos' text");
         }
 
-        if (!command.contains("list") && getTags().isEmpty()) {
+        if (!command.startsWith("list") && getTags().isEmpty()) {
             throw new Exception("The message must contain a tag (project name(s))");        
         }
 

test/org/opensolaris/opengrok/configuration/messages/ProjectMessageTest.java

@@ -391,4 +391,44 @@ public void testList() throws Exception {
         Assert.assertTrue(out.contains("mercurial"));
         Assert.assertFalse(out.contains("git"));
     }
+
+    @Test
+    public void testGetRepos() throws Exception {
+        // Try to get repos for non-existent project first.
+        Message m = new ProjectMessage();
+        m.setText("get-repos");
+        m.addTag("totally-nonexistent-project");
+        String out = new String(m.apply(env));
+        Assert.assertEquals("", out);
+
+        // Create subrepository.
+        File mercurialRoot = new File(repository.getSourceRoot() + File.separator + "mercurial");
+        MercurialRepositoryTest.runHgCommand(mercurialRoot,
+            "clone", mercurialRoot.getAbsolutePath(),
+            mercurialRoot.getAbsolutePath() + File.separator + "closed");
+
+        // Add a project
+        m = new ProjectMessage();
+        m.setText("add");
+        m.addTag("mercurial");
+        m.apply(env);
+
+        // Get repositories of the project.
+        m.setText("get-repos");
+        out = new String(m.apply(env));
+
+        // Perform cleanup of the subrepository in order not to interefere
+        // with other tests.
+        removeRecursive(new File(mercurialRoot.getAbsolutePath() +
+                File.separator + "closed").toPath());
+
+        // test
+        Assert.assertEquals("/mercurial\n/mercurial/closed", out);
+
+        // Test the types. There should be only one type for project with
+        // multiple nested Mercurial repositories.
+        m.setText("get-repos-type");
+        out = new String(m.apply(env));
+        Assert.assertEquals("Mercurial", out);
+    }
 }

tools/Messages

@@ -75,6 +75,8 @@ Usage()
     echo "       - \"indexed\" - mark the project(s) as indexed so it becomes visible in the UI"
     echo "       - \"list\" - list all projects (both indexed and not indexed)"
     echo "       - \"list-indexed\" - list indexed projects"
+    echo "       - \"get-repos\" - get list of repositories in the form of relative paths to source root for given project(s)"
+    echo "       - \"get-repos-type\" - get repository type(s) for given project(s)"
     echo "    normal:"
     echo "     - assign a <text> to the main page or a project"
     echo "     - can be more precise with <tags> (for specific project)"