set initial depth correctly when calling addRepositories via project Message

fixes #1747

Author: vladak

src/org/opensolaris/opengrok/configuration/Configuration.java

@@ -195,6 +195,13 @@ public final class Configuration {
     private boolean handleHistoryOfRenamedFiles;
 
     public static final double defaultRamBufferSize = 16;
+
+    /**
+     * The directory hierarchy depth to limit the scanning for repositories.
+     * E.g. if the /mercurial/ directory (relative to source root) is a repository
+     * and /mercurial/usr/closed/ is sub-repository, the latter will be discovered
+     * only if the depth is set to 3 or greater.
+     */
     public static final int defaultScanningDepth = 3;
 
     /**

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

@@ -91,7 +91,7 @@ private List<RepositoryInfo> getRepositoriesInDir(RuntimeEnvironment env, File p
         // since addRepositories() calls getRepository() for each of
         // the repos.
         hg.addRepositories(new File[]{projDir}, repos,
-            env.getIgnoredNames(), env.getScanningDepth());
+            env.getIgnoredNames());
 
         return repos;
     }

src/org/opensolaris/opengrok/history/HistoryGuru.java

@@ -324,7 +324,7 @@ public Map<String, Date> getLastModifiedTimes(File directory)
         return Collections.emptyMap();
     }
 
-    public void addRepositories(File[] files, Collection<RepositoryInfo> repos,
+    private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
             IgnoredNames ignoredNames, int depth) {
         addRepositories(files, repos, ignoredNames, true, depth);
     }
@@ -409,6 +409,18 @@ private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
         }
     }
 
+    /**
+     * recursively search for repositories in given directories.
+     *
+     * @param files list of files to check if they contain a repo
+     * @param repos list of found repos
+     * @param ignoredNames what files to ignore
+     */
+    public void addRepositories(File[] files, Collection<RepositoryInfo> repos,
+            IgnoredNames ignoredNames) {
+        addRepositories(files, repos, ignoredNames, true, 0);
+    }
+
     /**
      * Search through the all of the directories and add all of the source
      * repositories found.
@@ -418,7 +430,7 @@ private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
     public void addRepositories(String dir) {
         List<RepositoryInfo> repos = new ArrayList<>();
         addRepositories(new File[]{new File(dir)}, repos,
-                RuntimeEnvironment.getInstance().getIgnoredNames(), 0);
+                RuntimeEnvironment.getInstance().getIgnoredNames());
         RuntimeEnvironment.getInstance().setRepositories(repos);
         invalidateRepositories(repos);
     }

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

@@ -62,24 +62,16 @@ public class ProjectMessageTest {
     private static TestRepository repository = new TestRepository();
     private final String ctagsProperty = "org.opensolaris.opengrok.analysis.Ctags";
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        repository = new TestRepository();
-        repository.create(HistoryGuru.class.getResourceAsStream(
-                "repositories.zip"));
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        repository.destroy();
-    }
-
     @Before
     public void setUp() throws IOException {
         Assume.assumeTrue(new MercurialRepository().isWorking());
         Assume.assumeTrue(new SubversionRepository().isWorking());
         Assume.assumeTrue(new GitRepository().isWorking());
 
+        repository = new TestRepository();
+        repository.create(HistoryGuru.class.getResourceAsStream(
+                "repositories.zip"));
+
         env = RuntimeEnvironment.getInstance();
         env.removeAllMessages();
         env.setSourceRoot(repository.getSourceRoot());
@@ -96,6 +88,8 @@ public void tearDown() {
         env.setProjects(new ConcurrentHashMap<>());
         env.setRepositories(new ArrayList<RepositoryInfo>());
         env.getProjectRepositoriesMap().clear();
+
+        repository.destroy();
     }
 
     @Test
@@ -145,10 +139,20 @@ public void testAdd() throws Exception {
         m.addTag("mercurial");
         Assert.assertTrue(env.getRepositories().isEmpty());
         Assert.assertTrue(env.getProjects().isEmpty());
+
+        // Add a sub-repository.
+        File mercurialRoot = new File(repository.getSourceRoot() + File.separator + "mercurial");
+        File subDir = new File(mercurialRoot, "usr");
+        Assert.assertTrue(subDir.mkdir());
+        MercurialRepositoryTest.runHgCommand(mercurialRoot,
+            "clone", mercurialRoot.getAbsolutePath(),
+            mercurialRoot.getAbsolutePath() + File.separator + "usr" + File.separator + "closed");
+
+        env.setScanningDepth(3);
         m.apply(env);
         Assert.assertTrue(env.getProjects().containsKey("mercurial"));
         Assert.assertEquals(1, env.getProjects().size());
-        Assert.assertEquals(1, env.getRepositories().size());
+        Assert.assertEquals(2, env.getRepositories().size());
 
         // Add more projects and check that they have been added incrementally.
         // At the same time, it checks that multiple projects can be added
@@ -158,7 +162,7 @@ public void testAdd() throws Exception {
         m.addTag("svn");
         m.apply(env);
         Assert.assertEquals(3, env.getProjects().size());
-        Assert.assertEquals(3, env.getRepositories().size());
+        Assert.assertEquals(4, env.getRepositories().size());
         Assert.assertTrue(env.getProjects().containsKey("git"));
         Assert.assertTrue(env.getProjects().containsKey("svn"));
     }