1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
/*******************************************************************************
* Copyright (c) 2000, 2003 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.core.client;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.Policy;
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
/**
* Runs the CVS diff command.
*/
public class Diff extends Command {
/*** Local options: specific to diff ***/
public static final LocalOption UNIFIED_FORMAT = new LocalOption("-u"); //$NON-NLS-1$
public static final LocalOption CONTEXT_FORMAT = new LocalOption("-c"); //$NON-NLS-1$
public static final LocalOption INCLUDE_NEWFILES = new LocalOption("-N"); //$NON-NLS-1$
public static final LocalOption BRIEF = new LocalOption("--brief"); //$NON-NLS-1$
protected Diff() { }
protected String getRequestId() {
return "diff"; //$NON-NLS-1$
}
/**
* Overwritten to throw the CVSDiffException if the server returns an error, because it just does
* so when there is a difference between the checked files.
*/
protected IStatus doExecute(Session session, GlobalOption[] globalOptions, LocalOption[] localOptions,
String[] arguments, ICommandOutputListener listener, IProgressMonitor monitor) throws CVSException {
try {
return super.doExecute(session, globalOptions, localOptions, arguments, listener, monitor);
} catch (CVSServerException e) {
if (e.containsErrors()) throw e;
return e.getStatus();
}
}
protected ICVSResource[] sendLocalResourceState(Session session, GlobalOption[] globalOptions,
LocalOption[] localOptions, ICVSResource[] resources, IProgressMonitor monitor)
throws CVSException {
checkResourcesManaged(resources);
DiffStructureVisitor visitor = new DiffStructureVisitor(session);
visitor.visit(session, resources, monitor);
return resources;
}
protected String getServerErrorMessage() {
return Policy.bind("Diff.serverError"); //$NON-NLS-1$
}
}
|
