[JENKINS-17652] trim quotes from paths before comparing file paths to…

… the view paths
jenkinsci · Apr 25, 2013 · 6ed6b70 · 6ed6b70
1 parent 448fd0a
commit 6ed6b70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -1375,6 +1375,10 @@ public static boolean doesFilenameMatchP4Pattern(String filename, String pattern
         patternString = patternString.replaceAll("\\*", "[^/]*");
         patternString = patternString.replaceAll("\\.\\.\\.", ".*");
         patternString = patternString.replaceAll("%%[0-9]", "[^/]*");
+        patternString = patternString.replaceAll("^\"", "");
+        patternString = patternString.replaceAll("\"$", "");
+        filename = filename.replaceAll("^\"", "");
+        filename = filename.replaceAll("\"$", "");
         Pattern pattern = Pattern.compile(patternString, !caseSensitive ? Pattern.CASE_INSENSITIVE : 0);
         Matcher matcher = pattern.matcher(filename);
         return matcher.matches();

diff --git a/src/test/java/hudson/plugins/perforce/PerforceSCMTest.java b/src/test/java/hudson/plugins/perforce/PerforceSCMTest.java
@@ -279,6 +279,12 @@ public void testFilenameP4PatternMatcher() throws Exception {
         assertEquals(false, PerforceSCM.doesFilenameMatchP4Pattern(
                 "//depot/SomeFile/testFile",
                 "//depot/%%9", true));
+        assertEquals(true, PerforceSCM.doesFilenameMatchP4Pattern(
+                "//depot/Some File/testFile",
+                "\"//depot/Some File/testFile\"", true));
+        assertEquals(true, PerforceSCM.doesFilenameMatchP4Pattern(
+                "\"//depot/Some File/testFile\"",
+                "//depot/Some File/testFile", true));
     }
 
     public void testFileInView() throws Exception {