Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/postpone_writing_to_stream (pull request #322)

Browse Source 
Postpone writing to output stream in diff command
This commit is contained in:
Sebastian Sdorra
2019-10-01 12:52:25 +00:00
parent 273b5fd2c6 c9966081d4
commit 151049657a
11 changed files with 119 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java
View File

@@ -39,13 +39,12 @@ import com.google.common.base.Strings;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
import sonia.scm.repository.Repository;
import sonia.scm.repository.api.DiffCommandBuilder;
import sonia.scm.repository.api.DiffFormat;
import sonia.scm.repository.spi.javahg.HgDiffInternalCommand;
import sonia.scm.web.HgUtil;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
//~--- JDK imports ------------------------------------------------------------
@@ -71,41 +70,36 @@ public class HgDiffCommand extends AbstractCommand implements DiffCommand
//~--- get methods ----------------------------------------------------------
@Override
public void getDiffResult(DiffCommandRequest request, OutputStream output)
throws IOException
public DiffCommandBuilder.OutputStreamConsumer getDiffResult(DiffCommandRequest request)
{
com.aragost.javahg.Repository hgRepo = open();
return output -> {
com.aragost.javahg.Repository hgRepo = open();
HgDiffInternalCommand cmd = HgDiffInternalCommand.on(hgRepo);
DiffFormat format = request.getFormat();
HgDiffInternalCommand cmd = HgDiffInternalCommand.on(hgRepo);
DiffFormat format = request.getFormat();
if (format == DiffFormat.GIT)
{
cmd.git();
}
cmd.change(HgUtil.getRevision(request.getRevision()));
InputStream inputStream = null;
try
{
if (!Strings.isNullOrEmpty(request.getPath()))
if (format == DiffFormat.GIT)
{
inputStream = cmd.stream(hgRepo.file(request.getPath()));
}
else
{
inputStream = cmd.stream();
cmd.git();
}
ByteStreams.copy(inputStream, output);
cmd.change(HgUtil.getRevision(request.getRevision()));
}
finally
{
Closeables.close(inputStream, true);
}
InputStream inputStream = null;
try {
if (!Strings.isNullOrEmpty(request.getPath())) {
inputStream = cmd.stream(hgRepo.file(request.getPath()));
} else {
inputStream = cmd.stream();
}
ByteStreams.copy(inputStream, output);
} finally {
Closeables.close(inputStream, true);
}
};
}
}