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

[shelf]: use one commitContext for shelvedList while reading patch

Browse Source 
* otherwise additional info will be lost for all changes except first
and no context will be used for future diff ->history will be asked for
such files;
* todo: move commit context info into map and get by request
This commit is contained in:
Nadya Zabrodina
2017-06-02 20:13:00 +03:00
parent b3ca2daf60
commit 047ee7a127
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesActionProvider.java
+2 -4
View File
@@ -181,7 +181,7 @@ public class DiffShelvedChangesActionProvider implements AnActionExtensionProvid
final String base = project.getBasePath();
final ApplyPatchContext patchContext = new ApplyPatchContext(project.getBaseDir(), 0, false, false);
final PatchesPreloader preloader = new PatchesPreloader(project);
final CommitContext commitContext = new CommitContext();
for (final ShelvedChange shelvedChange : changesFromFirstList) {
final String beforePath = shelvedChange.getBeforePath();
final String afterPath = shelvedChange.getAfterPath();
@@ -200,7 +200,7 @@ public class DiffShelvedChangesActionProvider implements AnActionExtensionProvid
public DiffRequest process(@NotNull UserDataHolder context, @NotNull ProgressIndicator indicator)
throws DiffRequestProducerException, ProcessCanceledException {
try {
TextFilePatch patch = preloader.getPatch(shelvedChange, new CommitContext());
TextFilePatch patch = preloader.getPatch(shelvedChange, commitContext);
PatchDiffRequest patchDiffRequest =
new PatchDiffRequest(createAppliedTextPatch(patch), getName(), VcsBundle.message("patch.apply.conflict.patch"));
DiffUtil.addNotification(createNotification("Cannot find local file for '" + chooseNotNull(beforePath, afterPath) + "'"),
@@ -225,10 +225,8 @@ public class DiffShelvedChangesActionProvider implements AnActionExtensionProvid
}
if (isNewFile) return createDiffRequest(project, shelvedChange.getChange(project), getName(), context, indicator);
final CommitContext commitContext;
final TextFilePatch patch;
try {
commitContext = new CommitContext();
patch = preloader.getPatch(shelvedChange, commitContext);
}
catch (VcsException e) {