Merge pull request #18 from kmbell/jenkins-12361

Fix for JENKINS-12361
jenkinsci · Jan 13, 2012 · ab0aa6c · ab0aa6c
2 parents b259bfe + f53ffd9
commit ab0aa6c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -325,8 +325,9 @@ private Set<String> dependentChanges(Set<String> changedFileNames) {
         Set<String> affecting = new HashSet<String>();
 
         for (String changedFile : changedFileNames) {
+            String unixChangedFile = changedFile.replace('\\', '/');
             for (String dependency : _modules) {
-                if (changedFile.startsWith(dependency)) {
+                if (unixChangedFile.startsWith(dependency)) {
                     affecting.add(changedFile);
                     break;
                 }

diff --git a/src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java b/src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java
@@ -143,6 +143,25 @@ public void testPollingLimitedToModules2() throws Exception {
         buildAndCheck(p, "dir1/f");
     }
 
+    @Bug(12361)
+    public void testPollingLimitedToModules3() throws Exception {
+        PollingResult pr;
+        FreeStyleProject p = createFreeStyleProject();
+        p.setScm(new MercurialSCM(hgInstallation, repo.getPath(), null, "dir1/f",
+                null, null, false));
+        hg(repo, "init");
+        touchAndCommit(repo, "starter");
+        pollSCMChanges(p);
+        buildAndCheck(p, "starter");
+        touchAndCommit(repo, "dir1/g");
+        pr = pollSCMChanges(p);
+        assertEquals(PollingResult.Change.INSIGNIFICANT, pr.change);
+        touchAndCommit(repo, "dir1/f");
+        pr = pollSCMChanges(p);
+        assertEquals(PollingResult.Change.SIGNIFICANT, pr.change);
+        buildAndCheck(p, "dir1/f");
+    }
+
     public void testParseStatus() throws Exception {
         assertEquals(new HashSet<String>(Arrays.asList("whatever", "added", "mo-re", "whatever-c", "initial", "more")), MercurialSCM.parseStatus(
                   "M whatever\n"