blob: 0fa45baa13be0a582d46590369ea9658594f00ba (
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
|
// Copyright 2008 Google Inc.
//
// 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.codereview.manager.merge;
import com.google.codereview.internal.PostMergeResult.MergeResultItem;
import org.spearce.jgit.revwalk.RevCommit;
import org.spearce.jgit.revwalk.RevCommitList;
import org.spearce.jgit.revwalk.RevFlag;
import org.spearce.jgit.revwalk.RevWalk;
import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
class MergeSorter {
private final RevWalk rw;
private final RevCommit base;
private final RevFlag CAN_MERGE;
MergeSorter(final RevWalk walk, final RevCommit branchHead) {
rw = walk;
CAN_MERGE = rw.newFlag("CAN_MERGE");
base = branchHead;
}
Collection<CodeReviewCommit> sort(final Collection<CodeReviewCommit> incoming)
throws IOException {
final Set<CodeReviewCommit> heads = new HashSet<CodeReviewCommit>();
final Set<CodeReviewCommit> sort = prepareList(incoming);
INCOMING: while (!sort.isEmpty()) {
final CodeReviewCommit n = removeOne(sort);
rw.resetRetain(CAN_MERGE);
rw.markStart(n);
if (base != null) {
rw.markUninteresting(base);
}
RevCommit c;
final RevCommitList<RevCommit> contents = new RevCommitList<RevCommit>();
while ((c = rw.next()) != null) {
if (!c.has(CAN_MERGE)) {
// We cannot merge n as it would bring something we
// aren't permitted to merge at this time. Drop n.
//
n.statusCode = MergeResultItem.CodeType.MISSING_DEPENDENCY;
continue INCOMING;
}
contents.add(c);
}
// Anything reachable through us is better merged by just
// merging us directly. So prune our ancestors out and let
// us merge instead.
//
sort.removeAll(contents);
heads.removeAll(contents);
heads.add(n);
}
return heads;
}
private Set<CodeReviewCommit> prepareList(
final Collection<CodeReviewCommit> in) {
final HashSet<CodeReviewCommit> sort = new HashSet<CodeReviewCommit>();
for (final CodeReviewCommit c : in) {
if (!c.has(CAN_MERGE)) {
c.add(CAN_MERGE);
sort.add(c);
}
}
return sort;
}
private static <T> T removeOne(final Collection<T> c) {
final Iterator<T> i = c.iterator();
final T r = i.next();
i.remove();
return r;
}
}
|
