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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
/*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.mappings;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.mapping.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.diff.IDiff;
import org.eclipse.team.core.diff.IThreeWayDiff;
import org.eclipse.team.core.history.IFileRevision;
import org.eclipse.team.core.mapping.*;
import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.SyncInfoFilter;
import org.eclipse.team.core.synchronize.SyncInfoFilter.ContentComparisonSyncInfoFilter;
import org.eclipse.team.core.variants.IResourceVariant;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.PruneFolderVisitor;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.CacheBaseContentsOperation;
import org.eclipse.team.internal.ccvs.ui.operations.CacheRemoteContentsOperation;
import org.eclipse.team.internal.core.mapping.CompoundResourceTraversal;
public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext {
private final int type;
public static IMergeContext createContext(IResourceMappingScope scope, boolean refresh, int type, IProgressMonitor monitor) throws CoreException {
Subscriber subscriber = CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber();
WorkspaceSubscriberContext mergeContext = new WorkspaceSubscriberContext(subscriber, scope, type);
mergeContext.initialize(monitor, refresh);
return mergeContext;
}
protected WorkspaceSubscriberContext(Subscriber subscriber, IResourceMappingScope scope, int type) {
super(subscriber, scope);
this.type = type;
}
public void markAsMerged(final IDiff node, final boolean inSyncHint, IProgressMonitor monitor) throws CoreException {
run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
// Get the latest sync info for the file (i.e. not what is in the set).
// We do this because the client may have modified the file since the
// set was populated.
IResource resource = getDiffTree().getResource(node);
if (resource.getType() != IResource.FILE)
return;
SyncInfo info = getSyncInfo(resource);
ensureRemotesMatch(resource, node, info);
if (info instanceof CVSSyncInfo) {
CVSSyncInfo cvsInfo = (CVSSyncInfo) info;
cvsInfo.makeOutgoing(monitor);
if (inSyncHint) {
// Compare the contents of the file with the remote
// and make the file in-sync if they match
ContentComparisonSyncInfoFilter comparator = new SyncInfoFilter.ContentComparisonSyncInfoFilter(false);
if (resource.getType() == IResource.FILE && info.getRemote() != null) {
if (comparator.compareContents((IFile)resource, info.getRemote(), Policy.subMonitorFor(monitor, 100))) {
ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile)resource);
cvsFile.checkedIn(null, false /* not a commit */);
}
}
}
}
}
}, getMergeRule(node), IResource.NONE, monitor);
}
protected void ensureRemotesMatch(IResource resource, IDiff node, SyncInfo info) throws CVSException {
IResourceVariant variant = info.getRemote();
IFileRevision remote = getRemote(node);
if (variant != null && remote != null && remote instanceof IFileRevision) {
String ci1 = variant.getContentIdentifier();
String ci2 = ((IFileRevision)remote).getContentIdentifier();
if (!ci1.equals(ci2)) {
throw new CVSException(NLS.bind(CVSUIMessages.WorkspaceSubscriberContext_0, resource.getFullPath().toString()));
}
}
}
private IFileRevision getRemote(IDiff node) {
if (node == null) return null;
if (node instanceof IThreeWayDiff) {
IThreeWayDiff twd = (IThreeWayDiff) node;
return getRemote(twd.getRemoteChange());
}
if (node instanceof IResourceDiff) {
IResourceDiff rd = (IResourceDiff) node;
return rd.getAfterState();
}
return null;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.MergeContext#merge(org.eclipse.team.core.diff.IDiffNode, boolean, org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus merge(IDiff delta, boolean force, IProgressMonitor monitor) throws CoreException {
// First, verify that the provided delta matches the current state
// i.e. it is possible that a concurrent change has occurred
SyncInfo info = getSyncInfo(getDiffTree().getResource(delta));
if (getMergeType() == ISynchronizationContext.TWO_WAY) {
force = true;
}
if (info == null || info.getKind() == SyncInfo.IN_SYNC || (SyncInfo.getDirection(info.getKind()) == SyncInfo.OUTGOING && !force)) {
// Seems like this one was already merged so return OK
return Status.OK_STATUS;
}
// IDiffNode currentState = SyncInfoToDiffConverter.getDeltaFor(info);
// if (!equals(currentState, delta)) {
// throw new CVSException(NLS.bind(CVSUIMessages.CVSMergeContext_1, delta.getPath()));
// }
IStatus status = super.merge(delta, force, monitor);
if (status.isOK() && delta.getKind() == IDiff.REMOVE) {
IResource resource = getDiffTree().getResource(delta);
if (resource.getType() == IResource.FILE && !resource.exists()) {
// TODO: This behavior is specific to an update from the same branch
ICVSResource localResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
localResource.unmanage(monitor);
}
pruneEmptyParents(new IDiff[] { delta });
}
return status;
}
private void pruneEmptyParents(IDiff[] deltas) throws CVSException {
// TODO: A more explicit tie in to the pruning mechanism would be preferable.
// i.e. I don't like referencing the option and visitor directly
if (!CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()) return;
ICVSResource[] cvsResources = new ICVSResource[deltas.length];
for (int i = 0; i < cvsResources.length; i++) {
cvsResources[i] = CVSWorkspaceRoot.getCVSResourceFor(getDiffTree().getResource(deltas[i]));
}
new PruneFolderVisitor().visit(
CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()),
cvsResources);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.provider.MergeContext#getMergeType()
*/
public int getMergeType() {
return type;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.SubscriberMergeContext#refresh(org.eclipse.core.resources.mapping.ResourceTraversal[], int, org.eclipse.core.runtime.IProgressMonitor)
*/
public void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException {
monitor.beginTask(null, 50);
super.refresh(traversals, flags, Policy.subMonitorFor(monitor, 25));
// Prune any empty folders within the traversals
if (CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()) {
CompoundResourceTraversal ct = new CompoundResourceTraversal();
ct.addTraversals(traversals);
IResource[] roots = ct.getRoots();
ICVSResource[] cvsResources = new ICVSResource[roots.length];
for (int i = 0; i < cvsResources.length; i++) {
cvsResources[i] = CVSWorkspaceRoot.getCVSResourceFor(roots[i]);
}
new PruneFolderVisitor().visit(
CVSWorkspaceRoot.getCVSFolderFor(ResourcesPlugin.getWorkspace().getRoot()),
cvsResources);
}
cacheContents(traversals, Policy.subMonitorFor(monitor, 25));
monitor.done();
}
protected void cacheContents(final ResourceTraversal[] traversals, IProgressMonitor monitor) throws CVSException {
// cache the base and remote contents
// TODO: Refreshing and caching now takes 3 round trips.
// OPTIMIZE: remote state and contents could be obtained in 1
// OPTIMIZE: Based could be avoided if we always cached base locally
ResourceMapping[] mappings = new ResourceMapping[] { new ResourceMapping() {
public Object getModelObject() {
return WorkspaceSubscriberContext.this;
}
public IProject[] getProjects() {
return ResourcesPlugin.getWorkspace().getRoot().getProjects();
}
public ResourceTraversal[] getTraversals(ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {
return traversals;
}
public boolean contains(ResourceMapping mapping) {
return false;
}
public String getModelProviderId() {
return ModelProvider.RESOURCE_MODEL_PROVIDER_ID;
}
}};
try {
monitor.beginTask(null, 50);
new CacheBaseContentsOperation(null, mappings, getDiffTree(), true).run(Policy.subMonitorFor(monitor, 25));
new CacheRemoteContentsOperation(null, mappings, getDiffTree()).run(Policy.subMonitorFor(monitor, 25));
} catch (InvocationTargetException e) {
throw CVSException.wrapException(e);
} catch (InterruptedException e) {
// Ignore
} finally {
monitor.done();
}
}
}
|
