Page MenuHomePhabricator
Files F91539

D7799.diff
All Users
Actions

D7799.diff
View Options

diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
@@ -193,10 +193,8 @@
list($ref, $rev) = $spec;
return $repository->getRemoteCommandFuture(
- 'cat %s%s@%d',
- $repository->getRemoteURI(),
- phutil_escape_uri($ref),
- $rev);
+ 'cat %s',
+ $repository->getSubversionPathURI($ref, $rev));
}
private function getGitOrMercurialResult(ConduitAPIRequest $request) {
diff --git a/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
--- a/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
@@ -9,14 +9,10 @@
$path = $drequest->getPath();
$commit = $drequest->getCommit();
- $remote_uri = $repository->getRemoteURI();
-
return $repository->getRemoteCommandFuture(
- '%C %s%s@%s',
+ '%C %s',
$this->getNeedsBlame() ? 'blame --force' : 'cat',
- $remote_uri,
- phutil_escape_uri($path),
- $commit);
+ $repository->getSubversionPathURI($path, $commit));
}
protected function executeQueryFromFuture(Future $future) {
diff --git a/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
--- a/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
@@ -15,13 +15,12 @@
}
$future = $repository->getRemoteCommandFuture(
- 'diff --diff-cmd %s -x -U%d -r %d:%d %s%s@',
+ 'diff --diff-cmd %s -x -U%d -r %d:%d %s',
$arc_root.'/../scripts/repository/binary_safe_diff.sh',
$this->getLinesOfContext(),
$against,
$commit,
- $repository->getRemoteURI(),
- $drequest->getPath());
+ $repository->getSubversionPathURI($drequest->getPath()));
if ($this->getTimeout()) {
$future->setTimeout($this->getTimeout());

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/yg/v4/um32mqiotzwpr6dn
Default Alt Text
D7799.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility