From 7bea62eb8413fee7a06663d6eda01884a0e388c0 Mon Sep 17 00:00:00 2001 From: gtoph Date: Wed, 8 Apr 2020 10:26:39 -0700 Subject: [PATCH 1/2] Search p4 path at start of filelog output Limit to contributing integrations --- .../org/opengrok/indexer/history/PerforceHistoryParser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java index b25f1753f75..a0bd0095374 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java @@ -53,7 +53,7 @@ class PerforceHistoryParser { private static final Logger LOGGER = LoggerFactory.getLogger(PerforceHistoryParser.class); - private static final Pattern FILENAME_PATTERN = Pattern.compile("//[^/]+/(.+)"); + private static final Pattern FILENAME_PATTERN = Pattern.compile("^//[^/]+/(.+)"); private static final String PAT_P4_DATE_TIME_BY = "on (\\d{4})/(\\d{2})/(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) by ([^@]+)"; @@ -122,7 +122,7 @@ private History parseDirectory(File file, String sinceRevision) throws IOExcepti cmd.clear(); cmd.add(repo.RepoCommand); cmd.add("filelog"); - cmd.add("-ti"); + cmd.add("-sti"); cmd.add(directorySpec); executor = new Executor(cmd, file); executor.exec(); @@ -141,7 +141,7 @@ History getRevisions(File file, String sinceRevision) throws IOException { ArrayList cmd = new ArrayList<>(); cmd.add(repo.RepoCommand); cmd.add("filelog"); - cmd.add("-lti"); + cmd.add("-slti"); cmd.add(protectPerforceFilename(file.getName()) + asRevisionSuffix(sinceRevision)); Executor executor = new Executor(cmd, file.getParentFile()); From 6a143b8002dad06e86b41bd340be07b51fd1da02 Mon Sep 17 00:00:00 2001 From: gtoph Date: Wed, 8 Apr 2020 17:20:10 -0700 Subject: [PATCH 2/2] Adding modification notice --- .../java/org/opengrok/indexer/history/PerforceHistoryParser.java | 1 + 1 file changed, 1 insertion(+) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java index a0bd0095374..98c5d47ff84 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java @@ -21,6 +21,7 @@ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. * Portions Copyright (c) 2019, Chris Ross . * Portions Copyright (c) 2020, Chris Fraire . + * Portions Copyright (c) 2020, Chris Quick . */ package org.opengrok.indexer.history;