revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-19 16:58:48 +02:00
Code Issues Releases Wiki Activity

Ignore errors in svn diff

Browse source 
Summary: Otherwise attaching the commit diff doesn't work.

Test Plan: Reparsed previously failing commit message.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2605
This commit is contained in:
vrana 2012-05-30 14:21:02 -07:00
parent 7978264862
commit ec9589fb3b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/repository/binary_safe_diff.sh Executable file
View file

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

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

@ -23,9 +23,11 @@ final class DiffusionSvnRawDiffQuery extends DiffusionRawDiffQuery {
$repository = $drequest->getRepository();
$commit = $drequest->getCommit();
$root = phutil_get_library_root('phabricator');
$future = $repository->getRemoteCommandFuture(
'diff --diff-cmd diff -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',
$this->getLinesOfContext(),
$commit,
$repository->getRemoteURI(),