Attachment 115750 Details for Bug 250377 – Another patch; this one really works.

[patch] Another patch; this one really works.

SubversiveSession.java.patch (text/plain), 4.02 KB, created by Douglas Palmer

on 2008-10-21 16:45:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Palmer

Created: 2008-10-21 16:45:24 EDT

Size: 4.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.buckminster.subversive
>Index: src/java/org/eclipse/buckminster/subversive/internal/SubversiveSession.java
>===================================================================
>--- src/java/org/eclipse/buckminster/subversive/internal/SubversiveSession.java	(revision 9526)
>+++ src/java/org/eclipse/buckminster/subversive/internal/SubversiveSession.java	(working copy)
>@@ -509,7 +509,7 @@
> 			if(scheme != null)
> 			{
> 				bld.append(scheme);
>-				bld.append(':');
>+				bld.append("://");
> 			}
> 
> 			String username = null;
>@@ -534,12 +534,15 @@
> 							password = null;
> 					}
> 				}
>-				bld.append("//");
> 				bld.append(authority);
> 			}
> 			m_username = username;
> 			m_password = password;
> 
>+			if(fullPath.getDevice() != null)
>+			{
>+				bld.append('/');
>+			}
> 			bld.append(fullPath.removeLastSegments(relPathLen));
> 			String urlLeadIn = bld.toString();
> 
>@@ -551,7 +554,10 @@
> 			if(m_trunkStructure)
> 			{
> 				if(relPathLen > 1)
>+				{
> 					modulePath = fullPath.removeFirstSegments(idx + 1);
>+					modulePath = modulePath.setDevice(null);
>+				}
> 			}
> 			else
> 				modulePath = Path.fromPortableString(fullPath.lastSegment());
>@@ -905,7 +911,7 @@
> 		if(uri == null)
> 			return null;
> 
>-		String path = uri.getPath();
>+		String path = uri.toString();
> 		if(path == null)
> 			return null;
> 
>@@ -921,7 +927,7 @@
> 		String parentPath = path.substring(0, lastSlash);
> 		try
> 		{
>-			return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), parentPath, uri.getQuery(), uri.getFragment());
>+			return new URI(parentPath);
> 		}
> 		catch(URISyntaxException e)
> 		{
>@@ -949,8 +955,7 @@
> 				list = SVNUtility.list(m_proxy, new SVNEntryRevisionReference(url.toString(), null, m_revision), ISVNConnector.Depth.IMMEDIATES, SVNEntry.Fields.ALL, ISVNConnector.Options.NONE, svnMon);
> 				if(list == null || list.length == 0)
> 				{
>-					if(logger.isDebugEnabled())
>-						logger.debug(String.format("Remote folder had no entries %s", key));
>+					logger.debug("Remote folder had no entries %s", key);
> 					list = s_emptyFolder;
> 				}
> 				m_listCache.put(key, list);
>@@ -993,11 +998,14 @@
> 		int port = url.getPort();
> 		bld.append(protocol);
> 		bld.append("://");
>-		bld.append(url.getHost());
>-		if(url.getPort() != -1)
>+		if(url.getHost() != null)
> 		{
>-			bld.append(":");
>-			bld.append(port);
>+			bld.append(url.getHost());
>+			if(port != -1)
>+			{
>+				bld.append(":");
>+				bld.append(port);
>+			}
> 		}
> 
> 		bld.append(url.getPath());
>@@ -1071,8 +1079,8 @@
> 					continue;
> 
> 				URI cmp = repoAccessCmp.getSvnURL();
>-				if(!(url.getHost().equals(cmp.getHost()) && url.getScheme().equals(cmp.getScheme()) && url
>-						.getPort() == cmp.getPort()))
>+				if(!(Trivial.equalsAllowNull(url.getHost(),cmp.getHost()) && Trivial.equalsAllowNull(url.getScheme(),cmp.getScheme()) 
>+						&& url.getPort() == cmp.getPort()))
> 					continue;
> 
> 				String[] cmpSegs = Path.fromPortableString(cmp.getPath()).segments();
>@@ -1111,11 +1119,14 @@
> 				StringBuilder bld = new StringBuilder();
> 				bld.append(url.getScheme());
> 				bld.append("://");
>-				bld.append(url.getHost());
>-				if(url.getPort() >= 0)
>+				if(url.getHost() != null)
> 				{
>-					bld.append(':');
>-					bld.append(url.getPort());
>+					bld.append(url.getHost());
>+					if(url.getPort() != -1)
>+					{
>+						bld.append(":");
>+						bld.append(url.getPort());
>+					}
> 				}
> 				for(int pdx = 0; pdx < idx; ++pdx)
> 				{
>@@ -1159,8 +1170,8 @@
> 			for(RepositoryAccess repoAccessCmp : commonRoots)
> 			{
> 				URI cmp = repoAccessCmp.getSvnURL();
>-				if(!(url.getHost().equals(cmp.getHost()) && url.getScheme().equals(cmp.getScheme()) && url
>-						.getPort() == cmp.getPort()))
>+				if(!(Trivial.equalsAllowNull(url.getHost(),cmp.getHost()) && Trivial.equalsAllowNull(url.getScheme(),cmp.getScheme()) 
>+						&& url.getPort() == cmp.getPort()))
> 					continue;
> 
> 				String[] cmpSegs = Path.fromPortableString(cmp.getPath()).segments();

Flags:

thomas: iplog+

Actions: View | Diff

Attachments on bug 250377: 115553 | 115750