rework finding original names

Author: Vladimir Kotal

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

@@ -277,13 +277,18 @@ static Reader newLogReader(InputStream input) throws IOException {
         // platform's default encoding.
         return new InputStreamReader(input, "UTF-8");
     }
-    
+
+    private String getPathRelativeToRepositoryRoot(String fullpath) {
+        String repoPath = getDirectoryName() + File.separator;
+        return fullpath.replace(repoPath, "");
+    }
+
     /**
      * Get the name of file in given revision.
      *
      * @param fullpath file path
      * @param changeset changeset
-     * @return original filename
+     * @return original filename relative to the repository root
      * @throws java.io.IOException if I/O exception occurred
      */
     protected String findOriginalName(String fullpath, String changeset)
@@ -297,7 +302,7 @@ protected String findOriginalName(String fullpath, String changeset)
                     fullpath, changeset));
         }
 
-        String file = fullpath.replace(getDirectoryName() + File.separator, "");
+        String fileInRepo = getPathRelativeToRepositoryRoot(fullpath);
         /*
          * Get the list of file renames for given file to the specified
          * revision.
@@ -312,13 +317,14 @@ protected String findOriginalName(String fullpath, String changeset)
             "--name-status",
             "--pretty=format:commit %h%b",
             "--",
-            fullpath
+            fileInRepo
         };
 
         Executor executor = new Executor(Arrays.asList(argv), new File(getDirectoryName()),
                 RuntimeEnvironment.getInstance().getInteractiveCommandTimeout());
         int status = executor.exec();
-        
+
+        String originalFile = null;
         try (BufferedReader in = new BufferedReader(
                 new InputStreamReader(executor.getOutputStream()))) {
             String line;
@@ -332,23 +338,26 @@ protected String findOriginalName(String fullpath, String changeset)
                 }
 
                 if (changeset.equals(rev)) {
+                    if (originalFile == null) {
+                        originalFile = fileInRepo;
+                    }
                     break;
                 }
 
                 if ((m = pattern.matcher(line)).find()) {
-                    file = m.group(1);
+                    originalFile = m.group(1);
                 }
             }
         }
 
-        if (status != 0) {
+        if (status != 0 || originalFile == null) {
             LOGGER.log(Level.WARNING,
                     "Failed to get original name in revision {2} for: \"{0}\" Exit code: {1}",
                     new Object[]{fullpath, String.valueOf(status), changeset});
             return null;
         }
 
-        return (fullpath.substring(0, getDirectoryName().length() + 1) + file);
+        return originalFile;
     }
 
     /**
@@ -394,7 +403,7 @@ private String getFirstRevision(String fullpath) throws IOException {
      *
      * @param file file to annotate
      * @param revision revision to annotate
-     * @return file annotation
+     * @return file annotation or {@code null}
      * @throws java.io.IOException if I/O exception occurred
      */
     @Override
@@ -419,16 +428,16 @@ public Annotation annotate(File file, String revision) throws IOException {
             }
         }
         cmd.add("--");
-        cmd.add(file.getName());
+        cmd.add(getPathRelativeToRepositoryRoot(file.getCanonicalPath()));
 
