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

improve performance of diff command

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-07-05 18:09:27 +02:00
parent 78925d54cd
commit 536f63e6df
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Strings; 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.Repository;
import sonia.scm.repository.RepositoryException; import sonia.scm.repository.RepositoryException;
@@ -44,6 +46,7 @@ import sonia.scm.web.HgUtil;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
/** /**
@@ -81,22 +84,32 @@ public class HgDiffCommand extends AbstractCommand implements DiffCommand
public void getDiffResult(DiffCommandRequest request, OutputStream output) public void getDiffResult(DiffCommandRequest request, OutputStream output)
throws IOException, RepositoryException throws IOException, RepositoryException
{ {
com.aragost.javahg.Repository hgRepo = open();
com.aragost.javahg.commands.DiffCommand cmd = com.aragost.javahg.commands.DiffCommand cmd =
com.aragost.javahg.commands.DiffCommand.on(open()); com.aragost.javahg.commands.DiffCommand.on(hgRepo);
cmd.change(HgUtil.getRevision(request.getRevision())); cmd.change(HgUtil.getRevision(request.getRevision()));
String diff = null; InputStream inputStream = null;
if (!Strings.isNullOrEmpty(request.getPath())) try
{ {
diff = cmd.execute(request.getPath());
}
else
{
diff = cmd.execute();
}
output.write(diff.getBytes()); if (!Strings.isNullOrEmpty(request.getPath()))
{
inputStream = cmd.stream(hgRepo.file(request.getPath()));
}
else
{
inputStream = cmd.stream();
}
ByteStreams.copy(inputStream, output);
}
finally
{
Closeables.closeQuietly(inputStream);
}
} }
} }