From adb4e613bf3b5a1d4becb6601ce316a83b521ae2 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 18 Jan 2013 12:19:48 +0400 Subject: [PATCH] Create patch dialog: don't select "include base revision" checkbox by default, remember the setting. --- .../vcs/changes/patch/CreatePatchConfigurationPanel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java index b3b081c14089..2fb12e914799 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java @@ -191,8 +191,7 @@ public class CreatePatchConfigurationPanel { inclusionListener.run(); final VcsConfiguration configuration = VcsConfiguration.getInstance(myProject); - boolean turnOn = dvcsIsUsed || configuration.INCLUDE_TEXT_INTO_PATCH; - myIncludeBaseRevisionTextCheckBox.setSelected(turnOn); + myIncludeBaseRevisionTextCheckBox.setSelected(configuration.INCLUDE_TEXT_INTO_PATCH); myIncludeBaseRevisionTextCheckBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -220,7 +219,7 @@ public class CreatePatchConfigurationPanel { } public void onOk() { - if (myIncludeBaseRevisionTextCheckBox.isVisible() && !myDvcsIsUsed) { + if (myIncludeBaseRevisionTextCheckBox.isVisible()) { final VcsConfiguration vcsConfiguration = VcsConfiguration.getInstance(myProject); vcsConfiguration.INCLUDE_TEXT_INTO_PATCH = myIncludeBaseRevisionTextCheckBox.isSelected(); }