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
|
/*******************************************************************************
* Copyright (C) 2010, Dariusz Luksza <dariusz@luksza.org>
*
* 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
*******************************************************************************/
package org.eclipse.egit.ui.internal.synchronize.compare;
import static org.eclipse.egit.core.internal.storage.GitFileRevision.INDEX;
import static org.eclipse.jgit.lib.ObjectId.zeroId;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.internal.CompareUtils;
import org.eclipse.egit.ui.internal.FileRevisionTypedElement;
import org.eclipse.egit.ui.internal.LocalResourceTypedElement;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.team.ui.mapping.ISynchronizationCompareInput;
import org.eclipse.team.ui.mapping.SaveableComparison;
/**
* Git specific implementation of {@link ISynchronizationCompareInput}
*/
public class GitCompareInput implements ISynchronizationCompareInput {
private final String name;
private final ObjectId ancestorId;
private final ObjectId baseId;
private final ObjectId remoteId;
private final RevCommit ancestorCommit;
private final RevCommit remoteCommit;
/**
* {@link RevCommit} instance of base commit associated with this compare
* input
*/
protected final RevCommit baseCommit;
/**
* {@link Repository} associated with this compare compare input
*/
protected final Repository repo;
/**
* Git repository relative path of file associated with this compare input
*/
protected final String gitPath;
/**
* Creates {@link GitCompareInput}
*
* @param repo
* repository that is connected with this object
* @param ancestroDataSource
* data that should be use to obtain common ancestor object data
* @param baseDataSource
* data that should be use to obtain base object data
* @param remoteDataSource
* data that should be used to obtain remote object data
* @param gitPath
* repository relative path of object
*/
public GitCompareInput(Repository repo,
ComparisonDataSource ancestroDataSource,
ComparisonDataSource baseDataSource,
ComparisonDataSource remoteDataSource, String gitPath) {
this.repo = repo;
this.gitPath = gitPath;
this.baseId = baseDataSource.getObjectId();
this.remoteId = remoteDataSource.getObjectId();
this.baseCommit = baseDataSource.getRevCommit();
this.ancestorId = ancestroDataSource.getObjectId();
this.remoteCommit = remoteDataSource.getRevCommit();
this.ancestorCommit = ancestroDataSource.getRevCommit();
this.name = gitPath.lastIndexOf('/') < 0 ? gitPath : gitPath
.substring(gitPath.lastIndexOf('/'));
}
public String getName() {
return name;
}
public Image getImage() {
// TODO Auto-generated method stub
return null;
}
public int getKind() {
// TODO Auto-generated method stub
return 0;
}
public ITypedElement getAncestor() {
if (objectExist(ancestorCommit, ancestorId))
return CompareUtils.getFileRevisionTypedElement(gitPath,
ancestorCommit, repo, ancestorId);
return null;
}
public ITypedElement getLeft() {
return CompareUtils.getFileRevisionTypedElement(gitPath, baseCommit,
repo, remoteId);
}
public ITypedElement getRight() {
return CompareUtils.getFileRevisionTypedElement(gitPath, remoteCommit,
repo, baseId);
}
public void addCompareInputChangeListener(
ICompareInputChangeListener listener) {
// data in commit will never change, therefore change listeners are
// useless
}
public void removeCompareInputChangeListener(
ICompareInputChangeListener listener) {
// data in commit will never change, therefore change listeners are
// useless
}
public void copy(boolean leftToRight) {
// do nothing, we should disallow coping content between commits
}
private boolean objectExist(RevCommit commit, ObjectId id) {
return commit != null && id != null && !id.equals(zeroId());
}
public SaveableComparison getSaveable() {
// not used
return null;
}
public void prepareInput(CompareConfiguration configuration,
IProgressMonitor monitor) throws CoreException {
configuration.setLeftLabel(getFileRevisionLabel(getLeft()));
configuration.setRightLabel(getFileRevisionLabel(getRight()));
}
public String getFullPath() {
return gitPath;
}
public boolean isCompareInputFor(Object object) {
// not used
return false;
}
private String getFileRevisionLabel(ITypedElement element) {
if (element instanceof FileRevisionTypedElement) {
FileRevisionTypedElement castElement = (FileRevisionTypedElement) element;
if (INDEX.equals(castElement.getContentIdentifier()))
return NLS.bind(
UIText.GitCompareFileRevisionEditorInput_StagedVersion,
element.getName());
else
return NLS.bind(
UIText.GitCompareFileRevisionEditorInput_RevisionLabel,
new Object[] {
element.getName(),
CompareUtils.truncatedRevision(castElement
.getContentIdentifier()),
castElement.getAuthor() });
} else if (element instanceof LocalResourceTypedElement)
return NLS.bind(
UIText.GitCompareFileRevisionEditorInput_LocalVersion,
element.getName());
else
return element.getName();
}
}
|
