follow-up fixes for Mercurial renamed files handling

fixes #666

Author: vladak

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

@@ -253,7 +253,7 @@ public void store(History history, Repository repository)
                 String repodir = env.getPathRelativeToSourceRoot(
                     new File(repository.getDirectoryName()), 0);
                 String shortestfile = fullfile.substring(repodir.length() + 1);
-                if (history.isIgnored(shortestfile)) {
+                if (history.isRenamed(shortestfile)) {
                     hist = repository.getHistory(test);
                 }
             } catch (IOException ex) {

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

@@ -33,10 +33,11 @@ public class History {
     /** Entries in the log. The first entry is the most recent one. */
     private List<HistoryEntry> entries;
     /** 
-     * files to ignore during cache creation.
+     * track renamed files so they can be treated in special way (for some
+     * SCMs) during cache creation.
      * These are relative to repository root.
      */
-    private List<String> ignoredFiles = new ArrayList<String>();
+    private List<String> renamedFiles = new ArrayList<String>();
 
     public History() {
         this(new ArrayList<HistoryEntry>());
@@ -46,9 +47,9 @@ public History() {
         this.entries = entries;
     }
 
-    History(List<HistoryEntry> entries, List<String> ignored) {
+    History(List<HistoryEntry> entries, List<String> renamed) {
         this.entries = entries;
-        this.ignoredFiles = ignored;
+        this.renamedFiles = renamed;
     }
 
     /**
@@ -101,11 +102,11 @@ public boolean hasTags() {
         return false;
     }
 
-    public boolean isIgnored(String file) {
-        return ignoredFiles.contains(file);
+    public boolean isRenamed(String file) {
+        return renamedFiles.contains(file);
     }
 
-    public List<String> getIgnoredFiles() {
-        return ignoredFiles;
+    public List<String> getRenamedFiles() {
+        return renamedFiles;
     }
 }

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

@@ -744,7 +744,7 @@ private void storeHistory(ConnectionResource conn, History history,
                     addDirchange.setInt(1, changesetId);
                     addFilechange.setInt(1, changesetId);
                     for (String file : entry.getFiles()) {
-                        // ignore ignored files
+                        // ignore non-existent files
                         String repodir = "";
                         try {
                             repodir = env.getPathRelativeToSourceRoot(
@@ -753,10 +753,11 @@ private void storeHistory(ConnectionResource conn, History history,
                             Logger.getLogger(
                                 JDBCHistoryCache.class.getName()).log(
                                 Level.SEVERE, null, ex);
+                            continue;
                         }
 
                         String fullPath = toUnixPath(file);
-                        if (!history.isIgnored(
+                        if (!history.isRenamed(
                             file.substring(repodir.length() + 1))) {
                                 int fileId = files.get(fullPath);
                                 addFilechange.setInt(2, fileId);
@@ -792,7 +793,7 @@ private void storeHistory(ConnectionResource conn, History history,
          * have been renamed in Mercurial repository.
          * This ensures that their complete history (follow) will be saved.
          */
-        for (String filename: history.getIgnoredFiles()) {
+        for (String filename: history.getRenamedFiles()) {
             String file_path = repository.getDirectoryName() +
                     File.separatorChar + filename;
             File file = new File(file_path);

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

@@ -51,7 +51,7 @@ class MercurialHistoryParser implements Executor.StreamHandler {
     private final MercurialRepository repository;
     private final String mydir;
     private boolean isDir;
-    private final List<String> ignoredFiles = new ArrayList<String>();
+    private final List<String> renamedFiles = new ArrayList<String>();
 
     MercurialHistoryParser(MercurialRepository repository) {
         this.repository = repository;
@@ -93,7 +93,7 @@ History parse(File file, String changeset) throws HistoryException {
             repository.removeAndVerifyOldestChangeset(entries, changeset);
         }
 
-        return new History(entries, ignoredFiles);
+        return new History(entries, renamedFiles);
     }
 
     /**
@@ -156,7 +156,7 @@ public void processStream(InputStream input) throws IOException {
                      String[] move = part.split(" \\(");
                      File f = new File(mydir + move[0]);
                      if (!move[0].isEmpty() && f.exists()) {
-                        ignoredFiles.add(move[0]);
+                        renamedFiles.add(move[0]);
                      }
                 }