archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Use binary_safe_diff from arcanist

Browse Source 
Summary:
binary_safe_diff is needed in arcanist too. Moved it over to
arcanist. See D2915.

Test Plan: diffusion page rendered correctly on binary file.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D2916
This commit is contained in:
Jason Ge
2012-07-03 13:41:11 -07:00
parent dcf3a31944
commit 61b79b5359
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/repository/binary_safe_diff.sh
View File

@@ -1,6 +0,0 @@
#!/bin/sh
diff "$@"
if [ "$?" = "2" ]; then
exit 1
fi

4
src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
View File

@@ -23,11 +23,11 @@ final class DiffusionSvnRawDiffQuery extends DiffusionRawDiffQuery {
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$commit = $drequest->getCommit(); $commit = $drequest->getCommit();
$root = phutil_get_library_root('phabricator'); $arc_root = phutil_get_library_root('arcanist');
$future = $repository->getRemoteCommandFuture( $future = $repository->getRemoteCommandFuture(
'diff --diff-cmd %s -x -U%d -c %d %s%s@', 'diff --diff-cmd %s -x -U%d -c %d %s%s@',
$root.'/../scripts/repository/binary_safe_diff.sh', $arc_root.'/../scripts/repository/binary_safe_diff.sh',
$this->getLinesOfContext(), $this->getLinesOfContext(),
$commit, $commit,
$repository->getRemoteURI(), $repository->getRemoteURI(),