blob: cde7eb4eb7a45cdb91bf48e7e555ef85a532da13 (
plain) (
blame)
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
|
/*******************************************************************************
* Copyright (c) 2000, 2011 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.core;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
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.variants.IResourceVariant;
public class CVSMergeSyncInfo extends CVSSyncInfo {
public CVSMergeSyncInfo(IResource local, IResourceVariant base, IResourceVariant remote, Subscriber subscriber) {
super(local, base, remote, subscriber);
}
@Override
protected int handleDeletionConflicts(int kind) {
// (see bug 40053).
if(kind == (SyncInfo.CONFLICTING | SyncInfo.DELETION | SyncInfo.PSEUDO_CONFLICT)) {
return SyncInfo.IN_SYNC;
}
return kind;
}
protected int calculateKind() throws TeamException {
int kind = super.calculateKind();
// Report merged resources as in-sync
if ((kind & DIRECTION_MASK) == INCOMING && ((CVSMergeSubscriber)getSubscriber()).isMerged(getLocal())) {
return IN_SYNC;
}
// Report outgoing resources as in-sync when models are not shown
if((kind & DIRECTION_MASK) == OUTGOING && !((CVSMergeSubscriber)getSubscriber()).isModelSync()) {
return IN_SYNC;
}
return kind;
}
@Override
public IStatus makeOutgoing(IProgressMonitor monitor) throws TeamException {
// Make the resource outgoing by marking it as merged with the subscriber
CVSMergeSubscriber subscriber = (CVSMergeSubscriber)getSubscriber();
subscriber.merged(new IResource[] {getLocal() });
return Status.OK_STATUS;
}
}
|
