blob: d226aa8aaa3251fe57c03ab19e16e7f6ab474ec0 (
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
|
/*******************************************************************************
* Copyright (c) 2010 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
* Dariusz Luksza <dariusz@luksza.org>
*******************************************************************************/
package org.eclipse.egit.core.synchronize;
import java.io.IOException;
import org.eclipse.egit.core.RevUtils;
import org.eclipse.egit.core.synchronize.dto.GitSynchronizeData;
import org.eclipse.egit.core.synchronize.dto.GitSynchronizeDataSet;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.variants.SessionResourceVariantByteStore;
class GitBaseResourceVariantTree extends GitResourceVariantTree {
GitBaseResourceVariantTree(GitSynchronizeDataSet gsds) {
super(new SessionResourceVariantByteStore(), gsds);
}
@Override
protected RevCommit getRevCommit(GitSynchronizeData gsd)
throws TeamException {
try {
return RevUtils.getCommonAncestor(gsd.getRepository(), gsd
.getSrcRevCommit(), gsd.getDstRevCommit());
} catch (IOException e) {
throw new TeamException(e.getMessage(), e);
}
}
}
|
