Fix getHumanishName broken for windows paths

Since d1718a the method getHumanishName was broken on windows since
the URIish is not normalized anymore. For a path like
"C:\gitRepositories\egit" the whole path was returned instead of
"egit".

Bug: 343519
Change-Id: I95056009072b99d32f288966302d0f8188b47836
Signed-off-by: Stefan Lay <stefan.lay@sap.com>

2 files changed, 18 insertions, 1 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
index c86869d088..01d3820184 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
@@ -485,6 +485,17 @@ public class URIishTest {
 	}
 
 	@Test
+	public void testGetWindowsPathHumanishName()
+			throws IllegalArgumentException,
+			URISyntaxException {
+		if (File.separatorChar == '\\') {
+			String humanishName = new URIish("file:///C\\a\\b\\c.git/")
+					.getHumanishName();
+			assertEquals("c", humanishName);
+		}
+	}
+
+	@Test
 	public void testUserPasswordAndPort() throws URISyntaxException {
 		String str = "http://user:secret@host.xy:80/some/path";
 		URIish u = new URIish(str);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
index 8c7bedc6fc..1c9397922a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
@@ -46,6 +46,7 @@
 
 package org.eclipse.jgit.transport;
 
+import java.io.File;
 import java.io.Serializable;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -551,7 +552,12 @@ public class URIish implements Serializable {
 	public String getHumanishName() throws IllegalArgumentException {
 		if ("".equals(getPath()) || getPath() == null)
 			throw new IllegalArgumentException();
-		String[] elements = getPath().split("/");
+		String s = getPath();
+		String[] elements;
+		if ("file".equals(scheme) || LOCAL_FILE.matcher(s).matches())
+			elements = s.split("[\\" + File.separatorChar + "/]");
+		else
+			elements = s.split("/");
 		if (elements.length == 0)
 			throw new IllegalArgumentException();
 		String result = elements[elements.length - 1];