Merge pull request #183 from hhandberg/issue-JENKINS-44076

[JENKINS-44076] : hudson.scm.SubversionChangeLogSet.LogEntry.getAffectedPaths() does not provide expected result for parametrized Repository URLs
jenkinsci · Jun 16, 2017 · 8ef2211 · 8ef2211
2 parents b1a34e7 + 0e6689c
commit 8ef2211
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/hudson/scm/SubversionChangeLogSet.java b/src/main/java/hudson/scm/SubversionChangeLogSet.java
@@ -262,7 +262,16 @@ private String preparePath(String path) {
                 }
             ModuleLocation[] locations = ((SubversionSCM)scm).getLocations();
             for (int i = 0; i < locations.length; i++) {
-                String commonPart = findCommonPart(locations[i].remote, path);
+                ModuleLocation expandedLocation = locations[i].getExpandedLocation(job);
+                // If the remote URL features a trailing '@REV' entry, strip it off before looking for common part
+                String expandedRemote = expandedLocation.remote;
+                if (expandedLocation.getRevision(null) != null) {
+                    int idx = expandedRemote.lastIndexOf('@');
+                    if (idx >= 0) {
+                        expandedRemote = expandedRemote.substring(0, idx);
+                    }
+                }
+                String commonPart = findCommonPart(expandedRemote, path);
                 if (commonPart != null) {
                     if (path.startsWith("/")) {
                         path = path.substring(1);