Page MenuHomestyx hydra
Files F1457099

No OneTemporary
Actions

View Options

diff --git a/scripts/repository/binary_safe_diff.sh b/scripts/repository/binary_safe_diff.sh
deleted file mode 100755
index 1473e80442..0000000000
--- a/scripts/repository/binary_safe_diff.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-diff "$@"
-if [ "$?" = "2" ]; then
- exit 1
-fi
diff --git a/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
index d091792a0c..f3907ed1d8 100644
--- a/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
@@ -1,44 +1,44 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
final class DiffusionSvnRawDiffQuery extends DiffusionRawDiffQuery {
protected function executeQuery() {
$drequest = $this->getRequest();
$repository = $drequest->getRepository();
$commit = $drequest->getCommit();
- $root = phutil_get_library_root('phabricator');
+ $arc_root = phutil_get_library_root('arcanist');
$future = $repository->getRemoteCommandFuture(
'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(),
$commit,
$repository->getRemoteURI(),
$drequest->getPath());
if ($this->getTimeout()) {
$future->setTimeout($this->getTimeout());
}
list($raw_diff) = $future->resolvex();
return $raw_diff;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 15, 3:48 PM (15 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
338119
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)