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
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
/*******************************************************************************
* 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;
import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.*;
import org.eclipse.team.core.subscribers.utils.SynchronizationCache;
import org.eclipse.team.core.subscribers.utils.SynchronizationSyncBytesCache;
import org.eclipse.team.internal.ccvs.core.syncinfo.CVSSynchronizationCache;
/**
* A CVSMergeSubscriber is responsible for maintaining the remote trees for a merge into
* the workspace. The remote trees represent the CVS revisions of the start and end
* points (version or branch) of the merge.
*
* This subscriber stores the remote handles in the resource tree sync info slot. When
* the merge is cancelled this sync info is cleared.
*
* A merge can persist between workbench sessions and thus can be used as an
* ongoing merge.
*
* TODO: Is the merge subscriber interested in workspace sync info changes?
* TODO: Do certain operations (e.g. replace with) invalidate a merge subscriber?
* TODO: How to ensure that sync info is flushed when merge roots are deleted?
*/
public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResourceChangeListener, ITeamResourceChangeListener {
public static final String QUALIFIED_NAME = "org.eclipse.team.cvs.ui.cvsmerge-participant"; //$NON-NLS-1$
private static final String UNIQUE_ID_PREFIX = "merge-"; //$NON-NLS-1$
private IComparisonCriteria comparisonCriteria;
private CVSTag start, end;
private List roots;
private SynchronizationCache remoteSynchronizer;
private SynchronizationSyncBytesCache mergedSynchronizer;
private SynchronizationCache baseSynchronizer;
private static final byte[] NO_REMOTE = new byte[0];
public CVSMergeSubscriber(IResource[] roots, CVSTag start, CVSTag end) {
this(getUniqueId(), roots, start, end);
this.comparisonCriteria = new ContentComparisonCriteria(false /* don't ignore whitespace */);
}
protected IResource[] refreshRemote(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException {
IResource[] remoteChanges = super.refreshRemote(resources, depth, monitor);
adjustMergedResources(remoteChanges);
return remoteChanges;
}
private void adjustMergedResources(IResource[] remoteChanges) throws TeamException {
for (int i = 0; i < remoteChanges.length; i++) {
IResource resource = remoteChanges[i];
mergedSynchronizer.removeSyncBytes(resource, IResource.DEPTH_ZERO);
}
}
private static QualifiedName getUniqueId() {
String uniqueId = Long.toString(System.currentTimeMillis());
return new QualifiedName(QUALIFIED_NAME, "CVS" + UNIQUE_ID_PREFIX + uniqueId); //$NON-NLS-1$
}
public CVSMergeSubscriber(QualifiedName id, IResource[] roots, CVSTag start, CVSTag end) {
super(id, Policy.bind("CVSMergeSubscriber.2", start.getName(), end.getName()), Policy.bind("CVSMergeSubscriber.4")); //$NON-NLS-1$ //$NON-NLS-2$
this.start = start;
this.end = end;
this.roots = new ArrayList(Arrays.asList(roots));
initialize();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber#initialize()
*/
private void initialize() {
QualifiedName id = getId();
String syncKeyPrefix = id.getLocalName();
remoteSynchronizer = new CVSSynchronizationCache(new QualifiedName(SYNC_KEY_QUALIFIER, syncKeyPrefix + end.getName()));
baseSynchronizer = new CVSSynchronizationCache(new QualifiedName(SYNC_KEY_QUALIFIER, syncKeyPrefix + start.getName()));
mergedSynchronizer = new SynchronizationSyncBytesCache(new QualifiedName(SYNC_KEY_QUALIFIER, syncKeyPrefix + "0merged")); //$NON-NLS-1$
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().addListener(this);
}
protected SyncInfo getSyncInfo(IResource local, ISubscriberResource base, ISubscriberResource remote) throws TeamException {
return new CVSMergeSyncInfo(local, base, remote, this);
}
public void merged(IResource[] resources) throws TeamException {
for (int i = 0; i < resources.length; i++) {
IResource resource = resources[i];
byte[] remoteBytes = remoteSynchronizer.getSyncBytes(resource);
if (remoteBytes == null) {
// If there is no remote, use a place holder to indicate the resouce was merged
remoteBytes = NO_REMOTE;
}
mergedSynchronizer.setSyncBytes(resource, remoteBytes);
}
fireTeamResourceChange(TeamDelta.asSyncChangedDeltas(this, resources));
}
/* (non-Javadoc)
* @see org.eclipse.team.core.sync.TeamSubscriber#cancel()
*/
public void cancel() {
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
remoteSynchronizer.dispose();
baseSynchronizer.dispose();
mergedSynchronizer.dispose();
}
/* (non-Javadoc)
* @see org.eclipse.team.core.sync.TeamSubscriber#roots()
*/
public IResource[] roots() {
return (IResource[]) roots.toArray(new IResource[roots.size()]);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.sync.TeamSubscriber#isSupervised(org.eclipse.core.resources.IResource)
*/
public boolean isSupervised(IResource resource) throws TeamException {
return getBaseSynchronizationCache().getSyncBytes(resource) != null || getRemoteSynchronizationCache().getSyncBytes(resource) != null;
}
public CVSTag getStartTag() {
return start;
}
public CVSTag getEndTag() {
return end;
}
public boolean isReleaseSupported() {
// you can't release changes to a merge
return false;
}
/*
* What to do when a root resource for this merge changes?
* Deleted, Move, Copied
* Changed in a CVS way (tag changed, revision changed...)
* Contents changed by user
* @see IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
*/
public void resourceChanged(IResourceChangeEvent event) {
try {
IResourceDelta delta = event.getDelta();
if(delta != null) {
delta.accept(new IResourceDeltaVisitor() {
public boolean visit(IResourceDelta delta) throws CoreException {
IResource resource = delta.getResource();
if (resource.getType()==IResource.PROJECT) {
IProject project = (IProject)resource;
if (!project.isAccessible()) {
return false;
}
if ((delta.getFlags() & IResourceDelta.OPEN) != 0) {
return false;
}
if (RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId()) == null) {
return false;
}
}
if (roots.contains(resource)) {
if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.MOVED_TO) {
cancel();
}
// stop visiting children
return false;
}
// keep visiting children
return true;
}
});
}
} catch (CoreException e) {
CVSProviderPlugin.log(e.getStatus());
}
}
public boolean isMerged(IResource resource) throws TeamException {
return (mergedSynchronizer.getSyncBytes(resource) != null ||
mergedSynchronizer.isRemoteKnown(resource));
}
/*
* Currently only the workspace subscriber knows when a project has been deconfigured. We will listen for these events
* and remove the root then forward to merge subscriber listeners.
* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.ITeamResourceChangeListener#teamResourceChanged(org.eclipse.team.core.subscribers.TeamDelta[])
*/
public void teamResourceChanged(TeamDelta[] deltas) {
for (int i = 0; i < deltas.length; i++) {
TeamDelta delta = deltas[i];
switch(delta.getFlags()) {
case TeamDelta.PROVIDER_DECONFIGURED:
IResource resource = delta.getResource();
if(roots.remove(resource)) {
fireTeamResourceChange(new TeamDelta[] {delta});
}
break;
}
}
}
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.TeamSubscriber#getDefaultComparisonCriteria()
*/
public IComparisonCriteria getDefaultComparisonCriteria() {
return comparisonCriteria;
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getRemoteTag()
*/
protected CVSTag getRemoteTag() {
return getEndTag();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getBaseTag()
*/
protected CVSTag getBaseTag() {
return getStartTag();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getBaseSynchronizationCache()
*/
protected SynchronizationCache getBaseSynchronizationCache() {
return baseSynchronizer;
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getRemoteSynchronizationCache()
*/
protected SynchronizationCache getRemoteSynchronizationCache() {
return remoteSynchronizer;
}
}
|