-        Executor exec = new Executor(cmd, file.getParentFile(),
+        Executor exec = new Executor(cmd, new File(getDirectoryName()),
                 RuntimeEnvironment.getInstance().getInteractiveCommandTimeout());
         GitAnnotationParser parser = new GitAnnotationParser(file.getName());
         int status = exec.exec(true, parser);
 
         // File might have changed its location if it was renamed.
         // Try to lookup its original name and get the annotation again.
-        if (status != 0) {
+        if (status != 0 && isHandleRenamedFiles()) {
             cmd.clear();
             ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
             cmd.add(RepoCommand);
@@ -439,16 +448,18 @@ public Annotation annotate(File file, String revision) throws IOException {
                 cmd.add(revision);
             }
             cmd.add("--");
-            cmd.add(findOriginalName(file.getAbsolutePath(), revision));
-            File directory = new File(getDirectoryName());
-            exec = new Executor(cmd, directory);
-            status = exec.exec();
+            cmd.add(findOriginalName(file.getCanonicalPath(), revision));
+            exec = new Executor(cmd, new File(getDirectoryName()),
+                    RuntimeEnvironment.getInstance().getInteractiveCommandTimeout());
+            parser = new GitAnnotationParser(file.getName());
+            status = exec.exec(true, parser);
         }
 
         if (status != 0) {
             LOGGER.log(Level.WARNING,
                     "Failed to get annotations for: \"{0}\" Exit code: {1}",
                     new Object[]{file.getAbsolutePath(), String.valueOf(status)});
+            return null;
         }
 
         return parser.getAnnotation();

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

@@ -186,26 +186,29 @@ public void testRenamedFiles() throws Exception {
             {"moved2/renamed2.c", "ce4c98ec", "renamed.c"},
             {"moved2/renamed2.c", "bb74b7e8", "renamed.c"}
         };
+
         File root = new File(repository.getSourceRoot(), "git");
         GitRepository gitrepo
                 = (GitRepository) RepositoryFactory.getRepository(root);
+        gitrepo.setHandleRenamedFiles(true);
+
         int i = 0;
         for (String[] test : tests) {
-            String file = root.getCanonicalPath() + File.separator + test[0];
+            String file = Paths.get(root.getCanonicalPath(), test[0]).toString();
             String changeset = test[1];
-            String expected = root.getCanonicalPath() + File.separator + test[2];
+            String expectedName = test[2];
             try {
                 String originalName = gitrepo.findOriginalName(file, changeset);
-                Assert.assertEquals(expected, originalName);
+                Assert.assertEquals(expectedName, originalName);
             } catch (IOException ex) {
                 Assert.fail(String.format("Looking for original name of {} in {} shouldn't fail", file, changeset));
             }
             i++;
         }
     }
 
-    private void testAnnotationOfRenamedFile(GitRepository gitrepo, File file, Set<String> revSet) throws Exception {
-        Annotation annotation = gitrepo.annotate(file, null);
+    private void testAnnotationOfFile(GitRepository gitrepo, File file, String revision, Set<String> revSet) throws Exception {
+        Annotation annotation = gitrepo.annotate(file, revision);
 
         assertNotNull(annotation);
         assertEquals(revSet, annotation.getRevisions());
@@ -222,7 +225,7 @@ public void testAnnotationOfRenamedFileWithHandlingOff() throws Exception {
                 = (GitRepository) RepositoryFactory.getRepository(root);
         gitrepo.setHandleRenamedFiles(false);
         File renamedFile = Paths.get(root.getAbsolutePath(),"moved2", "renamed2.c").toFile();
-        testAnnotationOfRenamedFile(gitrepo, renamedFile, revSet);
+        testAnnotationOfFile(gitrepo, renamedFile, null, revSet);
     }
 
     @Test
@@ -236,7 +239,21 @@ public void testAnnotationOfRenamedFileWithHandlingOn() throws Exception {
                 = (GitRepository) RepositoryFactory.getRepository(root);
         gitrepo.setHandleRenamedFiles(true);
         File renamedFile = Paths.get(root.getAbsolutePath(),"moved2", "renamed2.c").toFile();
-        testAnnotationOfRenamedFile(gitrepo, renamedFile, revSet);
+        testAnnotationOfFile(gitrepo, renamedFile, null, revSet);
+    }
+
+    @Test
+    public void testAnnotationOfRenamedFilePastWithHandlingOn() throws Exception {
+        String[] revisions = {"1086eaf5", "ce4c98ec"};
+        Set<String> revSet = new HashSet<>();
+        Collections.addAll(revSet, revisions);
+
+        File root = new File(repository.getSourceRoot(), "git");
+        GitRepository gitrepo
+                = (GitRepository) RepositoryFactory.getRepository(root);
+        gitrepo.setHandleRenamedFiles(true);
+        File renamedFile = Paths.get(root.getAbsolutePath(),"moved2", "renamed2.c").toFile();
+        testAnnotationOfFile(gitrepo, renamedFile, "1086eaf5", revSet);
     }
 
     @Test(expected = IOException.class)