Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-10-22 15:17:58 +0000
committerMichael Valenta2003-10-22 15:17:58 +0000
commit2e85a1d076d2472873d540d0ff03c83d7dc08ae0 (patch)
treee7bcf77b020ab2cd076666e96a07d5397750fdb1
parent2eb76c226da3ac930122c29d1c16c7a3083697fe (diff)
downloadeclipse.platform.team-2e85a1d076d2472873d540d0ff03c83d7dc08ae0.tar.gz
eclipse.platform.team-2e85a1d076d2472873d540d0ff03c83d7dc08ae0.tar.xz
eclipse.platform.team-2e85a1d076d2472873d540d0ff03c83d7dc08ae0.zip
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
index 97121d9f9..e1a725adb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSStatus;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.Command;
@@ -41,8 +42,12 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);
session.open(Policy.subMonitorFor(monitor, 10), isServerModificationOperation());
try {
+ // TODO: This does not properly count the number of operations
+ // Changing it causes an error in the test cases
IStatus status = executeCommand(session, provider, getCVSArguments(resources), Policy.subMonitorFor(monitor, 90));
- collectStatus(status);
+ if (status.getCode() == CVSStatus.SERVER_ERROR) {
+ addError(status);
+ }
} finally {
session.close();
}

Back to the top