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

vcs: better error message if we failed to rollback partially applied patch

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-01-25 18:08:09 +03:00
parent 76b5ac7c1b
commit ecbfaf7c78
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java
+5 -7
View File
@@ -162,7 +162,7 @@ public class PatchApplier<BinaryType extends FilePatch> {
suggestRollback(myProject, Collections.singletonList(PatchApplier.this), beforeLabel);
}
else if (status == ApplyPatchStatus.ABORT) {
rollbackUnderProgress(myProject, myProject.getBaseDir(), beforeLabel);
rollbackUnderProgress(myProject, beforeLabel);
}
if (myShowNotification || !ApplyPatchStatus.SUCCESS.equals(status)) {
showApplyStatus(myProject, status);
@@ -272,7 +272,7 @@ public class PatchApplier<BinaryType extends FilePatch> {
suggestRollback(project, group, beforeLabel);
}
else if (result == ApplyPatchStatus.ABORT) {
rollbackUnderProgress(project, project.getBaseDir(), beforeLabel);
rollbackUnderProgress(project, beforeLabel);
}
showApplyStatus(project, result);
return result;
@@ -287,23 +287,21 @@ public class PatchApplier<BinaryType extends FilePatch> {
final UndoApplyPatchDialog undoApplyPatchDialog = new UndoApplyPatchDialog(project, filePaths, shouldInformAboutBinaries);
if (undoApplyPatchDialog.showAndGet()) {
rollbackUnderProgress(project, project.getBaseDir(), beforeLabel);
rollbackUnderProgress(project, beforeLabel);
}
}
private static void rollbackUnderProgress(@NotNull final Project project,
@NotNull final VirtualFile virtualFile,
@NotNull final Label labelToRevert) {
ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
try {
labelToRevert.revert(project, virtualFile);
labelToRevert.revert(project, project.getBaseDir());
VcsNotifier.getInstance(project)
.notifyImportantWarning("Apply Patch Aborted", "All files changed during apply patch action were rolled back");
}
catch (LocalHistoryException e) {
VcsNotifier.getInstance(project)
.notifyImportantWarning("Rollback Failed", String.format("Try using local history dialog for %s and perform revert manually.",
virtualFile.getName()));
.notifyImportantWarning("Rollback Failed", "Try using 'Local History' dialog to perform revert manually.");
}
}, "Rollback Applied Changes...", true, project);
}