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

svn: Save documents only once while shelving changes before merge

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent ee9be7f8d6
commit 9b65492797
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShelveLocalChangesTask.java
+3 -9
View File
@@ -15,8 +15,6 @@
*/
package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
@@ -30,6 +28,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
import static com.intellij.openapi.application.ApplicationManager.getApplication;
import static com.intellij.openapi.vcs.changes.ChangesUtil.getAfterRevisionsFiles;
import static com.intellij.util.containers.ContainerUtil.newArrayList;
import static java.util.stream.Collectors.toList;
@@ -57,11 +56,10 @@ public class ShelveLocalChangesTask extends BaseMergeTask {
List<VirtualFile> changedFiles = newArrayList();
ShelveChangesManager shelveManager = ShelveChangesManager.getInstance(myMergeContext.getProject());
getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments());
for (Map.Entry<String, List<Change>> entry : myIntersection.getChangesByLists().entrySet()) {
try {
// TODO: Could this be done once before for loop?
saveAllDocuments();
shelveManager
.shelveChanges(entry.getValue(), myIntersection.getComment(entry.getKey()) + " (auto shelve before merge)", true, true);
// TODO: ChangesUtil.getFilesFromChanges() performs refresh of several files.
@@ -78,8 +76,4 @@ public class ShelveLocalChangesTask extends BaseMergeTask {
return changedFiles;
}
private static void saveAllDocuments() {
ApplicationManager.getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments(), ModalityState.NON_MODAL);
}
}