Merge pull request #1816 from vladak/repositories_add_historyguru

populate HistoryGuru repositories list from add project Message

Author: tarzanek

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

@@ -31,8 +31,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.text.ParseException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.opensolaris.opengrok.util.Getopt;
 
 /**
@@ -49,6 +47,7 @@ public class ConfigMerge {
      * Merge base and new configuration.
      * @param cfgBase base configuration
      * @param cfgNew new configuration, will receive properties from the base configuration
+     * @throws Exception
      */
     public static void merge(Configuration cfgBase, Configuration cfgNew) throws Exception {
         Configuration cfgDefault = new Configuration();

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

@@ -114,13 +114,13 @@ public final class Configuration {
      */
     private int messageLimit;
     /**
-     * Directory with authorization plugins. Default value is
-     * dataRoot/../plugins (can be /var/opengrok/plugins if dataRoot is
-     * /var/opengrok/data).
+     * Directory with authorization plug-ins. Default value is
+     * {@code dataRoot/../plugins} (can be {@code /var/opengrok/plugins} if dataRoot is
+     * {@code /var/opengrok/data}).
      */
     private String pluginDirectory;
     /**
-     * Enable watching the plugin directory for changes in real time. Suitable
+     * Enable watching the plug-in directory for changes in real time. Suitable
      * for development.
      */
     private boolean authorizationWatchdogEnabled;
@@ -658,7 +658,7 @@ public String getDataRoot() {
      * @see #setPluginDirectory(java.lang.String)
      * @see #setStatisticsFilePath(java.lang.String)
      *
-     * @param dataRoot
+     * @param dataRoot data root path
      */
     public void setDataRoot(String dataRoot) {
         if (dataRoot != null && getPluginDirectory() == null) {

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

@@ -700,14 +700,35 @@ public List<RepositoryInfo> getRepositories() {
     }
 
     /**
-     * Set the map of external SCM repositories
+     * Set the list of repositories.
      *
      * @param repositories the repositories to use
      */
     public void setRepositories(List<RepositoryInfo> repositories) {
         threadConfig.get().setRepositories(repositories);
     }
+    
+    public void removeRepositories() {
+        threadConfig.get().setRepositories(null);
+    }
+    
+    /**
+     * Search through the directory for repositories and use the result to replace
+     * the lists of repositories in both RuntimeEnvironment/Configuration and HistoryGuru.
+     *
+     * @param dir the root directory to start the search in
+     */
+    public void setRepositories(String dir) {
+        List<RepositoryInfo> repos = new ArrayList<>(HistoryGuru.getInstance().
+                addRepositories(new File[]{new File(dir)},
+                RuntimeEnvironment.getInstance().getIgnoredNames()));
+        RuntimeEnvironment.getInstance().setRepositories(repos);
+    }
 
+    /**
+     * Add repositories to the list.
+     * @param repositories 
+     */
     public void addRepositories(List<RepositoryInfo> repositories) {
         threadConfig.get().addRepositories(repositories);
     }
@@ -1330,20 +1351,29 @@ public void setConfiguration(Configuration configuration) {
 
     public void setConfiguration(Configuration configuration, List<String> subFileList) {
         this.configuration = configuration;
+        HistoryGuru histGuru = HistoryGuru.getInstance();
+                
         register();
+        
         try {
             generateProjectRepositoriesMap();
         } catch (IOException ex) {
             LOGGER.log(Level.SEVERE, "Cannot generate project - repository map", ex);
         }
+        
         populateGroups(getGroups(), new TreeSet<>(getProjects().values()));
+        
+        // Set the working repositories in HistoryGuru.
         if (subFileList != null) {
-            HistoryGuru.getInstance().invalidateRepositories(
+            histGuru.invalidateRepositories(
                 configuration.getRepositories(), subFileList);
         } else {
-            HistoryGuru.getInstance().invalidateRepositories(
+            histGuru.invalidateRepositories(
                 configuration.getRepositories());
         }
+        // The invalidation of repositories above might have excluded some
+        // repositories in HistoryGuru so the configuration needs to reflect that.
+        configuration.setRepositories(new ArrayList<>(histGuru.getRepositories()));
     }
 
     public Configuration getConfiguration() {

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

@@ -87,19 +87,18 @@ private void validateMore(RuntimeEnvironment env) throws Exception {
         }
     }
 
-    private List<RepositoryInfo> getRepositoriesInDir(RuntimeEnvironment env, File projDir) {
-        List<RepositoryInfo> repos = new ArrayList<>();
-        HistoryGuru hg = HistoryGuru.getInstance();
+    private List<RepositoryInfo> getRepositoriesInDir(RuntimeEnvironment env,
+            File projDir) {
+
+        HistoryGuru histGuru = HistoryGuru.getInstance();
 
         // There is no need to perform the work of invalidateRepositories(),
         // since addRepositories() calls getRepository() for each of
         // the repos.
-        hg.addRepositories(new File[]{projDir}, repos,
-            env.getIgnoredNames());
-
-        return repos;
+        return new ArrayList<>(histGuru.addRepositories(new File[]{projDir},
+            env.getIgnoredNames()));
     }
-    
+
     @Override
     protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
         String command = getText();
@@ -193,11 +192,7 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
                                 File.separator + projectName));
                     }
                     HistoryGuru guru = HistoryGuru.getInstance();
-                    // removeCache() for single repository would call
-                    // {@code invalidateRepositories()} on it which
-                    // would corrupt HistoryGuru's view of all repositories
-                    // so call clearCache() to avoid it.
-                    guru.clearCache(repos.stream().
+                    guru.removeCache(repos.stream().
                         map((x) -> {
                             try {
                                 return env.getPathRelativeToSourceRoot(
@@ -213,9 +208,6 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
                                 return "";
                             }
                         }).collect(Collectors.toSet()));
-
-                    // Remove the repositories in the HistoryGuru.
-                    guru.removeRepositories(repos);
                 }
                 break;
             case "indexed":
@@ -245,7 +237,7 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws Exception {
                     }
                 }
 
-                // In case this project has just been incremetally indexed,
+                // In case this project has just been incrementally indexed,
                 // its IndexSearcher needs a poke.
                 env.maybeRefreshIndexSearchers(getTags());