MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[log] IDEA-132218 Fix in-memory filter when old branch filter is active

Browse Source 
When filtering in memory, we walk down by the permanent graph => we
need to check each commit whether it matches the branch filter as
well, otherwise we get commits which match username only => receive a
visible graph with 0 visible commits.
This commit is contained in:
Kirill Likhodedov
2014-11-02 17:33:54 +03:00
parent 9d6b403036
commit f8c8846def
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java
+25 -7
View File
@@ -63,12 +63,13 @@ class VisiblePackBuilder {
return Pair.create(applyHashFilter(dataPack, hashFilter.getHashes(), sortType), commitCount);
}
Set<Integer> matchingHeads = getMatchingHeads(dataPack.getRefs(), filters);
List<VcsLogDetailsFilter> detailsFilters = filters.getDetailsFilters();
List<Hash> matchingCommits = null;
boolean canRequestMore = false;
if (!detailsFilters.isEmpty()) {
if (commitCount == CommitCountStage.INITIAL) {
matchingCommits = filterInMemory(dataPack.getPermanentGraph(), detailsFilters);
matchingCommits = filterInMemory(dataPack.getPermanentGraph(), detailsFilters, matchingHeads);
if (matchingCommits.size() < commitCount.getCount()) {
commitCount = commitCount.next();
matchingCommits = null;
@@ -94,8 +95,7 @@ class VisiblePackBuilder {
visibleGraph = EmptyVisibleGraph.getInstance();
}
else {
visibleGraph = dataPack.getPermanentGraph().createVisibleGraph(sortType, getMatchingHeads(dataPack.getRefs(), filters),
getFilterFromCommits(matchingCommits));
visibleGraph = dataPack.getPermanentGraph().createVisibleGraph(sortType, matchingHeads, getFilterFromCommits(matchingCommits));
}
return Pair.create(new VisiblePack(dataPack, visibleGraph, canRequestMore), commitCount);
}
@@ -139,7 +139,9 @@ class VisiblePackBuilder {
}
@NotNull
private List<Hash> filterInMemory(@NotNull PermanentGraph<Integer> permanentGraph, @NotNull List<VcsLogDetailsFilter> detailsFilters) {
private List<Hash> filterInMemory(@NotNull PermanentGraph<Integer> permanentGraph,
@NotNull List<VcsLogDetailsFilter> detailsFilters,
@Nullable Set<Integer> matchingHeads) {
List<Hash> result = ContainerUtil.newArrayList();
for (GraphCommit<Integer> commit : permanentGraph.getAllCommits()) {
VcsCommitMetadata data = getDetailsFromCache(commit.getId());
@@ -147,18 +149,34 @@ class VisiblePackBuilder {
// no more continuous details in the cache
break;
}
if (matchesAllFilters(data, detailsFilters)) {
if (matchesAllFilters(data, permanentGraph, detailsFilters, matchingHeads)) {
result.add(data.getId());
}
}
return result;
}
private static boolean matchesAllFilters(@NotNull final VcsCommitMetadata commit, @NotNull List<VcsLogDetailsFilter> detailsFilters) {
private boolean matchesAllFilters(@NotNull final VcsCommitMetadata commit,
@NotNull final PermanentGraph<Integer> permanentGraph,
@NotNull List<VcsLogDetailsFilter> detailsFilters,
@Nullable final Set<Integer> matchingHeads) {
final int commitIndex = myHashMap.getCommitIndex(commit.getId());
return ContainerUtil.and(detailsFilters, new Condition<VcsLogDetailsFilter>() {
@Override
public boolean value(VcsLogDetailsFilter filter) {
return filter.matches(commit);
if (!filter.matches(commit)) {
return false;
}
if (matchingHeads == null) {
return true;
}
Set<Integer> containingBranches = permanentGraph.getContainingBranches(commitIndex);
return ContainerUtil.exists(containingBranches, new Condition<Integer>() {
@Override
public boolean value(Integer integer) {
return matchingHeads.contains(integer);
}
});
}
});
}