mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[patch]: move refresh right before loading patch content
* not in EDT; * support changed patch file content outside project dir between dialog showing;
This commit is contained in:
+1
@@ -398,6 +398,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
|
||||
private static PatchReader loadPatches(@NotNull VirtualFile patchFile) {
|
||||
PatchReader reader;
|
||||
try {
|
||||
patchFile.refresh(false, false);
|
||||
reader = PatchVirtualFileReader.create(patchFile);
|
||||
}
|
||||
catch (IOException e) {
|
||||
|
||||
-1
@@ -71,7 +71,6 @@ 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(), ShelvedBinaryFilePatch::new);
|
||||
final ApplyPatchDifferentiatedDialog dialog =
|
||||
|
||||
Reference in New Issue
Block a user