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

IDEA-152400 vcs: save previous commit message in history before overriding it on Amend

Browse Source 
otherwise, the previous value would be lost if dialog is canceled
This commit is contained in:
Aleksey Pivovarov
2016-03-03 13:02:34 +03:00
parent 1f6af9e047
commit e075898dbd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java
+3 -2
View File
@@ -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<VirtualFile, String> 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);
}
}