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

Add debug logging to track issue with disappearing "non-picked commits" highlighting in IDEA-196838

Browse Source
This commit is contained in:
Kirill Likhodedov
2018-08-06 18:31:28 +03:00
parent 8cbb8af5c5
commit a63b7bc86c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/DeepComparator.java
+7 -1
View File
@@ -79,6 +79,7 @@ public class DeepComparator implements VcsLogHighlighter, Disposable {
}
Map<GitRepository, GitBranch> repositories = getRepositories(myUi.getDataPack().getLogProviders(), branchToCompare);
LOG.debug("Highlighting requested: " + repositories);
if (repositories.isEmpty()) {
removeHighlighting();
return;
@@ -149,7 +150,10 @@ public class DeepComparator implements VcsLogHighlighter, Disposable {
}
String comparedBranch = myTask.myComparedBranch;
if (!myTask.myComparedBranch.equals(VcsLogUtil.getSingleFilteredBranch(dataPack.getFilters(), dataPack.getRefs()))) {
String singleFilteredBranch = VcsLogUtil.getSingleFilteredBranch(dataPack.getFilters(), dataPack.getRefs());
if (!myTask.myComparedBranch.equals(singleFilteredBranch)) {
LOG.debug(String.format("Branch filter changed. Compared branch: %s, filtered branch: %s",
myTask.myComparedBranch, singleFilteredBranch));
stopAndUnhighlight();
notifyHighlightingCancelled();
return;
@@ -168,6 +172,8 @@ public class DeepComparator implements VcsLogHighlighter, Disposable {
highlightInBackground(comparedBranch, provider);
}
else {
LOG.debug(String.format("Repositories with current branches changed. Actual:\n%s\nExpected:\n%s",
repositories, repositoriesWithCurrentBranches));
removeHighlighting();
}
}