From ab2449ca99d79992f9f6172fa7191bf50253e818 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 20 Mar 2019 14:05:58 +0300 Subject: [PATCH] [vcs-log] add registry key to disable filters copying for the new tab --- platform/util/resources/misc/registry.properties | 2 ++ .../vcs/log/ui/actions/OpenAnotherLogTabAction.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index d5b119afb784..934d725bb55f 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -472,6 +472,8 @@ vcs.log.speedsearch=false vcs.log.speedsearch.description=Enable speedsearch in Log (warning: performance is not excellent) vcs.log.filter.messages.by.hash=true vcs.log.filter.messages.by.hash.description=Find hashes in commit messages when filtering by hash. +vcs.log.copy.filters.to.new.tab=true +vcs.log.copy.filters.to.new.tab.description=If enabled, "Open Another Log Tab" action will copy active filters to the new tab. vcs.log.max.changes.shown=50000 vcs.log.max.changes.shown.description=Limit for showing commits in the changes view. vcs.new.history=true diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java index fa5eb763000a..ba74d71a9a69 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java @@ -20,12 +20,15 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.registry.Registry; import com.intellij.vcs.log.VcsLogDataKeys; +import com.intellij.vcs.log.VcsLogFilterCollection; import com.intellij.vcs.log.VcsLogUi; import com.intellij.vcs.log.impl.VcsLogManager; import com.intellij.vcs.log.impl.VcsProjectLog; import com.intellij.vcs.log.statistics.VcsLogUsageTriggerCollector; import com.intellij.vcs.log.ui.VcsLogInternalDataKeys; +import com.intellij.vcs.log.visible.filters.VcsLogFilterObject; import org.jetbrains.annotations.NotNull; public class OpenAnotherLogTabAction extends DumbAwareAction { @@ -54,6 +57,8 @@ public class OpenAnotherLogTabAction extends DumbAwareAction { Project project = e.getRequiredData(CommonDataKeys.PROJECT); VcsLogManager logManager = e.getRequiredData(VcsLogInternalDataKeys.LOG_MANAGER); VcsLogUi logUi = e.getRequiredData(VcsLogDataKeys.VCS_LOG_UI); - VcsProjectLog.getInstance(project).getTabsManager().openAnotherLogTab(logManager, logUi.getFilterUi().getFilters()); + VcsLogFilterCollection filters = Registry.is("vcs.log.copy.filters.to.new.tab") ? logUi.getFilterUi().getFilters() + : VcsLogFilterObject.collection(); + VcsProjectLog.getInstance(project).getTabsManager().openAnotherLogTab(logManager, filters); } }