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
|
/*******************************************************************************
* Copyright (c) 2006 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.examples.filesystem.subscriber;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.team.core.diff.IDiff;
import org.eclipse.team.core.diff.IThreeWayDiff;
import org.eclipse.team.core.mapping.ISynchronizationScopeManager;
import org.eclipse.team.core.mapping.provider.MergeStatus;
import org.eclipse.team.core.mapping.provider.ResourceDiffTree;
import org.eclipse.team.core.subscribers.SubscriberMergeContext;
import org.eclipse.team.examples.filesystem.FileSystemPlugin;
/**
* A merge context for merging file system changes.
*/
public class FileSystemMergeContext extends SubscriberMergeContext {
/**
* Create the file system merge context for the given scope manager.
* @param manager the scope manager
*/
public FileSystemMergeContext(ISynchronizationScopeManager manager) {
super(FileSystemSubscriber.getInstance(), manager);
initialize();
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.provider.MergeContext#makeInSync(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor)
*/
protected void makeInSync(IDiff diff, IProgressMonitor monitor)
throws CoreException {
IResource resource = ResourceDiffTree.getResourceFor(diff);
FileSystemSubscriber.getInstance().makeInSync(resource);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.IMergeContext#markAsMerged(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor)
*/
public void markAsMerged(IDiff diff, boolean inSyncHint,
IProgressMonitor monitor) throws CoreException {
// TODO if inSyncHint is true, we should test to see if the contents match
IResource resource = ResourceDiffTree.getResourceFor(diff);
FileSystemSubscriber.getInstance().markAsMerged(resource, monitor);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.IMergeContext#reject(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor)
*/
public void reject(IDiff diff, IProgressMonitor monitor)
throws CoreException {
markAsMerged(diff, false, monitor);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.provider.MergeContext#getMergeRule(org.eclipse.team.core.diff.IDiff)
*/
public ISchedulingRule getMergeRule(IDiff node) {
return ResourceDiffTree.getResourceFor(node).getProject();
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.provider.MergeContext#merge(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus merge(IDiff diff, boolean ignoreLocalChanges, IProgressMonitor monitor) throws CoreException {
// Only attempt the merge for non-conflicts. The reason we do this
// is because the file system provider doesn't really have the proper base
// so merging conflicts doesn't work properly
if (!ignoreLocalChanges) {
IResource resource = ResourceDiffTree.getResourceFor(diff);
if (diff instanceof IThreeWayDiff && resource instanceof IFile) {
IThreeWayDiff twd = (IThreeWayDiff) diff;
if (twd.getDirection() == IThreeWayDiff.CONFLICTING) {
return new MergeStatus(FileSystemPlugin.ID, "Cannot merge conflicting files", new IFile[] { (IFile)resource });
}
}
}
return super.merge(diff, ignoreLocalChanges, monitor);
}
}
|
