From e075898dbd3dc04721f1702f0753b50f295aea2e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 3 Mar 2016 12:57:11 +0300 Subject: [PATCH] IDEA-152400 vcs: save previous commit message in history before overriding it on `Amend` otherwise, the previous value would be lost if dialog is canceled --- .../src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java b/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java index 943748a87a6f..fdc3432fe924 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.CheckinProjectPanel; import com.intellij.openapi.vcs.FilePath; +import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vfs.VirtualFile; @@ -49,7 +50,7 @@ public abstract class DvcsCommitAdditionalComponent implements RefreshableOnComp protected final JPanel myPanel; protected final JCheckBox myAmend; - @Nullable private String myPreviousMessage; + @Nullable private final String myPreviousMessage; @Nullable private String myAmendedMessage; @NotNull protected final CheckinProjectPanel myCheckinPanel; @Nullable private Map myMessagesForRoots; @@ -140,8 +141,8 @@ public abstract class DvcsCommitAdditionalComponent implements RefreshableOnComp } private void substituteCommitMessage(@NotNull String newMessage) { - myPreviousMessage = myCheckinPanel.getCommitMessage(); if (!myPreviousMessage.trim().equals(newMessage.trim())) { + VcsConfiguration.getInstance(myCheckinPanel.getProject()).saveCommitMessage(myPreviousMessage); myCheckinPanel.setCommitMessage(newMessage); } }