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

Example 1 with TextFilePatch

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

the class AutoMatchIterator method execute.

public List<TextFilePatchInProgress> execute(final List<TextFilePatch> list) {
    final List<TextFilePatch> creations = new LinkedList<>();
    final PatchBaseDirectoryDetector directoryDetector = PatchBaseDirectoryDetector.getInstance(myProject);
    for (TextFilePatch patch : list) {
        if (patch.isNewFile() || (patch.getBeforeName() == null)) {
            creations.add(patch);
            continue;
        }
        final String fileName = patch.getBeforeFileName();
        final Collection<VirtualFile> files = ApplicationManager.getApplication().runReadAction(new Computable<Collection<VirtualFile>>() {

            public Collection<VirtualFile> compute() {
                return directoryDetector.findFiles(fileName);
            }
        });
        for (AutoMatchStrategy strategy : myStrategies) {
            strategy.acceptPatch(patch, files);
        }
    }
    for (AutoMatchStrategy strategy : myStrategies) {
        strategy.beforeCreations();
    }
    // then try to match creations
    for (TextFilePatch creation : creations) {
        for (AutoMatchStrategy strategy : myStrategies) {
            strategy.processCreation(creation);
        }
    }
    for (AutoMatchStrategy strategy : myStrategies) {
        if (strategy.succeeded()) {
            return strategy.getResult();
        }
    }
    return myStrategies.get(myStrategies.size() - 1).getResult();
}

Example 2 with TextFilePatch

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

the class ImportToShelfExecutor method apply.

@Override
public void apply(@NotNull List<FilePatch> remaining, @NotNull final MultiMap<VirtualFile, TextFilePatchInProgress> patchGroupsToApply, @Nullable LocalChangeList localList, @Nullable final String fileName, @Nullable ThrowableComputable<Map<String, Map<String, CharSequence>>, PatchSyntaxException> additionalInfo) {
    if (fileName == null) {
        LOG.error("Patch file name shouldn't be null");
        return;
    }
    final VcsCatchingRunnable vcsCatchingRunnable = new VcsCatchingRunnable() {

        @Override
        public void runImpl() throws VcsException {
            final VirtualFile baseDir = myProject.getBaseDir();
            final File ioBase = new File(baseDir.getPath());
            final List<FilePatch> allPatches = new ArrayList<>();
            for (VirtualFile virtualFile : patchGroupsToApply.keySet()) {
                final File ioCurrentBase = new File(virtualFile.getPath());
                allPatches.addAll(ContainerUtil.map(patchGroupsToApply.get(virtualFile), new Function<TextFilePatchInProgress, TextFilePatch>() {

                    public TextFilePatch fun(TextFilePatchInProgress patchInProgress) {
                        final TextFilePatch was = patchInProgress.getPatch();
                        was.setBeforeName(PathUtil.toSystemIndependentName(FileUtil.getRelativePath(ioBase, new File(ioCurrentBase, was.getBeforeName()))));
                        was.setAfterName(PathUtil.toSystemIndependentName(FileUtil.getRelativePath(ioBase, new File(ioCurrentBase, was.getAfterName()))));
                        return was;
                    }
                }));
            }
            if (!allPatches.isEmpty()) {
                PatchEP[] patchTransitExtensions = null;
                if (additionalInfo != null) {
                    try {
                        final Map<String, PatchEP> extensions = new HashMap<>();
                        for (Map.Entry<String, Map<String, CharSequence>> entry : additionalInfo.compute().entrySet()) {
                            final String filePath = entry.getKey();
                            Map<String, CharSequence> extToValue = entry.getValue();
                            for (Map.Entry<String, CharSequence> innerEntry : extToValue.entrySet()) {
                                TransitExtension patchEP = (TransitExtension) extensions.get(innerEntry.getKey());
                                if (patchEP == null) {
                                    patchEP = new TransitExtension(innerEntry.getKey());
                                    extensions.put(innerEntry.getKey(), patchEP);
                                }
                                patchEP.put(filePath, innerEntry.getValue());
                            }
                        }
                        Collection<PatchEP> values = extensions.values();
                        patchTransitExtensions = values.toArray(new PatchEP[values.size()]);
                    } catch (PatchSyntaxException e) {
                        VcsBalloonProblemNotifier.showOverChangesView(myProject, "Can not import additional patch info: " + e.getMessage(), MessageType.ERROR);
                    }
                }
                try {
                    final ShelvedChangeList shelvedChangeList = ShelveChangesManager.getInstance(myProject).importFilePatches(fileName, allPatches, patchTransitExtensions);
                    ShelvedChangesViewManager.getInstance(myProject).activateView(shelvedChangeList);
                } catch (IOException e) {
                    throw new VcsException(e);
                }
            }
        }
    };
    ProgressManager.getInstance().runProcessWithProgressSynchronously(vcsCatchingRunnable, "Import Patch to Shelf", true, myProject);
    if (!vcsCatchingRunnable.get().isEmpty()) {
        AbstractVcsHelper.getInstance(myProject).showErrors(vcsCatchingRunnable.get(), IMPORT_TO_SHELF);
    }
}

Example 3 with TextFilePatch

use of com.intellij.openapi.diff.impl.patch.TextFilePatch 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;
}