avoid constructing duplicate list of renamed files

Author: Vladimir Kotal

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

@@ -47,7 +47,6 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -434,7 +433,6 @@ public void store(History history, Repository repository, String tillRevision) t
 
         HashMap<String, List<HistoryEntry>> map = new HashMap<>();
         HashMap<String, Boolean> acceptanceCache = new HashMap<>();
-        Set<String> renamedFiles = new HashSet<>();
 
         /*
          * Go through all history entries for this repository (acquired through
@@ -496,7 +494,6 @@ public void store(History history, Repository repository, String tillRevision) t
         for (Map.Entry<String, List<HistoryEntry>> map_entry : map.entrySet()) {
             try {
                 if (handleRenamedFiles && isRenamedFile(map_entry.getKey(), repository, history)) {
-                    renamedFiles.add(map_entry.getKey());
                     continue;
                 }
             } catch (IOException ex) {
@@ -516,7 +513,7 @@ public void store(History history, Repository repository, String tillRevision) t
             return;
         }
 
-        storeRenamed(renamedFiles, repository, tillRevision);
+        storeRenamed(history.getRenamedFiles(), repository, tillRevision);
 
         finishStore(repository, latestRev);
     }
@@ -532,7 +529,8 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
             return;
         }
 
-        renamedFiles = renamedFiles.stream().filter(f -> new File(env.getSourceRootPath() + f).exists()).
+        renamedFiles = renamedFiles.stream().map(e -> repository.getDirectoryNameRelative() + File.separator + e).
+                filter(f -> new File(env.getSourceRootPath() + f).exists()).
                 collect(Collectors.toSet());
         LOGGER.log(Level.FINE, "Storing history for {0} renamed files in repository ''{1}''",
                 new Object[]{renamedFiles.size(), repository.getDirectoryName()});