add repository directory to renamed file paths

Author: Vladimir Kotal

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

@@ -529,8 +529,7 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
             return;
         }
 
-        renamedFiles = renamedFiles.stream().map(e -> repository.getDirectoryNameRelative() + File.separator + e).
-                filter(f -> new File(env.getSourceRootPath() + f).exists()).
+        renamedFiles = renamedFiles.stream().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()});

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

@@ -623,7 +623,8 @@ private void getFiles(org.eclipse.jgit.lib.Repository repository,
                 }
 
                 if (diff.getChangeType() == DiffEntry.ChangeType.RENAME && isHandleRenamedFiles()) {
-                    renamedFiles.add(getNativePath(diff.getNewPath()));
+                    renamedFiles.add(getNativePath(getDirectoryNameRelative()) + File.separator +
+                            getNativePath(diff.getNewPath()));
                 }
             }
         }

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

@@ -170,7 +170,7 @@ public void processStream(InputStream input) throws IOException {
                         }
                     }
                 }
-            } else if (s.startsWith(MercurialRepository.FILE_COPIES) &&
+            } else if (repository.isHandleRenamedFiles() && s.startsWith(MercurialRepository.FILE_COPIES) &&
                 entry != null && isDir) {
                 /*
                  * 'file_copies:' should be present only for directories but
@@ -185,8 +185,8 @@ public void processStream(InputStream input) throws IOException {
                      String[] move = part.split(" \\(");
                      File f = new File(mydir + move[0]);
                      if (!move[0].isEmpty() && f.exists() &&
-                         !renamedFiles.contains(move[0])) {
-                             renamedFiles.add(move[0]);
+                         !renamedFiles.contains(repository.getDirectoryNameRelative() + File.separator + move[0])) {
+                             renamedFiles.add(repository.getDirectoryNameRelative() + File.separator + move[0]);
                      }
                 }
             } else if (s.startsWith(DESC_PREFIX) && entry != null) {

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

@@ -133,7 +133,7 @@ public void endElement(String uri, String localName, String qname) throws SAXExc
                     // so intern them to reduce the memory footprint.
                     entry.addFile(path.intern());
                     if (isRenamed) {
-                        renamedFiles.add(file.getAbsolutePath().substring(home.length() + 1));
+                        renamedFiles.add(path.intern());
                     }
                 } else {
                     LOGGER.log(Level.FINER, "Skipping file outside repository: " + s);

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

@@ -558,9 +558,10 @@ public void testHistory(boolean renamedHandling) throws Exception {
                                 File.separator + Paths.get("git", "header.h"),
                                 File.separator + Paths.get("git", "main.c"))));
 
-        List<String> expectedRenamedFiles = List.of(Paths.get("moved", "renamed2.c").toString(),
-                Paths.get("moved2", "renamed2.c").toString(),
-                Paths.get("moved", "renamed.c").toString());
+        List<String> expectedRenamedFiles = List.of(
+                File.separator + Paths.get("git", "moved", "renamed2.c"),
+                File.separator + Paths.get("git", "moved2", "renamed2.c"),
+                File.separator + Paths.get("git", "moved", "renamed.c"));
 
         History history = gitrepo.getHistory(root);
         assertNotNull(history);