Incorporated suggested changes

Removed 1st for-loop which was not doing much of anything. Only directories are considered to be looked at as being repositories, or holders of repository info.

Author: shaehn

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

@@ -72,8 +72,6 @@ public final class HistoryGuru {
     private Map<String, Repository> repositories = new ConcurrentHashMap<>();
 
     private final int scanningDepth;
-
-    private String ignoreRepositoryName = ".opengrok_skip_history";
 
     /**
      * Creates a new instance of HistoryGuru, and try to set the default source
@@ -344,65 +342,43 @@ private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
     private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
             IgnoredNames ignoredNames, boolean recursiveSearch, int depth) {
 
-        // This check for ignoring a repository only works for embedded
-        // source code control directories used by SCCS and the like.
         for (File file : files) {
-            if (file.getName().equals(ignoreRepositoryName)) {
-                LOGGER.log(Level.INFO,
-                        "Skipping history cache creation for {0} and its subdirectories",
-                        file.getParentFile().getAbsolutePath());
-                return;
-            }
-        }
-        for (File file : files) {
-            Boolean ignoreRepository = false;
-            try {
-                // This check for ignoring a repository is for the
-                // kind of repository, such as AccuRev, where the
-                // entire project folder layout (workspace) is
-                // considered as the repository. Here we need to
-                // look inside the folder for the magic file.
-                if( file.isDirectory() ) {
-                    String path = file.getCanonicalPath();
-                    File skipRepository = new File(path, ignoreRepositoryName);
-                    ignoreRepository = skipRepository.exists();
-                }
-            } catch( IOException exp ) {
-                LOGGER.log(Level.WARNING,
-                    "Failed to get canonical path for {0}: {1}",
-                    new Object[]{file.getAbsolutePath(), exp.getMessage()});
-            }
-            
-            if( ignoreRepository ) {
-                LOGGER.log(Level.INFO,
-                    "Skipping history cache creation for {0} and its subdirectories",
-                    file.getAbsolutePath());
-            } else {
-                Repository repository = null;
+            if (file.isDirectory()) {
+                String path;
                 try {
-                    repository = RepositoryFactory.getRepository(file);
-                } catch (InstantiationException ie) {
-                    LOGGER.log(Level.WARNING, "Could not create repository for '"
-                            + file + "', could not instantiate the repository.", ie);
-                } catch (IllegalAccessException iae) {
-                    LOGGER.log(Level.WARNING, "Could not create repository for '"
-                            + file + "', missing access rights.", iae);
-                }
-                if (repository == null) {
-                    // Not a repository, search its sub-dirs
-                    if (file.isDirectory() && !ignoredNames.ignore(file)) {
-                        File subFiles[] = file.listFiles();
-                        if (subFiles == null) {
-                            LOGGER.log(Level.WARNING,
-                                    "Failed to get sub directories for ''{0}'', check access permissions.",
-                                    file.getAbsolutePath());
-                        } else if (depth <= scanningDepth) {
-                            addRepositories(subFiles, repos, ignoredNames, depth + 1);
-                        }
+                    path = file.getCanonicalPath();
+                    File skipRepository = new File(path, ".opengrok_skip_history");
+                    // Should potential repository be ignored?
+                    if (skipRepository.exists()) {
+                        LOGGER.log(Level.INFO,
+                            "Skipping history cache creation for {0} and its subdirectories",
+                            file.getAbsolutePath());
+                        continue;
                     }
-                } else {
+                    
+                    Repository repository = null;
                     try {
-                        String path = file.getCanonicalPath();
+                        repository = RepositoryFactory.getRepository(file);
+                    } catch (InstantiationException ie) {
+                        LOGGER.log(Level.WARNING, "Could not create repository for '"
+                                + file + "', could not instantiate the repository.", ie);
+                    } catch (IllegalAccessException iae) {
+                        LOGGER.log(Level.WARNING, "Could not create repository for '"
+                                + file + "', missing access rights.", iae);
+                    }
+                    if (repository == null) {
+                        // Not a repository, search its sub-dirs
+                        if (!ignoredNames.ignore(file)) {
+                            File subFiles[] = file.listFiles();
+                            if (subFiles == null) {
+                                LOGGER.log(Level.WARNING,
+                                        "Failed to get sub directories for ''{0}'', check access permissions.",
+                                        file.getAbsolutePath());
+                            } else if (depth <= scanningDepth) {
+                                addRepositories(subFiles, repos, ignoredNames, depth + 1);
+                            }
+                        }
+                    } else {
                         repository.setDirectoryName(path);
                         if (RuntimeEnvironment.getInstance().isVerbose()) {
                             LOGGER.log(Level.CONFIG, "Adding <{0}> repository: <{1}>",
@@ -425,13 +401,12 @@ private void addRepositories(File[] files, Collection<RepositoryInfo> repos,
                                         false, depth + 1);
                             }
                         }
-
-                    } catch (IOException exp) {
-                        LOGGER.log(Level.WARNING,
-                                "Failed to get canonical path for {0}: {1}",
-                                new Object[]{file.getAbsolutePath(), exp.getMessage()});
-                        LOGGER.log(Level.WARNING, "Repository will be ignored...", exp);
                     }
+                } catch (IOException exp) {
+                    LOGGER.log(Level.WARNING,
+                            "Failed to get canonical path for {0}: {1}",
+                            new Object[]{file.getAbsolutePath(), exp.getMessage()});
+                    LOGGER.log(Level.WARNING, "Repository will be ignored...", exp);
                 }
             }
         }