From 533a5d9c2cc266b76d66373ee3c334f4e608051c Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 21 Feb 2018 13:12:52 +0300 Subject: [PATCH] vcs: do not include initially excluded files in commit dialog We update inclusion states in MultipleLocalChangeListsBrowser.setIncludedChanges, so exclusion markers in LST should be reset before ChangesBrowser initialisation. --- .../openapi/vcs/changes/ui/CommitChangeListDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index d5a3edaab6c4..99468f4f30f5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -305,6 +305,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj myCommitMessageArea.setChangeList(changeList); } else { + LineStatusTrackerManager.getInstanceImpl(myProject).resetExcludedFromCommitMarkers(); + MultipleLocalChangeListsBrowser browser = new MultipleLocalChangeListsBrowser(project, true, true, myShowVcsCommit); myBrowser = browser; @@ -329,8 +331,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj browser.getViewer().setKeepTreeState(true); } - LineStatusTrackerManager.getInstanceImpl(myProject).resetExcludedFromCommitMarkers(); - myChangesInfoCalculator = new ChangeInfoCalculator(); myLegend = new CommitLegendPanel(myChangesInfoCalculator); BorderLayoutPanel legendPanel = JBUI.Panels.simplePanel().addToRight(myLegend.getComponent());