return;
}
+ String comparedBranch = myTask.myComparedBranch;
+ VcsLogBranchFilter branchFilter = dataPack.getFilters().getBranchFilter();
+ if (branchFilter == null || !myTask.myComparedBranch.equals(VcsLogUtil.getSingleFilteredBranch(branchFilter, dataPack.getRefs()))) {
+ stopAndUnhighlight();
+ return;
+ }
+
if (refreshHappened) {
- // collect data
- String comparedBranch = myTask.myComparedBranch;
Map<GitRepository, GitBranch> repositoriesWithCurrentBranches = myTask.myRepositoriesWithCurrentBranches;
VcsLogDataProvider provider = myTask.myProvider;
// highlight again
Map<GitRepository, GitBranch> repositories = getRepositories(dataPack.getLogProviders(), comparedBranch);
- if (repositories.equals(repositoriesWithCurrentBranches)) { // but not if current branch changed
+ if (repositories.equals(repositoriesWithCurrentBranches)) {
+ // but not if current branch changed
highlightInBackground(comparedBranch, provider);
}
- }
- else {
- VcsLogBranchFilter branchFilter = dataPack.getFilters().getBranchFilter();
- if (branchFilter == null || !myTask.myComparedBranch.equals(VcsLogUtil.getSingleFilteredBranch(branchFilter, dataPack.getRefs()))) {
- stopAndUnhighlight();
+ else {
+ removeHighlighting();
}
}
}
handler.runInCurrentThread(null);
return pickedCommits;
}
-
}
}
\ No newline at end of file