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
|
/*******************************************************************************
* Copyright (c) 2000, 2006 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.subscriber;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.SyncInfoSet;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
import org.eclipse.team.internal.ccvs.core.CVSSyncInfo;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
/**
* This action performs a "cvs update -j start -j end ..." to merge changes
* into the local workspace.
*/
public class MergeUpdateOperation extends SafeUpdateOperation {
Subscriber currentSubcriber = null;
protected MergeUpdateOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements, boolean promptBeforeUpdate) {
super(configuration, elements, promptBeforeUpdate);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
*/
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
return NLS.bind(CVSUIMessages.MergeUpdateAction_jobName, new String[] { new Integer(syncSet.size()).toString() });
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#getOverwriteLocalChanges()
*/
protected boolean getOverwriteLocalChanges() {
return true;
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#updated(org.eclipse.core.resources.IResource[])
*/
protected void updated(IResource[] resources) throws TeamException {
// Mark all succesfully updated resources as merged
if(resources.length > 0 && currentSubcriber != null) {
((CVSMergeSubscriber)currentSubcriber).merged(resources);
}
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runUpdateDeletions(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
*/
protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
// When merging, update deletions become outgoing deletions so just delete
// the files locally without unmanaging (so the sync info is kept to
// indicate an outgoing deletion
try {
monitor.beginTask(null, 100 * nodes.length);
for (int i = 0; i < nodes.length; i++) {
IResource resource = nodes[i].getLocal();
if (resource.getType() == IResource.FILE) {
((IFile)resource).delete(false /* force */, true /* keep local history */, Policy.subMonitorFor(monitor, 100));
}
}
} catch (CoreException e) {
throw CVSException.wrapException(e);
} finally {
monitor.done();
}
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runSafeUpdate(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
*/
protected void runSafeUpdate(IProject project, SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
if(nodes.length > 0) {
setSubscriber(nodes[0]);
CVSTag startTag = ((CVSMergeSubscriber)currentSubcriber).getStartTag();
CVSTag endTag = ((CVSMergeSubscriber)currentSubcriber).getEndTag();
// Incoming additions require different handling then incoming changes and deletions
List additions = new ArrayList();
List changes = new ArrayList();
for (int i = 0; i < nodes.length; i++) {
SyncInfo resource = nodes[i];
int kind = resource.getKind();
if ((kind & SyncInfo.CHANGE_MASK) == SyncInfo.ADDITION) {
additions.add(resource);
} else {
changes.add(resource);
}
}
try {
monitor.beginTask(null, (additions.size() + changes.size()) * 100);
if (!additions.isEmpty()) {
safeUpdate(
project,
getIResourcesFrom((SyncInfo[]) additions.toArray(new SyncInfo[additions.size()])),
new Command.LocalOption[] {
Command.DO_NOT_RECURSE,
Command.makeArgumentOption(Update.JOIN, endTag.getName())
},
Policy.subMonitorFor(monitor, additions.size() * 100));
}
if (!changes.isEmpty()) {
safeUpdate(
project,
getIResourcesFrom((SyncInfo[]) changes.toArray(new SyncInfo[changes.size()])),
new Command.LocalOption[] {
Command.DO_NOT_RECURSE,
Command.makeArgumentOption(Update.JOIN, startTag.getName()),
Command.makeArgumentOption(Update.JOIN, endTag.getName())
},
Policy.subMonitorFor(monitor, changes.size() * 100));
}
} finally {
monitor.done();
}
}
}
/**
* @param nodes
* @throws CVSException
*/
private void setSubscriber(SyncInfo node) throws CVSException {
// Assumption that all nodes are from the same subscriber.
currentSubcriber = ((CVSSyncInfo)node).getSubscriber();
if (!(currentSubcriber instanceof CVSMergeSubscriber)) {
throw new CVSException(NLS.bind(CVSUIMessages.MergeUpdateAction_invalidSubscriber, new String[] { currentSubcriber.toString() }));
}
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#overwriteUpdate(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
*/
protected void overwriteUpdate(SyncInfoSet set, IProgressMonitor monitor) throws TeamException {
SyncInfo[] nodes = set.getSyncInfos();
if (nodes.length == 0) return;
setSubscriber(nodes[0]);
monitor.beginTask(null, 1000 * nodes.length);
try {
for (int i = 0; i < nodes.length; i++) {
makeRemoteLocal(nodes[i], Policy.subMonitorFor(monitor, 1000));
}
} finally {
monitor.done();
}
}
}
|
