[FIXED JENKINS-13400] Handle file:///path URLs.

jenkinsci · Apr 30, 2012 · 6c5a04e · 6c5a04e
1 parent 64bf842
commit 6c5a04e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/mercurial/HgExe.java b/src/main/java/hudson/plugins/mercurial/HgExe.java
@@ -39,6 +39,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -255,7 +256,7 @@ static boolean pathEquals(@NonNull String pathURL, @NonNull String pathAsInConfi
         if (pathAsInConfig.equals(pathURL + '/')) {
             return true;
         }
-        if (pathURL.startsWith("file:/") && new File(pathAsInConfig).toURI().toString().equals(pathURL)) {
+        if (pathURL.startsWith("file:/") && URI.create(pathURL).equals(new File(pathAsInConfig).toURI())) {
             return true;
         }
         return false;

diff --git a/src/test/java/hudson/plugins/mercurial/HgExeTest.java b/src/test/java/hudson/plugins/mercurial/HgExeTest.java
@@ -36,6 +36,7 @@ public class HgExeTest {
         assertTrue(HgExe.pathEquals("http://nowhere.net/hg", "http://nowhere.net/hg"));
         assertFalse(HgExe.pathEquals("https://nowhere.net/hg/", "http://nowhere.net/hg/"));
         assertTrue(HgExe.pathEquals("file:/var/hg/stuff", "/var/hg/stuff"));
+        assertTrue(HgExe.pathEquals("file:///var/hg/stuff", "/var/hg/stuff"));
         assertFalse(HgExe.pathEquals("file:/var/hg/stuff", "/var/hg/other"));
     }