blob: 4bcfade3cfa81cff4ec02361cf52cfb3fe392975 (
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
146
147
148
149
150
151
|
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* 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 git4idea.log;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.*;
import com.intellij.vcs.log.graph.impl.facade.bek.BekSorter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
class GitBekParentFixer {
@NotNull private static final String MAGIC_TEXT = "Merge remote";
@NotNull private static final VcsLogFilterCollection MAGIC_FILTER = createVcsLogFilterCollection();
@NotNull private final Set<Hash> myWrongCommits;
private GitBekParentFixer(@NotNull Set<Hash> wrongCommits) {
myWrongCommits = wrongCommits;
}
@NotNull
static GitBekParentFixer prepare(@NotNull VirtualFile root, @NotNull GitLogProvider provider) throws VcsException {
if (!BekSorter.isBekEnabled()) {
return new GitBekParentFixer(Collections.<Hash>emptySet());
}
return new GitBekParentFixer(getWrongCommits(provider, root));
}
@NotNull
TimedVcsCommit fixCommit(@NotNull TimedVcsCommit commit) {
if (!myWrongCommits.contains(commit.getId())) {
return commit;
}
return reverseParents(commit);
}
@NotNull
private static Set<Hash> getWrongCommits(@NotNull GitLogProvider provider, @NotNull VirtualFile root) throws VcsException {
List<TimedVcsCommit> commitsMatchingFilter = provider.getCommitsMatchingFilter(root, MAGIC_FILTER, -1);
return ContainerUtil.map2Set(commitsMatchingFilter, new Function<TimedVcsCommit, Hash>() {
@Override
public Hash fun(TimedVcsCommit timedVcsCommit) {
return timedVcsCommit.getId();
}
});
}
@NotNull
private static TimedVcsCommit reverseParents(@NotNull final TimedVcsCommit commit) {
return new TimedVcsCommit() {
@Override
public long getTimestamp() {
return commit.getTimestamp();
}
@NotNull
@Override
public Hash getId() {
return commit.getId();
}
@NotNull
@Override
public List<Hash> getParents() {
return ContainerUtil.reverse(commit.getParents());
}
};
}
private static VcsLogFilterCollection createVcsLogFilterCollection() {
final VcsLogTextFilter textFilter = new VcsLogTextFilter() {
@NotNull
@Override
public String getText() {
return MAGIC_TEXT;
}
@Override
public boolean matches(@NotNull VcsCommitMetadata details) {
return details.getFullMessage().contains(MAGIC_TEXT);
}
};
return new VcsLogFilterCollection() {
@Nullable
@Override
public VcsLogBranchFilter getBranchFilter() {
return null;
}
@Nullable
@Override
public VcsLogUserFilter getUserFilter() {
return null;
}
@Nullable
@Override
public VcsLogDateFilter getDateFilter() {
return null;
}
@Nullable
@Override
public VcsLogTextFilter getTextFilter() {
return textFilter;
}
@Nullable
@Override
public VcsLogHashFilter getHashFilter() {
return null;
}
@Nullable
@Override
public VcsLogStructureFilter getStructureFilter() {
return null;
}
@Override
public boolean isEmpty() {
return false;
}
@NotNull
@Override
public List<VcsLogDetailsFilter> getDetailsFilters() {
return Collections.<VcsLogDetailsFilter>singletonList(textFilter);
}
};
}
}
|
