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

[vcs-log] fix branch filter

Browse Source
This commit is contained in:
Julia Beliaeva
2016-09-20 00:15:17 +03:00
parent 13d2a10947
commit ca1069c3e8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
+6 -1
View File
@@ -108,9 +108,14 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
baseController = new BekBaseController(this, myBekIntMap.get());
}
LinearGraphController controller;
// TODO this code is unclear and obviously needs some refactoring
// I'll leave it for later to reorganize, and add some duplication for now, in order just to fix stuff
CascadeController controller;
if (matchingCommits != null) {
controller = new FilteredController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchingCommits));
if (visibleHeads != null) {
controller = new BranchFilterController(controller, this, myPermanentCommitsInfo.convertToNodeIds(visibleHeads, true));
}
}
else if (sortType == SortType.LinearBek) {
if (visibleHeads != null) {