fill repository properties from project before building tag list

Author: vladak

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

@@ -215,11 +215,11 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
                             });
                 }
 
-                if (repo.getType() == null || repo.getType().length() == 0) {
+                if (repo.getType() == null || repo.getType().isEmpty()) {
                     repo.setType(repo.getClass().getSimpleName());
                 }
 
-                if (repo.getParent() == null || repo.getParent().length() == 0) {
+                if (repo.getParent() == null || repo.getParent().isEmpty()) {
                     try {
                         repo.setParent(repo.determineParent(cmdType));
                     } catch (IOException ex) {
@@ -229,7 +229,7 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
                     }
                 }
 
-                if (repo.getBranch() == null || repo.getBranch().length() == 0) {
+                if (repo.getBranch() == null || repo.getBranch().isEmpty()) {
                     try {
                         repo.setBranch(repo.determineBranch(cmdType));
                     } catch (IOException ex) {
@@ -239,7 +239,7 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
                     }
                 }
 
-                if (repo.getCurrentVersion() == null || repo.getCurrentVersion().length() == 0) {
+                if (repo.getCurrentVersion() == null || repo.getCurrentVersion().isEmpty()) {
                     try {
                         repo.setCurrentVersion(repo.determineCurrentVersion(cmdType));
                     } catch (IOException ex) {
@@ -249,14 +249,16 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
                     }
                 }
 
+                // This has to be called before building tag list below as it depends on the repository properties
+                // inherited from the project/configuration.
+                repo.fillFromProject();
+
                 // If this repository displays tags only for files changed by tagged
                 // revision, we need to prepare list of all tags in advance.
                 if (cmdType.equals(CommandTimeoutType.INDEXER) && repo.isTagsEnabled() && repo.hasFileBasedTags()) {
                     repo.buildTagList(file, cmdType);
                 }
 
-                repo.fillFromProject();
-
                 break;
             }
         }

opengrok-indexer/src/test/java/org/opengrok/indexer/history/FileHistoryCacheTest.java

@@ -241,9 +241,9 @@ void testStoreAndGetNotRenamed() throws Exception {
 
     /**
      * Test tagging by creating history cache for repository with one tag and
-     * then importing couple of changesets which add both file changes and tags.
+     * then importing a couple of changesets which add both file changes and tags.
      * The last history entry before the import is important as it needs to be
-     * retagged when old history is merged with the new one.
+     * re-tagged when old history is merged with the new one.
      */
     @EnabledForRepository(MERCURIAL)
     @Test