Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-03 17:19:57 -0500
committerMichael Valenta2002-04-03 17:19:57 -0500
commitc867fe6c8f6afbbd45e69ec83a5ae23ea923a16c (patch)
treeb1f4ca2a214931fbb19ba2233873b08788ce2444
parent2e8fded278693cd0b028818873ee3945d9d6e91c (diff)
downloadeclipse.platform.team-c867fe6c8f6afbbd45e69ec83a5ae23ea923a16c.tar.gz
eclipse.platform.team-c867fe6c8f6afbbd45e69ec83a5ae23ea923a16c.tar.xz
eclipse.platform.team-c867fe6c8f6afbbd45e69ec83a5ae23ea923a16c.zip
CVSNT related stuff
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java17
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java3
2 files changed, 19 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 0b6d60fe7..7de11ebf7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -65,6 +65,7 @@ public class CVSProviderPlugin extends Plugin {
private boolean promptOnFileDelete = true;
private boolean promptOnFolderDelete = true;
private boolean showTasksOnAddAndDelete = false;
+ private boolean customizeForCVSNT = false;
private String cvsRshCommand = DEFAULT_CVS_RSH;
private String cvsServer = DEFAULT_CVS_SERVER;
private IConsoleListener consoleListener;
@@ -383,5 +384,21 @@ public class CVSProviderPlugin extends Plugin {
this.showTasksOnAddAndDelete = showTasksOnAddAndDelete;
}
+ /**
+ * Gets the customizeForCVSNT.
+ * @return Returns a boolean
+ */
+ public boolean isCustomizeForCVSNT() {
+ return customizeForCVSNT;
+ }
+
+ /**
+ * Sets the customizeForCVSNT.
+ * @param customizeForCVSNT The customizeForCVSNT to set
+ */
+ public void setCustomizeForCVSNT(boolean customizeForCVSNT) {
+ this.customizeForCVSNT = customizeForCVSNT;
+ }
+
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
index b5057e680..139267ef8 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
@@ -97,6 +97,7 @@ public abstract class Request {
int currentIncrement = 4;
int nextProgress = currentIncrement;
int worked = 0;
+ boolean isCVSNT = CVSProviderPlugin.getPlugin().isCustomizeForCVSNT();
List accumulatedStatus = new ArrayList();
for (;;) {
@@ -127,7 +128,7 @@ public abstract class Request {
// handle completion responses
if (response.equals("ok")) { //$NON-NLS-1$
break;
- } else if (response.equals("error")) { //$NON-NLS-1$
+ } else if (response.equals("error") || (isCVSNT && response.equals(""))) { //$NON-NLS-1$
if (argument.trim().length() == 0) {
argument = Policy.bind("Command.serverError", Policy.bind("Command." + getRequestId())); //$NON-NLS-1$ //$NON-NLS-2$
}

Back to the top