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]: do not load history if the base texts are already inside patch

Browse Source
This commit is contained in:
Nadya Zabrodina
2017-05-17 17:22:44 +03:00
parent 140109f1eb
commit 06a7e1d503
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchForBaseRevisionTexts.java
+12 -12
View File
@@ -70,6 +70,18 @@ public class ApplyPatchForBaseRevisionTexts {
final List<PatchHunk> hunks = patch.getHunks();
CharSequence contents = baseContents != null ? baseContents.get() : null;
if (contents != null) {
contents = StringUtil.convertLineSeparators(contents.toString());
myBase = contents;
final GenericPatchApplier applier = new GenericPatchApplier(contents, hunks);
if (!applier.execute()) {
applier.trySolveSomehow();
}
setPatched(applier.getAfter());
return;
}
if (provider != null) {
try {
provider.getBaseVersionContent(pathBeforeRename, text -> {
@@ -88,18 +100,6 @@ public class ApplyPatchForBaseRevisionTexts {
if (myPatched != null) return;
}
CharSequence contents = baseContents.get();
if (contents != null) {
contents = StringUtil.convertLineSeparators(contents.toString());
myBase = contents;
final GenericPatchApplier applier = new GenericPatchApplier(contents, hunks);
if (! applier.execute()) {
applier.trySolveSomehow();
}
setPatched(applier.getAfter());
return;
}
final GenericPatchApplier applier = new GenericPatchApplier(myLocal, hunks);
if (! applier.execute()) {
applier.trySolveSomehow();