blob: 995f8903896c25d9c6286d08863a0f3739a20724 (
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
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
|
/*
* Copyright (C) 2011, Philipp Thun <philipp.thun@sap.com> and others
*
* 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.api;
import java.util.List;
import java.util.Map;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
import org.eclipse.jgit.revwalk.RevCommit;
/**
* Encapsulates the result of a {@link org.eclipse.jgit.api.CherryPickCommand}.
*/
public class CherryPickResult {
/**
* The cherry-pick status
*/
public enum CherryPickStatus {
/** Cherry-pick succeeded */
OK {
@Override
public String toString() {
return "Ok"; //$NON-NLS-1$
}
},
/** Cherry-pick failed */
FAILED {
@Override
public String toString() {
return "Failed"; //$NON-NLS-1$
}
},
/** Cherry-pick found conflicts to be resolved */
CONFLICTING {
@Override
public String toString() {
return "Conflicting"; //$NON-NLS-1$
}
}
}
private final CherryPickStatus status;
private final RevCommit newHead;
private final List<Ref> cherryPickedRefs;
private final Map<String, MergeFailureReason> failingPaths;
/**
* Constructor for CherryPickResult
*
* @param newHead
* commit the head points at after this cherry-pick
* @param cherryPickedRefs
* list of successfully cherry-picked <code>Ref</code>'s
*/
public CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs) {
this.status = CherryPickStatus.OK;
this.newHead = newHead;
this.cherryPickedRefs = cherryPickedRefs;
this.failingPaths = null;
}
/**
* Constructor for CherryPickResult
*
* @param failingPaths
* list of paths causing this cherry-pick to fail (see
* {@link org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()}
* for details)
*/
public CherryPickResult(Map<String, MergeFailureReason> failingPaths) {
this.status = CherryPickStatus.FAILED;
this.newHead = null;
this.cherryPickedRefs = null;
this.failingPaths = failingPaths;
}
private CherryPickResult(CherryPickStatus status) {
this.status = status;
this.newHead = null;
this.cherryPickedRefs = null;
this.failingPaths = null;
}
/**
* A <code>CherryPickResult</code> with status
* {@link CherryPickStatus#CONFLICTING}
*/
public static final CherryPickResult CONFLICT = new CherryPickResult(
CherryPickStatus.CONFLICTING);
/**
* Get status
*
* @return the status this cherry-pick resulted in
*/
public CherryPickStatus getStatus() {
return status;
}
/**
* Get the new head after this cherry-pick
*
* @return the commit the head points at after this cherry-pick,
* <code>null</code> if {@link #getStatus} is not
* {@link org.eclipse.jgit.api.CherryPickResult.CherryPickStatus#OK}
*/
public RevCommit getNewHead() {
return newHead;
}
/**
* Get the cherry-picked {@code Ref}s
*
* @return the list of successfully cherry-picked <code>Ref</code>'s,
* <code>null</code> if {@link #getStatus} is not
* {@link org.eclipse.jgit.api.CherryPickResult.CherryPickStatus#OK}
*/
public List<Ref> getCherryPickedRefs() {
return cherryPickedRefs;
}
/**
* Get the list of paths causing this cherry-pick to fail
*
* @return the list of paths causing this cherry-pick to fail (see
* {@link org.eclipse.jgit.merge.ResolveMerger#getFailingPaths()}
* for details), <code>null</code> if {@link #getStatus} is not
* {@link org.eclipse.jgit.api.CherryPickResult.CherryPickStatus#FAILED}
*/
public Map<String, MergeFailureReason> getFailingPaths() {
return failingPaths;
}
}
|
