initial changes for Mercurial per partes history

Author: Vladimir Kotal

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

@@ -68,15 +68,15 @@ class MercurialHistoryParser implements Executor.StreamHandler {
      * specified one.
      *
      * @param file the file or directory to get history for
-     * @param changeset the changeset right before the first one to fetch, or
+     * @param sinceRevision the changeset right before the first one to fetch, or
      * {@code null} if all changesets should be fetched
      * @return history for the specified file or directory
      * @throws HistoryException if an error happens when parsing the history
      */
-    History parse(File file, String changeset) throws HistoryException {
+    History parse(File file, String sinceRevision, String tillRevision) throws HistoryException {
         isDir = file.isDirectory();
         try {
-            Executor executor = repository.getHistoryLogExecutor(file, changeset);
+            Executor executor = repository.getHistoryLogExecutor(file, sinceRevision, tillRevision,false);
             int status = executor.exec(true, this);
 
             if (status != 0) {
@@ -93,8 +93,8 @@ History parse(File file, String changeset) throws HistoryException {
         // from the list, since only the ones following it should be returned.
         // Also check that the specified changeset was found, otherwise throw
         // an exception.
-        if (changeset != null) {
-            repository.removeAndVerifyOldestChangeset(entries, changeset);
+        if (sinceRevision != null) {
+            repository.removeAndVerifyOldestChangeset(entries, sinceRevision);
         }
 
         return new History(entries, renamedFiles);

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

@@ -0,0 +1,67 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opengrok.indexer.history;
+
+import org.opengrok.indexer.util.Executor;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.function.Consumer;
+
+class MercurialHistoryParserRevisionsOnly implements Executor.StreamHandler {
+    private final MercurialRepository repository;
+    private final Consumer<String> visitor;
+
+    MercurialHistoryParserRevisionsOnly(MercurialRepository repository, Consumer<String> visitor) {
+        this.repository = repository;
+        this.visitor = visitor;
+    }
+
+    void parse(File file, String sinceRevision) throws HistoryException {
+        try {
+            Executor executor = repository.getHistoryLogExecutor(file, sinceRevision, null, true);
+            int status = executor.exec(true, this);
+
+            if (status != 0) {
+                throw new HistoryException("Failed to get revisions for: \"" +
+                        file.getAbsolutePath() +
+                        "\" Exit code: " + status); // TODO log sinceRevision
+            }
+        } catch (IOException e) {
+            throw new HistoryException("Failed to get history for: \"" +
+                    file.getAbsolutePath() + "\"", e);
+        }
+    }
+
+    @Override
+    public void processStream(InputStream input) throws IOException {
+        BufferedReader in = new BufferedReader(new InputStreamReader(input));
+        String s;
+        while ((s = in.readLine()) != null) {
+            visitor.accept(s);
+        }
+    }
+}

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

@@ -33,6 +33,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.TreeSet;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -50,7 +51,7 @@
  * Access to a Mercurial repository.
  *
  */
-public class MercurialRepository extends Repository {
+public class MercurialRepository extends RepositoryWithPerPartesHistory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MercurialRepository.class);
 
@@ -81,6 +82,7 @@ public class MercurialRepository extends Repository {
     static final String END_OF_ENTRY
             = "mercurial_history_end_of_entry";
 
+    private static final String TEMPLATE_REVS = "{rev}\\n";
     private static final String TEMPLATE_STUB
             = CHANGESET + "{rev}:{node|short}\\n"
             + USER + "{author}\\n" + DATE + "{date|isodate}\\n"
@@ -151,12 +153,14 @@ String determineBranch(CommandTimeoutType cmdType) throws IOException {
      * @param sinceRevision the oldest changeset to return from the executor, or
      *                  {@code null} if all changesets should be returned.
      *                  For files this does not apply and full history is returned.
+     * @param tillRevision end revision
+     * @param revisionsOnly get only revision numbers
      * @return An Executor ready to be started
      */
-    Executor getHistoryLogExecutor(File file, String sinceRevision)
+    Executor getHistoryLogExecutor(File file, String sinceRevision, String tillRevision, boolean revisionsOnly)
             throws HistoryException, IOException {
+
         String filename = getRepoRelativePath(file);
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
         List<String> cmd = new ArrayList<>();
         ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
@@ -166,15 +170,14 @@ Executor getHistoryLogExecutor(File file, String sinceRevision)
         if (file.isDirectory()) {
             // If this is non-default branch we would like to get the changesets
             // on that branch and also follow any changesets from the parent branch.
+            // TODO tillRevision
             if (sinceRevision != null) {
                 cmd.add("-r");
                 String[] parts = sinceRevision.split(":");
                 if (parts.length == 2) {
                     cmd.add("reverse(" + parts[0] + "::'" + getBranch() + "')");
                 } else {
-                    throw new HistoryException(
-                            "Don't know how to parse changeset identifier: "
-                            + sinceRevision);
+                    throw new HistoryException("Don't know how to parse changeset identifier: " + sinceRevision);
                 }
             } else {
                 cmd.add("-r");
@@ -197,10 +200,14 @@ Executor getHistoryLogExecutor(File file, String sinceRevision)
         }
 
         cmd.add("--template");
-        if (file.isDirectory()) {
-            cmd.add(this.isHandleRenamedFiles() ? DIR_TEMPLATE_RENAMED : DIR_TEMPLATE);
+        if (revisionsOnly) {
+            cmd.add(TEMPLATE_REVS);
         } else {
-            cmd.add(FILE_TEMPLATE);
+            if (file.isDirectory()) {
+                cmd.add(this.isHandleRenamedFiles() ? DIR_TEMPLATE_RENAMED : DIR_TEMPLATE);
+            } else {
+                cmd.add(FILE_TEMPLATE);
+            }
         }
 
         if (!filename.isEmpty()) {
@@ -259,7 +266,7 @@ private HistoryRevResult getHistoryRev(
      * @param fullpath file path
      * @param full_rev_to_find revision number (in the form of
      * {rev}:{node|short})
-     * @returns original filename
+     * @return original filename
      */
     private String findOriginalName(String fullpath, String full_rev_to_find)
             throws IOException {
@@ -511,9 +518,17 @@ History getHistory(File file) throws HistoryException {
         return getHistory(file, null);
     }
 
+    public void accept(String sinceRevision, Consumer<String> visitor) throws HistoryException {
+        new MercurialHistoryParserRevisionsOnly(this, visitor).
+                parse(new File(getDirectoryName()), sinceRevision);
+    }
+
+    History getHistory(File file, String sinceRevision) throws HistoryException {
+        return getHistory(file, sinceRevision, null);
+    }
+
     @Override
-    History getHistory(File file, String sinceRevision)
-            throws HistoryException {
+    History getHistory(File file, String sinceRevision, String tillRevision) throws HistoryException {
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         // Note that the filtering of revisions based on sinceRevision is done
         // in the history log executor by passing appropriate options to
@@ -522,8 +537,7 @@ History getHistory(File file, String sinceRevision)
         // for file, the file is renamed and its complete history is fetched
         // so no sinceRevision filter is needed.
         // See findOriginalName() code for more details.
-        History result = new MercurialHistoryParser(this).parse(file,
-                sinceRevision);
+        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,