Merge pull request #41 from thomedw/path-equal

[FIXED JENKINS-18252] Added ability to recognize non-URL file paths in /notifyCommit
jenkinsci · Aug 2, 2013 · 9d41ba0 · 9d41ba0
2 parents fc8a1a7 + 15808c3
commit 9d41ba0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/mercurial/HgExe.java b/src/main/java/hudson/plugins/mercurial/HgExe.java
@@ -273,6 +273,9 @@ static boolean pathEquals(@NonNull String pathURL, @NonNull String pathAsInConfi
         if (pathURL.startsWith("file:/") && URI.create(pathURL).equals(new File(pathAsInConfig).toURI())) {
             return true;
         }
+        if (pathAsInConfig.startsWith("file:/") && URI.create(pathAsInConfig).equals(new File(pathURL).toURI())) {
+            return true;
+        }
         return false;
     }
 }
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialStatus.java b/src/main/java/hudson/plugins/mercurial/MercurialStatus.java
@@ -16,6 +16,7 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
+import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -53,22 +54,31 @@ private static int getPort(URI uri) {
         int port = uri.getPort();
         if ( port < 0 ){
             String scheme = uri.getScheme();
-            if ( scheme.equals("http") ){
+            if ("http".equals(scheme)){
                 port = 80;
-            } else if ( scheme.equals("https") ) {
+            } else if ("https".equals(scheme)) {
                 port = 443;
-            } else if ( scheme.equals("ssh") ) {
+            } else if ("ssh".equals(scheme)) {
                 port = 22;
             }
         }
         return port;
     }
+
+	@Nonnull
+	private static String getScheme(URI uri) {
+		String scheme = uri.getScheme();
+		if (scheme == null) {
+			return "file";
+		}
+		return scheme;
+	}
 
     static boolean looselyMatches(URI notifyUri, String repository) {
         boolean result = false;
         try {
             URI repositoryUri = new URI(repository);
-            result = Objects.equal(notifyUri.getScheme(), repositoryUri.getScheme()) 
+            result = getScheme(notifyUri).equals(getScheme(repositoryUri))
                 && Objects.equal(notifyUri.getHost(), repositoryUri.getHost()) 
                 && getPort(notifyUri) == getPort(repositoryUri)
                 && Objects.equal(notifyUri.getPath(), repositoryUri.getPath())

diff --git a/src/test/java/hudson/plugins/mercurial/HgExeTest.java b/src/test/java/hudson/plugins/mercurial/HgExeTest.java
@@ -38,6 +38,9 @@ public class HgExeTest {
             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"));
+            assertTrue(HgExe.pathEquals("/var/hg/stuff", "file:/var/hg/stuff"));
+            assertTrue(HgExe.pathEquals("/var/hg/stuff", "file:///var/hg/stuff"));
+            assertFalse(HgExe.pathEquals("/var/hg/other", "file:/var/hg/stuff"));
         }
     }
 }
diff --git a/src/test/java/hudson/plugins/mercurial/MercurialStatusTest.java b/src/test/java/hudson/plugins/mercurial/MercurialStatusTest.java
@@ -58,6 +58,12 @@ public class MercurialStatusTest {
       assertFalse( MercurialStatus.looselyMatches(new URI("http://somehost/path"), "http://somehost/") );
       assertFalse( MercurialStatus.looselyMatches(new URI("http://somehost/path"), "http://somehost/path?query=test") );
       assertFalse( MercurialStatus.looselyMatches(new URI("http://somehost/path"), "http://somehost:81/path") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("/var/hg/stuff"), "/var/hg/stuff") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("file:///var/hg/stuff"), "/var/hg/stuff") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("file:/var/hg/stuff"), "/var/hg/stuff") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("/var/hg/stuff"), "file:/var/hg/stuff") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("/var/hg/stuff"), "file:///var/hg/stuff") );
+      assertTrue( MercurialStatus.looselyMatches(new URI("file:///var/hg/stuff"), "file:///var/hg/stuff") );
   }
 
 }