2121 * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
2222 * Portions Copyright (c) 2019, Chris Ross <cross@distal.com>.
2323 * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
24+ * Portions Copyright (c) 2020, Chris Quick <gtoph00@gmail.com>.
2425 */
2526
2627package org .opengrok .indexer .history ;
5354class PerforceHistoryParser {
5455 private static final Logger LOGGER = LoggerFactory .getLogger (PerforceHistoryParser .class );
5556
56- private static final Pattern FILENAME_PATTERN = Pattern .compile ("//[^/]+/(.+)" );
57+ private static final Pattern FILENAME_PATTERN = Pattern .compile ("^ //[^/]+/(.+)" );
5758
5859 private static final String PAT_P4_DATE_TIME_BY =
5960 "on (\\ d{4})/(\\ d{2})/(\\ d{2}) (\\ d{2}):(\\ d{2}):(\\ d{2}) by ([^@]+)" ;
@@ -122,7 +123,7 @@ private History parseDirectory(File file, String sinceRevision) throws IOExcepti
122123 cmd .clear ();
123124 cmd .add (repo .RepoCommand );
124125 cmd .add ("filelog" );
125- cmd .add ("-ti " );
126+ cmd .add ("-sti " );
126127 cmd .add (directorySpec );
127128 executor = new Executor (cmd , file );
128129 executor .exec ();
@@ -141,7 +142,7 @@ History getRevisions(File file, String sinceRevision) throws IOException {
141142 ArrayList <String > cmd = new ArrayList <>();
142143 cmd .add (repo .RepoCommand );
143144 cmd .add ("filelog" );
144- cmd .add ("-lti " );
145+ cmd .add ("-slti " );
145146 cmd .add (protectPerforceFilename (file .getName ()) + asRevisionSuffix (sinceRevision ));
146147
147148 Executor executor = new Executor (cmd , file .getParentFile ());
0 commit comments