MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-21 14:37:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

[shelf]: refresh VF content of patchFile before apply; cleanUp

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-07-01 17:53:42 +03:00
parent 3eeff07de2
commit df0a60bfa3
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveWithDialogAction.java
+3 -9
View File
@@ -29,14 +29,12 @@ import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.patch.ApplyPatchDifferentiatedDialog;
import com.intellij.openapi.vcs.changes.patch.ApplyPatchExecutor;
import com.intellij.openapi.vcs.changes.patch.ApplyPatchMode;
import com.intellij.openapi.vcs.changes.patch.UnshelvePatchDefaultExecutor;
import com.intellij.openapi.vcs.changes.ui.ChangeListChooser;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -73,13 +71,9 @@ public class UnshelveWithDialogAction extends DumbAwareAction {
VcsBalloonProblemNotifier.showOverChangesView(project, "Can not find path file", MessageType.ERROR);
return;
}
virtualFile.refresh(false, false);
List<ShelvedBinaryFilePatch> binaryShelvedPatches =
ContainerUtil.map(changeList.getBinaryFiles(), new Function<ShelvedBinaryFile, ShelvedBinaryFilePatch>() {
@Override
public ShelvedBinaryFilePatch fun(ShelvedBinaryFile file) {
return new ShelvedBinaryFilePatch(file);
}
});
ContainerUtil.map(changeList.getBinaryFiles(), ShelvedBinaryFilePatch::new);
final ApplyPatchDifferentiatedDialog dialog =
new MyUnshelveDialog(project, virtualFile, changeList, binaryShelvedPatches, e.getData(VcsDataKeys.CHANGES));
dialog.setHelpId("reference.dialogs.vcs.unshelve");
@@ -138,7 +132,7 @@ public class UnshelveWithDialogAction extends DumbAwareAction {
@NotNull List<ShelvedBinaryFilePatch> binaryShelvedPatches,
@Nullable Change[] preselectedChanges) {
super(project, new UnshelvePatchDefaultExecutor(project, changeList, binaryShelvedPatches),
Collections.<ApplyPatchExecutor>emptyList(), ApplyPatchMode.UNSHELVE,
Collections.emptyList(), ApplyPatchMode.UNSHELVE,
patchFile, null, getPredefinedChangeList(changeList.DESCRIPTION, ChangeListManager.getInstance(project)), binaryShelvedPatches,
hasNotAllSelectedChanges(project, changeList, preselectedChanges) ? newArrayList(preselectedChanges) : null,
changeList.DESCRIPTION, true);