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.
This commit is contained in:
Aleksey Pivovarov
2018-02-21 13:15:02 +03:00
parent 2456098032
commit 533a5d9c2c
@@ -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());