blob: b1a5a22ef5bc25daa39ca35752e1513f9d34aa74 (
plain)
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
|
/*
* Copyright (C) 2018-2022, Andre Bossert <andre.bossert@siemens.com>
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.internal.diffmergetool;
import org.eclipse.jgit.lib.internal.BooleanTriState;
/**
* The user-defined merge tool.
*/
public class UserDefinedMergeTool extends UserDefinedDiffTool
implements ExternalMergeTool {
/**
* the merge tool "trust exit code" option
*/
private BooleanTriState trustExitCode;
/**
* Creates the merge tool
*
* @param name
* the name
* @param path
* the path
* @param cmd
* the command
* @param trustExitCode
* the "trust exit code" option
*/
public UserDefinedMergeTool(String name, String path, String cmd,
BooleanTriState trustExitCode) {
super(name, path, cmd);
this.trustExitCode = trustExitCode;
}
/**
* @return the "trust exit code" flag
*/
@Override
public BooleanTriState getTrustExitCode() {
return trustExitCode;
}
/**
* Set "trust exit code" flag
*
* @param trustExitCode
* the new "trust exit code" flag
*/
protected void setTrustExitCode(BooleanTriState trustExitCode) {
this.trustExitCode = trustExitCode;
}
/**
* Get command
*
* @param withBase
* not used, because user-defined merge tool can only define one
* cmd -> it must handle with and without base present (empty)
* @return the tool command
*/
@Override
public String getCommand(boolean withBase) {
return getCommand();
}
}
|
