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-64198 selective push fix

Browse Source 
When initial fetch completes, don't nullify unchecked commits. Instead retrieve them from the dialog.

ed9f81b introduced this bug: tree was completely refreshed after background fetch, thus information about some commits deselected by user was lost.
This commit is contained in:
Kirill Likhodedov
2011-02-28 12:59:16 +03:00
parent 5abf318e00
commit 02ec1b8fad
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
+12 -5
View File
@@ -524,16 +524,23 @@ public class GitPushActiveBranchesDialog extends DialogWrapper {
*
* @param fetchData if true, the current state is fetched from remote
* @param unchecked the map from vcs root to commit identifiers that should be unchecked
* @param initial set this true if refreshTree is called for the first time - during the dialog construction.
* the difference is that commit checkboxes should be checked only during the initial refresh - others should respect
* user who could uncheck some commits.
* @param updateCommits if true, then the specified unchecked commits should be used for building tree.
* if false, then <code>unchecked</code> are ignored and values are retrieved from the dialog.
* The latter is used for initial refresh which may finish after user has deselected some commits.
*/
private void refreshTree(final boolean fetchData, final Map<VirtualFile, Set<String>> unchecked, final boolean updateUncheckedCommits) {
private void refreshTree(final boolean fetchData, final Map<VirtualFile, Set<String>> unchecked, final boolean updateCommits) {
myCommitTree.setPaintBusy(true);
loadRootsInBackground(fetchData, new PushActiveBranchRunnable(){
@Override
void run(List<Root> roots) {
updateTree(roots, updateUncheckedCommits ? unchecked : null);
Map<VirtualFile, Set<String>> uncheckedCommits;
if (!updateCommits) {
RebaseInfo info = collectRebaseInfo();
uncheckedCommits = info.uncheckedCommits;
} else {
uncheckedCommits = unchecked;
}
updateTree(roots, uncheckedCommits);
updateUI();
myCommitTree.setPaintBusy(false);
}