Perforce incremental history (#2769)

Author: cross-cisco

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

@@ -32,9 +32,12 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.opengrok.indexer.logger.LoggerFactory;
 import org.opengrok.indexer.util.Executor;
 import static org.opengrok.indexer.history.PerforceRepository.protectPerforceFilename;
 
@@ -44,16 +47,22 @@
  * @author Emilio Monti - [email protected]
  */
 public class PerforceHistoryParser {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PerforceHistoryParser.class);
+
+    History parse(File file, Repository repos) throws HistoryException {
+        return this.parse(file, null, repos);
+    }
 
     /**
      * Parse the history for the specified file.
      *
      * @param file the file to parse history for
+     * @param sinceRevision the revision before the start of desired history
      * @param repos Pointer to the {@code PerforceRepository}
      * @return object representing the file's history
      * @throws HistoryException if a problem occurs while executing p4 command
      */
-    History parse(File file, Repository repos) throws HistoryException {
+    History parse(File file, String sinceRevision, Repository repos) throws HistoryException {
         History history;
 
         if (!PerforceRepository.isInP4Depot(file, false)) {
@@ -62,9 +71,16 @@ History parse(File file, Repository repos) throws HistoryException {
 
         try {
             if (file.isDirectory()) {
+                /* TODO: Do I need to think about revisions here? */
                 history = parseDirectory(file);
             } else {
-                history = getRevisions(file, null);
+                if (sinceRevision == null || "".equals(sinceRevision)) {
+                    /* Get all revisions */
+                    history = getRevisions(file, null);
+                } else {
+                    /* Get revisions between specified and head */
+                    history = getRevisionsSince(file, sinceRevision);
+                }
             }
         } catch (IOException ioe) {
             throw new HistoryException(ioe);
@@ -84,6 +100,13 @@ private History parseDirectory(File file) throws IOException {
         return parseChanges(executor.getOutputReader());
     }
 
+    /**
+     * Retrieve the history of a given file.
+     *
+     * @param file the file to parse history for
+     * @param rev the revision at which to end history
+     * @return object representing the file's history
+     */
     public static History getRevisions(File file, String rev) throws IOException {
         ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("p4");
@@ -96,6 +119,41 @@ public static History getRevisions(File file, String rev) throws IOException {
         return parseFileLog(executor.getOutputReader());
     }
 
+    /**
+     * Retrieve the history of a given file, beginning after the specified
+     * revision.
+     *
+     * @param file the file to parse history for
+     * @param rev the revision before the start of desired history
+     * @return object representing the file's history
+     */
+    public static History getRevisionsSince(File file, String rev) throws IOException {
+        ArrayList<String> cmd = new ArrayList<String>();
+        cmd.add("p4");
+        cmd.add("filelog");
+        cmd.add("-lti");
+        /* Okay.  This is a little cheeky.  getRevisionCmd(String,String) gives
+         * a range spec that _includes_ the first revision.  But, we don't want
+         * that in this case here.  So, presume that "rev" is always an integer
+         * for perforce, add one to it, then convert back into a string to
+         * pass into getRevisionCmd as a starting revision. */
+        try {
+            Integer irev = Integer.parseInt(rev);
+            irev += 1;
+            rev = irev.toString();
+        } catch (NumberFormatException e) {
+            LOGGER.log(Level.WARNING,
+                    "Unable to increment revision {}, NumberFormatException",
+                    new Object[]{rev});
+            /* Move along with rev unchanged... */
+        }
+        cmd.add(file.getName() + PerforceRepository.getRevisionCmd(rev, "now"));
+        Executor executor = new Executor(cmd, file.getCanonicalFile().getParentFile());
+        executor.exec();
+
+        return parseFileLog(executor.getOutputReader());
+    }
+
     private static final Pattern REVISION_PATTERN = Pattern.compile("#\\d+ change (\\d+) \\S+ on (\\d{4})/(\\d{2})/(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) by ([^@]+)");
     private static final Pattern CHANGE_PATTERN = Pattern.compile("Change (\\d+) on (\\d{4})/(\\d{2})/(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) by ([^@]+)@\\S* '([^']*)'");
 

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

@@ -219,6 +219,12 @@ History getHistory(File file) throws HistoryException {
         return new PerforceHistoryParser().parse(file, this);
     }
 
+    @Override
+    History getHistory(File file, String sinceRevision)
+            throws HistoryException {
+        return new PerforceHistoryParser().parse(file, sinceRevision, this);
+    }
+
     @Override
     String determineParent(boolean interactive) throws IOException {
         return null;
@@ -229,16 +235,40 @@ String determineBranch(boolean interactive) {
         return null;
     }
     /**
-     * Parse internal rev number and returns it in format suitable for P4 command-line.
+     * Parse internal rev number and return it in a format suitable for P4 command-line.
      * @param rev Internal rev number.
      * @return rev number formatted for P4 command-line.
      */
     public static String getRevisionCmd(String rev) {
-        if(rev == null || "".equals(rev)) {
+        if (rev == null || "".equals(rev)) {
             return "";
         }
         return "@" + rev;
     }
+    /**
+     * Parse rev numbers and return it as a range in a format suitable for P4 command-line.
+     * @param first First revision number.
+     * @param last Last revision number.
+     * @return rev number formatted for P4 command-line.
+     */
+    public static String getRevisionCmd(String first, String last) {
+        if ((first == null || "".equals(first)) &&
+            ((last == null) || "".equals(last))) {
+            return "";
+        }
+        String ret = "@";
+        if (first == null || "".equals(first)) {
+            ret += "0,";
+        } else {
+            ret += first + ",";
+        }
+        if (last == null || "".equals(last)) {
+            ret += "now";
+        } else {
+            ret += last;
+        }
+        return ret;
+    }
 
     @Override
     String determineCurrentVersion(boolean interactive) throws IOException {