blob: 7b28d328208eab839ee32836cc133b24c4eae8aa (
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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
/*
* 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 pre-defined merge tool.
*/
public class PreDefinedMergeTool extends UserDefinedMergeTool {
/**
* the tool parameters without base
*/
private final String parametersWithoutBase;
/**
* Creates the pre-defined merge tool
*
* @param name
* the name
* @param path
* the path
* @param parametersWithBase
* the tool parameters that are used together with path as
* command and "base is present" ($BASE)
* @param parametersWithoutBase
* the tool parameters that are used together with path as
* command and "base is present" ($BASE)
* @param trustExitCode
* the "trust exit code" option
*/
public PreDefinedMergeTool(String name, String path,
String parametersWithBase, String parametersWithoutBase,
BooleanTriState trustExitCode) {
super(name, path, parametersWithBase, trustExitCode);
this.parametersWithoutBase = parametersWithoutBase;
}
/**
* Creates the pre-defined merge tool
*
* @param tool
* the command line merge tool
*
*/
public PreDefinedMergeTool(CommandLineMergeTool tool) {
this(tool.name(), tool.getPath(), tool.getParameters(true),
tool.getParameters(false),
tool.isExitCodeTrustable() ? BooleanTriState.TRUE
: BooleanTriState.FALSE);
}
/**
* @param trustExitCode
* the "trust exit code" option
*/
@Override
public void setTrustExitCode(BooleanTriState trustExitCode) {
super.setTrustExitCode(trustExitCode);
}
/**
* @return the tool command (with base present)
*/
@Override
public String getCommand() {
return getCommand(true);
}
/**
* @param withBase
* get command with base present (true) or without base present
* (false)
* @return the tool command
*/
@Override
public String getCommand(boolean withBase) {
return ExternalToolUtils.quotePath(getPath()) + " " //$NON-NLS-1$
+ (withBase ? super.getCommand() : parametersWithoutBase);
}
}
|
