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
191
192
193
194
|
// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.git;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Ordering;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.submit.CommitMergeStatus;
import java.io.IOException;
import java.util.Optional;
import java.util.Set;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
/** Extended commit entity with code review specific metadata. */
public class CodeReviewCommit extends RevCommit {
/**
* Default ordering when merging multiple topologically-equivalent commits.
*
* <p>Operates only on these commits and does not take ancestry into account.
*
* <p>Use this in preference to the default order, which comes from {@link AnyObjectId} and only
* orders on SHA-1.
*/
public static final Ordering<CodeReviewCommit> ORDER =
Ordering.natural()
.onResultOf(
(CodeReviewCommit c) ->
c.getPatchsetId() != null ? c.getPatchsetId().getParentKey().get() : null)
.nullsFirst();
public static CodeReviewRevWalk newRevWalk(Repository repo) {
return new CodeReviewRevWalk(repo);
}
public static CodeReviewRevWalk newRevWalk(ObjectReader reader) {
return new CodeReviewRevWalk(reader);
}
public static class CodeReviewRevWalk extends RevWalk {
private CodeReviewRevWalk(Repository repo) {
super(repo);
}
private CodeReviewRevWalk(ObjectReader reader) {
super(reader);
}
@Override
protected CodeReviewCommit createCommit(AnyObjectId id) {
return new CodeReviewCommit(id);
}
@Override
public CodeReviewCommit next()
throws MissingObjectException, IncorrectObjectTypeException, IOException {
return (CodeReviewCommit) super.next();
}
@Override
public void markStart(RevCommit c)
throws MissingObjectException, IncorrectObjectTypeException, IOException {
checkArgument(c instanceof CodeReviewCommit);
super.markStart(c);
}
@Override
public void markUninteresting(RevCommit c)
throws MissingObjectException, IncorrectObjectTypeException, IOException {
checkArgument(c instanceof CodeReviewCommit);
super.markUninteresting(c);
}
@Override
public CodeReviewCommit lookupCommit(AnyObjectId id) {
return (CodeReviewCommit) super.lookupCommit(id);
}
@Override
public CodeReviewCommit parseCommit(AnyObjectId id)
throws MissingObjectException, IncorrectObjectTypeException, IOException {
return (CodeReviewCommit) super.parseCommit(id);
}
}
/**
* Unique key of the PatchSet entity from the code review system.
*
* <p>This value is only available on commits that have a PatchSet represented in the code review
* system.
*/
private PatchSet.Id patchsetId;
private ChangeNotes notes;
/**
* The result status for this commit.
*
* <p>Only valid if {@link #patchsetId} is not null.
*/
private CommitMergeStatus statusCode;
/**
* Message for the status that is returned to the calling user if the status indicates a problem
* that prevents submit.
*/
private Optional<String> statusMessage = Optional.empty();
/** List of files in this commit that contain Git conflict markers. */
private ImmutableSet<String> filesWithGitConflicts;
public CodeReviewCommit(AnyObjectId id) {
super(id);
}
public ChangeNotes notes() {
return notes;
}
public CommitMergeStatus getStatusCode() {
return statusCode;
}
public void setStatusCode(CommitMergeStatus statusCode) {
this.statusCode = statusCode;
}
public Optional<String> getStatusMessage() {
return statusMessage;
}
public void setStatusMessage(@Nullable String statusMessage) {
this.statusMessage = Optional.ofNullable(statusMessage);
}
public ImmutableSet<String> getFilesWithGitConflicts() {
return filesWithGitConflicts != null ? filesWithGitConflicts : ImmutableSet.of();
}
public void setFilesWithGitConflicts(@Nullable Set<String> filesWithGitConflicts) {
this.filesWithGitConflicts =
filesWithGitConflicts != null && !filesWithGitConflicts.isEmpty()
? ImmutableSet.copyOf(filesWithGitConflicts)
: null;
}
public PatchSet.Id getPatchsetId() {
return patchsetId;
}
public void setPatchsetId(PatchSet.Id patchsetId) {
this.patchsetId = patchsetId;
}
public void copyFrom(CodeReviewCommit src) {
notes = src.notes;
patchsetId = src.patchsetId;
statusCode = src.statusCode;
}
public Change change() {
return getNotes().getChange();
}
public ChangeNotes getNotes() {
return notes;
}
public void setNotes(ChangeNotes notes) {
this.notes = notes;
}
}
|
