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] turn current branch highlighting off when filtered by HEAD

Browse Source
This commit is contained in:
Julia Beliaeva
2016-03-23 18:43:57 +03:00
parent 5ce98f5faa
commit 1db28b9ae9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
+2 -1
View File
@@ -27,6 +27,7 @@ import java.awt.*;
public class CurrentBranchHighlighter implements VcsLogHighlighter {
private static final JBColor CURRENT_BRANCH_BG = new JBColor(new Color(228, 250, 255), new Color(63, 71, 73));
private static final String HEAD = "HEAD";
@NotNull private final VcsLogDataManager myDataManager;
@NotNull private final VcsLogUi myLogUi;
@Nullable private String mySingleFilteredBranch;
@@ -42,7 +43,7 @@ public class CurrentBranchHighlighter implements VcsLogHighlighter {
if (isSelected || !myLogUi.isHighlighterEnabled(Factory.ID)) return VcsCommitStyle.DEFAULT;
VcsLogProvider provider = myDataManager.getLogProvider(details.getRoot());
String currentBranch = provider.getCurrentBranch(details.getRoot());
if (currentBranch != null && !(currentBranch.equals(mySingleFilteredBranch))) {
if (!HEAD.equals(mySingleFilteredBranch) && currentBranch != null && !(currentBranch.equals(mySingleFilteredBranch))) {
Condition<CommitId> condition =
myDataManager.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot());
if (condition.value(new CommitId(details.getId(), details.getRoot()))) {