Examples with FilePatch com.intellij.openapi.diff.impl.patch.FilePatch used on opensource projects

Example 11 with FilePatch

use of com.intellij.openapi.diff.impl.patch.FilePatch in project intellij-community by JetBrains.

the class PatchApplier method actualApply.

@Nullable
private ApplyPatchStatus actualApply(final List<Pair<VirtualFile, ApplyTextFilePatch>> textPatches, final List<Pair<VirtualFile, ApplyFilePatchBase<BinaryType>>> binaryPatches, final CommitContext commitContext) {
    final ApplyPatchContext context = new ApplyPatchContext(myBaseDirectory, 0, true, true);
    ApplyPatchStatus status;
    try {
        status = applyList(textPatches, context, null, commitContext);
        if (status == ApplyPatchStatus.ABORT)
            return status;
        if (myCustomForBinaries == null) {
            status = applyList(binaryPatches, context, status, commitContext);
        } else {
            ApplyPatchStatus patchStatus = myCustomForBinaries.apply(binaryPatches);
            final List<FilePatch> appliedPatches = myCustomForBinaries.getAppliedPatches();
            moveForCustomBinaries(binaryPatches, appliedPatches);
            status = ApplyPatchStatus.and(status, patchStatus);
            myRemainingPatches.removeAll(appliedPatches);
        }
    } catch (IOException e) {
        showError(myProject, e.getMessage());
        return ApplyPatchStatus.ABORT;
    }
    return status;
}

Example 12 with FilePatch

use of com.intellij.openapi.diff.impl.patch.FilePatch in project intellij-community by JetBrains.

the class ShelvedChangeList method getChanges.

public List<ShelvedChange> getChanges(Project project) {
    if (myChanges == null) {
        try {
            myChanges = new ArrayList<>();
            final List<? extends FilePatch> list = ShelveChangesManager.loadPatchesWithoutContent(project, PATH, null);
            for (FilePatch patch : list) {
                FileStatus status;
                if (patch.isNewFile()) {
                    status = FileStatus.ADDED;
                } else if (patch.isDeletedFile()) {
                    status = FileStatus.DELETED;
                } else {
                    status = FileStatus.MODIFIED;
                }
                myChanges.add(new ShelvedChange(PATH, patch.getBeforeName(), patch.getAfterName(), status));
            }
        } catch (Exception e) {
            LOG.error("Failed to parse the file patch: [" + PATH + "]", e);
        }
    }
    return myChanges;
}

Example 13 with FilePatch

use of com.intellij.openapi.diff.impl.patch.FilePatch in project intellij-community by JetBrains.

the class ApplyPatchSaveToFileExecutor method toOnePatchGroup.

@NotNull
public static List<FilePatch> toOnePatchGroup(@NotNull MultiMap<VirtualFile, TextFilePatchInProgress> patchGroups, @NotNull VirtualFile newPatchBase) throws IOException {
    List<FilePatch> result = newArrayList();
    for (Map.Entry<VirtualFile, Collection<TextFilePatchInProgress>> entry : patchGroups.entrySet()) {
        VirtualFile oldPatchBase = entry.getKey();
        String relativePath = VfsUtilCore.getRelativePath(oldPatchBase, newPatchBase, '/');
        boolean toConvert = !isEmptyOrSpaces(relativePath) && !".".equals(relativePath);
        for (TextFilePatchInProgress patchInProgress : entry.getValue()) {
            TextFilePatch patch = patchInProgress.getPatch();
            if (toConvert) {
                patch.setBeforeName(getNewBaseRelativePath(newPatchBase, oldPatchBase, patch.getBeforeName()));
                patch.setAfterName(getNewBaseRelativePath(newPatchBase, oldPatchBase, patch.getAfterName()));
            }
            result.add(patch);
        }
    }
    return result;
}