Fix --help {ctags,repos}

As exitWithHelp() is called before the runtime
environment has had its configuration updated
with parsed options, exitWithHelp() needs to
force in some settings for ctags or repos help.

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoriesHelp.java

@@ -37,8 +37,27 @@ public static String getText() {
         builder.append("Enabled repositories:");
         builder.append(System.lineSeparator());
         builder.append(System.lineSeparator());
-
         List<Class<? extends Repository>> clazzes = RepositoryFactory.getRepositoryClasses();
+        appendClassesHelp(builder, clazzes);
+
+        List<Class<? extends Repository>> disabledClazzes =
+                RepositoryFactory.getDisabledRepositoryClasses();
+        if (!disabledClazzes.isEmpty()) {
+            if (!clazzes.isEmpty()) {
+                builder.append(System.lineSeparator());
+            }
+            builder.append("Disabled repositories:");
+            builder.append(System.lineSeparator());
+            builder.append(System.lineSeparator());
+            appendClassesHelp(builder, disabledClazzes);
+        }
+
+        return builder.toString();
+    }
+
+    private static void appendClassesHelp(
+            StringBuilder builder, List<Class<? extends Repository>> clazzes) {
+
         clazzes.sort((o1, o2) -> o1.getSimpleName().compareToIgnoreCase(o2.getSimpleName()));
         for (Class<?> clazz : clazzes) {
             String simpleName = clazz.getSimpleName();
@@ -49,7 +68,6 @@ public static String getText() {
             }
             builder.append(System.lineSeparator());
         }
-        return builder.toString();
     }
 
     private static boolean toAka(StringBuilder builder, String repoSimpleName) {

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoryFactory.java

@@ -106,16 +106,30 @@ private RepositoryFactory() {
      * @return a list that contains non-{@code null} values only
      */
     public static List<Class<? extends Repository>> getRepositoryClasses() {
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
-
         ArrayList<Class<? extends Repository>> list = new ArrayList<>(repositories.length);
         for (int i = repositories.length - 1; i >= 0; i--) {
             Class<? extends Repository> clazz = repositories[i].getClass();
-            if (isEnabled(clazz, env)) {
+            if (isEnabled(clazz)) {
                 list.add(clazz);
             }
         }
-        
+
+        return list;
+    }
+
+    /**
+     * Gets a list of all disabled repository handlers.
+     * @return a list that contains non-{@code null} values only
+     */
+    public static List<Class<? extends Repository>> getDisabledRepositoryClasses() {
+        ArrayList<Class<? extends Repository>> list = new ArrayList<>();
+        for (int i = repositories.length - 1; i >= 0; i--) {
+            Class<? extends Repository> clazz = repositories[i].getClass();
+            if (!isEnabled(clazz)) {
+                list.add(clazz);
+            }
+        }
+
         return list;
     }
 
@@ -169,7 +183,7 @@ public static Repository getRepository(File file, boolean interactive, boolean i
         for (Repository referenceRepo : repositories) {
             Class<? extends Repository> clazz = referenceRepo.getClass();
 
-            if ((!isNested || referenceRepo.isNestable()) && isEnabled(clazz, env) &&
+            if ((!isNested || referenceRepo.isNestable()) && isEnabled(clazz) &&
                     referenceRepo.isRepositoryFor(file, interactive)) {
                 repo = clazz.getDeclaredConstructor().newInstance();
 
@@ -274,7 +288,7 @@ public static Repository getRepository(RepositoryInfo info, boolean interactive)
     public static void initializeIgnoredNames(RuntimeEnvironment env) {
         IgnoredNames ignoredNames = env.getIgnoredNames();
         for (Repository repo : repositories) {
-            if (isEnabled(repo.getClass(), env)) {
+            if (isEnabled(repo.getClass())) {
                 for (String file : repo.getIgnoredFiles()) {
                     ignoredNames.add("f:" + file);
                 }
@@ -299,8 +313,8 @@ public static String matchRepositoryByName(String name) {
         return null;
     }
 
-    private static boolean isEnabled(Class<? extends Repository> clazz, RuntimeEnvironment env) {
-        Set<String> disabledRepos = env.getDisabledRepositories();
+    private static boolean isEnabled(Class<? extends Repository> clazz) {
+        Set<String> disabledRepos = RuntimeEnvironment.getInstance().getDisabledRepositories();
         return disabledRepos == null || !disabledRepos.contains(clazz.getSimpleName());
     }
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

@@ -154,6 +154,17 @@ public static void main(String[] argv) {
 
         try {
             argv = parseOptions(argv);
+
+            /*
+             * Attend to disabledRepositories here in case exitWithHelp() will
+             * need to report about repos.
+             */
+            disabledRepositories.addAll(cfg.getDisabledRepositories());
+            cfg.setDisabledRepositories(disabledRepositories);
+            for (String repoName : disabledRepositories) {
+                LOGGER.log(Level.FINEST, "Disabled {0}", repoName);
+            }
+
             if (help) {
                 exitWithHelp();
             }
@@ -164,12 +175,6 @@ public static void main(String[] argv) {
                 pauseToAwaitProfiler();
             }
 
-            disabledRepositories.addAll(cfg.getDisabledRepositories());
-            cfg.setDisabledRepositories(disabledRepositories);
-            for (String repoName : disabledRepositories) {
-                LOGGER.log(Level.FINEST, "Disabled {0}", repoName);
-            }
-
             env = RuntimeEnvironment.getInstance();
 
             // Complete the configuration of repository types.
@@ -410,11 +415,13 @@ public static String[] parseOptions(String[] argv) throws ParseException {
         OptionParser configure = OptionParser.scan(parser ->
                 parser.on("-R configPath").Do(cfgFile -> {
             try {
+                cfg = Configuration.read(new File((String) cfgFile));
+            } catch (IOException e) {
                 if (!preHelp) {
-                    cfg = Configuration.read(new File((String) cfgFile));
+                    die(e.getMessage());
+                } else {
+                    System.err.println(String.format("Warning: failed to read -R %s", cfgFile));
                 }
-            } catch (IOException e) {
-                die(e.getMessage());
             }
         }));
 
@@ -1131,6 +1138,11 @@ private static void exitWithHelp() {
                 helpStream.print(ConfigurationHelp.getSamples());
                 break;
             case CTAGS:
+                /*
+                 * Force the environment's ctags, because this method is called
+                 * before main() does the heavyweight setConfiguration().
+                 */
+                env.setCtags(cfg.getCtags());
                 helpStream.println("Ctags command-line:");
                 helpStream.println();
                 helpStream.println(getCtagsCommand());
@@ -1140,6 +1152,10 @@ private static void exitWithHelp() {
                 helpStream.println(AnalyzerGuruHelp.getUsage());
                 break;
             case REPOS:
+                /*
+                 * Force the environment's disabledRepositories (as above).
+                 */
+                env.setDisabledRepositories(cfg.getDisabledRepositories());
                 helpStream.println(RepositoriesHelp.getText());
                 break;
             default: