19692: [CVS CVSNT] Eclipse should detect use of a repository prefix

2 files changed, 11 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
index 580fdf91f..4d001019c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
@@ -465,6 +465,16 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 							CVSProviderPlugin.log(status);
 						}
 					}
+					if (getServerPlatform() == CVSNT_SERVER) {
+						// check for the use of a repository prefix
+						if (getRootDirectory().startsWith(Session.SERVER_SEPARATOR)) {
+							// A prefix is in use. Log a warning
+							CVSProviderPlugin.log(new Status(IStatus.WARNING, CVSProviderPlugin.ID, 0,
+								Policy.bind("CVSRepositoryLocation.cvsntPrefix", getLocation()), null)); //$NON-NLS-1$
+							throw new CVSAuthenticationException(new Status(IStatus.WARNING, CVSProviderPlugin.ID, 0,
+								Policy.bind("CVSRepositoryLocation.cvsntPrefix", getLocation()), null));
+						}
+					}
 				}
 			}, monitor);
 		} catch (CVSException e) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index de5d92738..4e777c360 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -202,6 +202,7 @@ CVSRepositoryLocation.errorCaching=Error occurred while saving password for {0}
 CVSRepositoryLocation.errorFlushing=Error occurred while flushing password for {0}
 CVSRepositoryLocation.openingConnection=Opening connection to {0}
 CVSRepositoryLocation.usernameRequired=A username is required to make a connection
+CVSRepositoryLocation.cvsntPrefix=CVSNT repository ''{0}'' is configured to use a repository prefix. However, CVSNT does not always properly communicate resource paths in this mode resulting in the failure of some specialized Eclipse CVS operations. The use of a repository prefix should be disable if the full functionality of the Eclipse CVS client is desired
 
 ProjectDescriptionContentHandler.xml=Error parsing project description file