filter extra history entries by hand

Author: Vladimir Kotal

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

@@ -33,6 +33,7 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -70,6 +71,7 @@ class MercurialHistoryParser implements Executor.StreamHandler {
      * @param file the file or directory to get history for
      * @param sinceRevision the changeset right before the first one to fetch, or
      * {@code null} if all changesets should be fetched
+     * @param tillRevision end revision or {@code null}
      * @return history for the specified file or directory
      * @throws HistoryException if an error happens when parsing the history
      */
@@ -97,9 +99,24 @@ History parse(File file, String sinceRevision, String tillRevision) throws Histo
             repository.removeAndVerifyOldestChangeset(entries, sinceRevision);
         }
 
+        // TODO: add comment
+        if (repository.isHandleRenamedFiles() && file.isFile() && tillRevision != null) {
+            removeChangesets(entries, tillRevision);
+        }
+
         return new History(entries, renamedFiles);
     }
 
+    private void removeChangesets(List<HistoryEntry> entries, String tillRevision) {
+        for (Iterator<HistoryEntry> iter = entries.listIterator(); iter.hasNext(); ) {
+            HistoryEntry entry = iter.next();
+            if (entry.getRevision().equals(tillRevision)) {
+                break;
+            }
+            iter.remove();
+        }
+    }
+
     /**
      * Process the output from the {@code hg log} command and collect
      * {@link HistoryEntry} elements.

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

@@ -223,26 +223,12 @@ Executor getHistoryLogExecutor(File file, String sinceRevision, String tillRevis
             //
             // Getting history for individual files should only be done when generating history for renamed files
             // so the fact that filtering on sinceRevision does not work does not matter there as history
-            // from the initial changeset is needed. The tillRevision filtering works.
-
+            // from the initial changeset is needed. The tillRevision filtering works however not
+            // in combination with --follow.
             if (this.isHandleRenamedFiles()) {
                 // When using --follow, the returned revisions are from newest to oldest, hence no reverse() is needed.
                 cmd.add("--follow");
             }
-
-            // Note: assumes one of them is not null
-            if ((sinceRevision != null) || (tillRevision != null)) {
-                cmd.add("-r");
-                StringBuilder stringBuilder = new StringBuilder();
-                if (sinceRevision != null) {
-                    stringBuilder.append(getRevisionNum(sinceRevision));
-                }
-                stringBuilder.append(":");
-                if (tillRevision != null) {
-                    stringBuilder.append(getRevisionNum(tillRevision));
-                }
-                cmd.add(stringBuilder.toString());
-            }
         }
 
         cmd.add("--template");
@@ -584,7 +570,7 @@ History getHistory(File file, String sinceRevision, String tillRevision) throws
         // so no sinceRevision filter is needed.
         // See findOriginalName() code for more details.
         History result = new MercurialHistoryParser(this).parse(file, sinceRevision, tillRevision);
-        
+
         // Assign tags to changesets they represent.
         // We don't need to check if this repository supports tags,
         // because we know it :-)