Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-05-06 19:44:29 +0000
committerMichael Valenta2002-05-06 19:44:29 +0000
commit2ed03eb419af8b46c1dca28daa0fd0e15966253f (patch)
treeb9c8fa50ad0f2e053cee665be10a30491709ee24
parent2d3bf68db68aa934a923a7a36e7a45b9cd856a9f (diff)
downloadeclipse.platform.team-2ed03eb419af8b46c1dca28daa0fd0e15966253f.tar.gz
eclipse.platform.team-2ed03eb419af8b46c1dca28daa0fd0e15966253f.tar.xz
eclipse.platform.team-2ed03eb419af8b46c1dca28daa0fd0e15966253f.zip
15164: Usupported CVS version warning while adding a project aborts entire operation
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java13
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties8
2 files changed, 14 insertions, 7 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 dfe2f19ce..293c55ec0 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
@@ -436,9 +436,16 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
Session.run(this, root, false, new ICVSRunnable() {
public void run(IProgressMonitor monitor) throws CVSException {
IStatus status = Command.VERSION.execute(null, CVSRepositoryLocation.this, monitor);
- // Only report errors on validation (ignoring warnings)
- if (status.getSeverity() == IStatus.ERROR) {
- throw new CVSException(status);
+ // Log any non-ok status
+ if (! status.isOK()) {
+ if (status.isMultiStatus()) {
+ IStatus[] children = status.getChildren();
+ for (int i = 0; i < children.length; i++) {
+ CVSProviderPlugin.log(children[i]);
+ }
+ } else {
+ CVSProviderPlugin.log(status);
+ }
}
}
}, monitor);
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 08425247d..3820c3789 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
@@ -259,7 +259,7 @@ RemoteModule.getRemoteModules=Retrieving remote modules
PruneFolderVisitor.caseVariantsExist=The following resources could not be created.
PruneFolderVisitor.caseVariantExists=Resource ''{0}'' could not be created because a case variant exists.
-Version.unsupportedVersion=Host ''{0}'' is running unsupported CVS version {1}
-Version.unsupportedCVSNT=Host ''{0}'' is running CVS NT (version {1}) which is not fully supported
-Version.unknownVersionFormat=Host ''{0}'' is running ''{1}'' which is an unknown version to the workbench.
-Version.versionNotValidRequest=Unable to determine server version. Host ''{0}'' does not support the ''cvs version'' command. \ No newline at end of file
+Version.unsupportedVersion=Host ''{0}'' is running unsupported CVS version {1}. Although most functionality works, use version 1.11.1p1 or later for full support.
+Version.unsupportedCVSNT=Host ''{0}'' is running CVS NT (version {1}) which is not fully supported. However, most functionality is available.
+Version.unknownVersionFormat=Host ''{0}'' is running ''{1}'' which is an unknown version to the workbench. Although most functionality may work, use version 1.11.1p1 or later for full support.
+Version.versionNotValidRequest=Unable to determine server version. Host ''{0}'' does not support the ''cvs version'' command. Although most functionality works, use version 1.11.1p1 or later for full support. \ No newline at end of file

Back to the top