Ensure DiffFormatter is closed in CreatePatchOperation
Change-Id: I2c1e9e67a217903632ad57134468358a515b03cd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java
index f124de9..dd2c800 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java
@@ -50,6 +50,7 @@
import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -162,18 +163,62 @@
@Override
public void execute(IProgressMonitor monitor) throws CoreException {
- EclipseGitProgressTransformer gitMonitor = new EclipseGitProgressTransformer(
- monitor);
+ try (final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ final DiffFormatter diffFmt = createDiffFormatter(
+ outputStream, monitor)) {
- final StringBuilder sb = new StringBuilder();
- final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- final DiffFormatter diffFmt = new DiffFormatter(outputStream) {
+ diffFmt.setContext(contextLines);
+ final StringBuilder sb = new StringBuilder();
+ if (headerFormat != null && headerFormat != DiffHeaderFormat.NONE) {
+ writeGitPatchHeader(sb);
+ }
+ diffFmt.setRepository(repository);
+ diffFmt.setPathFilter(pathFilter);
+
+ if (commit != null) {
+ List<DiffEntry> diffs = diffFmt.scan(getParentId(), commit.getId());
+ for (DiffEntry ent : diffs) {
+ String path;
+ if (ChangeType.DELETE.equals(ent.getChangeType())) {
+ path = ent.getOldPath();
+ } else {
+ path = ent.getNewPath();
+ }
+ currentEncoding = CompareCoreUtils
+ .getResourceEncoding(repository, path);
+ diffFmt.format(ent);
+ }
+ } else {
+ diffFmt.format(new DirCacheIterator(repository.readDirCache()),
+ new FileTreeIterator(repository));
+ }
+ diffFmt.flush();
+
+ appendOutputStream(sb, outputStream);
+
+ if (DiffHeaderFormat.WORKSPACE == headerFormat) {
+ updateWorkspacePatchPrefixes(sb, diffFmt);
+ }
+ patchContent = sb.toString();
+ } catch (IOException e) {
+ Activator.logError(
+ CoreText.CreatePatchOperation_patchFileCouldNotBeWritten,
+ e);
+ }
+ }
+
+ private DiffFormatter createDiffFormatter(
+ final ByteArrayOutputStream outputStream,
+ IProgressMonitor monitor) {
+ DiffFormatter diffFmt = new DiffFormatter(outputStream) {
+
private IProject project;
@Override
public void format(DiffEntry ent) throws IOException,
CorruptObjectException, MissingObjectException {
- // for "workspace patches" add project header each time project changes
+ // for "workspace patches" add project header each time project
+ // changes
if (DiffHeaderFormat.WORKSPACE == headerFormat) {
IProject p = getProject(ent);
if (p != null && !p.equals(project)) {
@@ -185,48 +230,28 @@
super.format(ent);
}
};
+ diffFmt.setProgressMonitor(new EclipseGitProgressTransformer(monitor));
+ return diffFmt;
+ }
- diffFmt.setProgressMonitor(gitMonitor);
- diffFmt.setContext(contextLines);
-
- if (headerFormat != null && headerFormat != DiffHeaderFormat.NONE)
- writeGitPatchHeader(sb);
-
- diffFmt.setRepository(repository);
- diffFmt.setPathFilter(pathFilter);
-
- try {
- if (commit != null) {
- RevCommit[] parents = commit.getParents();
- if (parents.length > 1)
- throw new IllegalStateException(
- CoreText.CreatePatchOperation_cannotCreatePatchForMergeCommit);
-
- ObjectId parentId;
- if (parents.length > 0)
- parentId = parents[0].getId();
- else
- parentId = null;
- List<DiffEntry> diffs = diffFmt.scan(parentId, commit.getId());
- for (DiffEntry ent : diffs) {
- String path;
- if (ChangeType.DELETE.equals(ent.getChangeType()))
- path = ent.getOldPath();
- else
- path = ent.getNewPath();
- currentEncoding = CompareCoreUtils.getResourceEncoding(repository, path);
- diffFmt.format(ent);
- }
- } else {
- diffFmt.format(
- new DirCacheIterator(repository.readDirCache()),
- new FileTreeIterator(repository));
- }
- diffFmt.flush();
- } catch (IOException e) {
- Activator.logError(CoreText.CreatePatchOperation_patchFileCouldNotBeWritten, e);
+ private AnyObjectId getParentId() {
+ RevCommit[] parents = commit.getParents();
+ if (parents.length > 1) {
+ throw new IllegalStateException(
+ CoreText.CreatePatchOperation_cannotCreatePatchForMergeCommit);
}
+ ObjectId parentId;
+ if (parents.length > 0) {
+ parentId = parents[0].getId();
+ } else {
+ parentId = null;
+ }
+ return parentId;
+ }
+
+ private void appendOutputStream(final StringBuilder sb,
+ final ByteArrayOutputStream outputStream) {
try {
String encoding = currentEncoding != null ? currentEncoding
: RawParseUtils.UTF8_CHARSET.name();
@@ -234,11 +259,6 @@
} catch (UnsupportedEncodingException e) {
sb.append(outputStream.toString());
}
-
- if (DiffHeaderFormat.WORKSPACE == headerFormat)
- updateWorkspacePatchPrefixes(sb, diffFmt);
-
- patchContent = sb.toString();
}
private IProject getProject(final DiffEntry ent) {
