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

[patch]: provide base path to patch writer to be able construct additional info properly

Browse Source 
* PatchEP use project based path to provide additional info, so we need to provide base patch path also to patch writer;
* fix create patch from local history: do not ignore encoding field;
* reuse PatchWriter in PatchCreator;
* remove innecessary methods;
* annotations added;
* NOTE: there are still several problems with additional info creation and migrations from patch to shelf and vise versa, especially with renamed files
This commit is contained in:
Nadya Zabrodina
2016-06-06 21:16:54 +03:00
parent 2af7100164
commit f2e57150d8
8 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/integration/patches/PatchCreator.java
+5 -19
View File
@@ -18,25 +18,22 @@ package com.intellij.history.integration.patches;
import com.intellij.openapi.diff.impl.patch.FilePatch;
import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder;
import com.intellij.openapi.diff.impl.patch.UnifiedDiffWriter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.CommitContext;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.openapi.vcs.changes.patch.PatchWriter;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.List;
public class PatchCreator {
public static void create(Project p, List<Change> changes, String filePath, boolean isReverse, CommitContext commitContext)
throws IOException, VcsException {
create(p, ObjectUtils.assertNotNull(p.getBasePath()), changes, filePath, isReverse, commitContext);
create(p, ObjectUtils.assertNotNull(p.getBasePath()), changes, filePath, isReverse, commitContext, Charset.defaultCharset());
}
public static void create(Project p,
@@ -44,20 +41,9 @@ public class PatchCreator {
List<Change> changes,
String filePath,
boolean isReverse,
CommitContext commitContext)
CommitContext commitContext, Charset charset)
throws IOException, VcsException {
List<FilePatch> patches = IdeaTextPatchBuilder.buildPatch(p, changes, basePath, isReverse);
writeFilePatches(p, filePath, patches, commitContext);
}
public static void writeFilePatches(Project p, String filePath, List<FilePatch> patches, CommitContext commitContext) throws IOException {
Writer writer = new OutputStreamWriter(new FileOutputStream(filePath));
try {
String lineSeparator = CodeStyleSettingsManager.getInstance(p).getCurrentSettings().getLineSeparator();
UnifiedDiffWriter.write(p, patches, writer, lineSeparator, commitContext);
}
finally {
writer.close();
}
PatchWriter.writePatches(p, filePath, basePath, patches, commitContext, charset);
}
}
platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java
+4 -2
View File
@@ -35,9 +35,11 @@ import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -191,8 +193,8 @@ public abstract class HistoryDialogModel {
return new Change(d.getLeftContentRevision(myGateway), d.getRightContentRevision(myGateway));
}
public void createPatch(String path, String basePath, boolean isReverse) throws VcsException, IOException {
PatchCreator.create(myProject, basePath, getChanges(), path, isReverse, null);
public void createPatch(String path, String basePath, boolean isReverse, @NotNull Charset charset) throws VcsException, IOException {
PatchCreator.create(myProject, basePath, getChanges(), path, isReverse, null, charset);
}
public abstract Reverter createReverter();
platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java
+1 -1
View File
@@ -458,7 +458,7 @@ public abstract class HistoryDialog<T extends HistoryDialogModel> extends FrameW
p.setFileName(getDefaultPatchFile());
p.setCommonParentPath(ChangesUtil.findCommonAncestor(myModel.getChanges()));
if (!showAsDialog(p)) return;
myModel.createPatch(p.getFileName(), p.getBaseDirName(), p.isReversePatch());
myModel.createPatch(p.getFileName(), p.getBaseDirName(), p.isReversePatch(), p.getEncoding());
showNotification(LocalHistoryBundle.message("message.patch.created"));
ShowFilePathAction.openFile(new File(p.getFileName()));
platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java
+3 -1
View File
@@ -19,6 +19,8 @@ package com.intellij.history.integration.ui;
import com.intellij.history.integration.PatchingTestCase;
import com.intellij.history.integration.ui.models.DirectoryHistoryDialogModel;
import java.nio.charset.Charset;
public class DirectoryHistoryDialogPatchCreationTest extends PatchingTestCase {
public void testPatchCreation() throws Exception {
createChildData(myRoot, "f1.txt");
@@ -29,7 +31,7 @@ public class DirectoryHistoryDialogPatchCreationTest extends PatchingTestCase {
assertSize(3, m.getRevisions());
m.selectRevisions(0, 2);
m.createPatch(patchFilePath, myProject.getBasePath(), false);
m.createPatch(patchFilePath, myProject.getBasePath(), false, Charset.defaultCharset());
clearRoot();
applyPatch();
platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java
+26 -4
View File
@@ -24,12 +24,16 @@ package com.intellij.openapi.diff.impl.patch;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.changes.CommitContext;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.text.MessageFormat;
@@ -56,13 +60,23 @@ public class UnifiedDiffWriter {
public static void write(Project project, Collection<FilePatch> patches, Writer writer, final String lineSeparator,
final PatchEP[] extensions, final CommitContext commitContext) throws IOException {
write(project, project == null ? null : project.getBasePath(), patches, writer, lineSeparator, extensions, commitContext);
}
public static void write(Project project,
@Nullable String basePath,
Collection<FilePatch> patches,
Writer writer,
final String lineSeparator,
@NotNull final PatchEP[] extensions,
final CommitContext commitContext) throws IOException {
for(FilePatch filePatch: patches) {
if (!(filePatch instanceof TextFilePatch)) continue;
TextFilePatch patch = (TextFilePatch) filePatch;
final String path = patch.getBeforeName() == null ? patch.getAfterName() : patch.getBeforeName();
final Map<String , CharSequence> additionalMap = new HashMap<String, CharSequence>();
TextFilePatch patch = (TextFilePatch)filePatch;
String pathRelatedToProjectDir = getPathRelatedToDir(ObjectUtils.assertNotNull(project.getBasePath()), basePath, patch);
final Map<String, CharSequence> additionalMap = new HashMap<String, CharSequence>();
for (PatchEP extension : extensions) {
final CharSequence charSequence = extension.provideContent(path, commitContext);
final CharSequence charSequence = extension.provideContent(pathRelatedToProjectDir, commitContext);
if (! StringUtil.isEmpty(charSequence)) {
additionalMap.put(extension.getName(), charSequence);
}
@@ -98,6 +112,14 @@ public class UnifiedDiffWriter {
}
}
@NotNull
private static String getPathRelatedToDir(@NotNull String newBaseDir, @Nullable String basePath, @NotNull TextFilePatch patch) {
final String path = ObjectUtils.assertNotNull(patch.getBeforeName() == null ? patch.getAfterName() : patch.getBeforeName());
if (basePath == null) return path;
String result = FileUtil.getRelativePath(new File(newBaseDir), new File(basePath, path));
return result == null ? path : result;
}
private static void writeFileHeading(final FilePatch patch,
final Writer writer,
final String lineSeparator,
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+3 -2
View File
@@ -208,8 +208,9 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr
VcsApplicationSettings.getInstance().PATCH_STORAGE_LOCATION = PATCH_PATH;
final boolean reversePatch = myPanel.isReversePatch();
List<FilePatch> patches = IdeaTextPatchBuilder.buildPatch(myProject, changes, myPanel.getBaseDirName(), reversePatch);
PatchWriter.writePatches(myProject, fileName, patches, myCommitContext, myPanel.getEncoding());
String baseDirName = myPanel.getBaseDirName();
List<FilePatch> patches = IdeaTextPatchBuilder.buildPatch(myProject, changes, baseDirName, reversePatch);
PatchWriter.writePatches(myProject, fileName, baseDirName, patches, myCommitContext, myPanel.getEncoding());
final String message;
if (binaryCount == 0) {
message = VcsBundle.message("create.patch.success.confirmation", file.getPath());
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java
+7 -7
View File
@@ -17,10 +17,13 @@ package com.intellij.openapi.vcs.changes.patch;
import com.intellij.codeStyle.CodeStyleFacade;
import com.intellij.openapi.diff.impl.patch.FilePatch;
import com.intellij.openapi.diff.impl.patch.PatchEP;
import com.intellij.openapi.diff.impl.patch.UnifiedDiffWriter;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.changes.CommitContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -29,24 +32,21 @@ import java.io.Writer;
import java.nio.charset.Charset;
import java.util.List;
/**
* @author irengrig
* Date: 2/25/11
* Time: 6:41 PM
*/
public class PatchWriter {
private PatchWriter() {
}
public static void writePatches(final Project project,
public static void writePatches(@NotNull final Project project,
String fileName,
@Nullable String basePath,
List<FilePatch> patches,
CommitContext commitContext,
@NotNull Charset charset) throws IOException {
Writer writer = new OutputStreamWriter(new FileOutputStream(fileName), charset);
try {
final String lineSeparator = CodeStyleFacade.getInstance(project).getLineSeparator();
UnifiedDiffWriter.write(project, patches, writer, lineSeparator, commitContext);
UnifiedDiffWriter
.write(project, basePath, patches, writer, lineSeparator, Extensions.getExtensions(PatchEP.EP_NAME, project), commitContext);
}
finally {
writer.close();
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java
+2 -1
View File
@@ -87,7 +87,8 @@ public class ApplyPatchSaveToFileExecutor implements ApplyPatchExecutor<TextFile
final VirtualFile baseForPatch = myBaseForPatch == null ? baseDir : myBaseForPatch;
try {
final List<FilePatch> textPatches = patchGroupsToOneGroup(patchGroupsToApply, baseForPatch);
PatchWriter.writePatches(myProject, save.getFile().getPath(), textPatches, commitContext, CharsetToolkit.UTF8_CHARSET);
PatchWriter.writePatches(myProject, save.getFile().getPath(), baseForPatch.getPath(), textPatches, commitContext,
CharsetToolkit.UTF8_CHARSET);
}
catch (final IOException e) {
LOG.info(e);