Skip to content

P4 filelog parsing update #3104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2020
Merged

P4 filelog parsing update #3104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bea62e
Search p4 path at start of filelog output
gtoph Apr 8, 2020
6a143b8
Adding modification notice
gtoph Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceHistoryParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2019, Chris Ross <cross@distal.com>.
* Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
* Portions Copyright (c) 2020, Chris Quick <gtoph00@gmail.com>.
*/

package org.opengrok.indexer.history;
Expand Down Expand Up @@ -53,7 +54,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 ([^@]+)";
Expand Down Expand Up @@ -122,7 +123,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();
Expand All @@ -141,7 +142,7 @@ History getRevisions(File file, String sinceRevision) throws IOException {
ArrayList<String> 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());
Expand Down