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-187108 vcs: do not include initially excluded files in commit dialog

Browse Source 
Fix case when non-active changelist is selected by default.
We reset inclusion states in `setSelectedCahngeList`,
so inclusion state should be initialized after changelist.

follow-up: 533a5d9c2c
This commit is contained in:
Aleksey Pivovarov
2018-02-27 15:20:31 +03:00
parent 3038a13477
commit 5c156006ae
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+2 -1
View File
@@ -310,10 +310,11 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
MultipleLocalChangeListsBrowser browser = new MultipleLocalChangeListsBrowser(project, true, true, myShowVcsCommit);
myBrowser = browser;
browser.getViewer().setIncludedChanges(included);
if (initialSelection != null) browser.setSelectedChangeList(initialSelection);
myCommitMessageArea.setChangeList(browser.getSelectedChangeList());
browser.getViewer().setIncludedChanges(included);
DiffCommitMessageEditor commitMessageEditor = new DiffCommitMessageEditor(myProject, myCommitMessageArea);
browser.setBottomDiffComponent(commitMessageEditor);