mirror of
https://we.phorge.it/source/phorge.git
synced 2025-04-05 08:58:22 +02:00
c55de86f0e
Summary: Fixes T10423. Ref T11524. This changes `diffusion.rawdiffquery` to return a file PHID instead of a blob of data. This is better in general, but particularly better for huge diffs (as in T10423) and diffs with non-utf8 data (as in T10423). Test Plan: - Used `bin/differential extract` to extract a latin1 diff, got a clean diff. - Used `bin/repository reparse --herald` to rerun herald on a latin1 diff, got a clean result. - Pushed latin1 diffs to test commit hooks. - Triggered the the too large / too slow logic. - Viewed latin1 diffs in Diffusion. - Used "blame past this change" in Diffusion to hit the `before` logic. Reviewers: chad Reviewed By: chad Subscribers: eadler Maniphest Tasks: T10423, T11524 Differential Revision: https://secure.phabricator.com/D16460
50 lines
1.1 KiB
PHP
50 lines
1.1 KiB
PHP
<?php
|
|
|
|
final class DiffusionGitRawDiffQuery extends DiffusionRawDiffQuery {
|
|
|
|
protected function newQueryFuture() {
|
|
$drequest = $this->getRequest();
|
|
$repository = $drequest->getRepository();
|
|
|
|
$commit = $this->getAnchorCommit();
|
|
|
|
$options = array(
|
|
'-M',
|
|
'-C',
|
|
'--no-ext-diff',
|
|
'--no-color',
|
|
'--src-prefix=a/',
|
|
'--dst-prefix=b/',
|
|
'-U'.(int)$this->getLinesOfContext(),
|
|
);
|
|
|
|
$against = $this->getAgainstCommit();
|
|
if ($against === null) {
|
|
// Check if this is the root commit by seeing if it has parents, since
|
|
// `git diff X^ X` does not work if "X" is the initial commit.
|
|
list($parents) = $repository->execxLocalCommand(
|
|
'log --format=%s %s --',
|
|
'%P',
|
|
$commit);
|
|
|
|
if (strlen(trim($parents))) {
|
|
$against = $commit.'^';
|
|
} else {
|
|
$against = ArcanistGitAPI::GIT_MAGIC_ROOT_COMMIT;
|
|
}
|
|
}
|
|
|
|
$path = $drequest->getPath();
|
|
if (!strlen($path)) {
|
|
$path = '.';
|
|
}
|
|
|
|
return $repository->getLocalCommandFuture(
|
|
'diff %Ls %s %s -- %s',
|
|
$options,
|
|
$against,
|
|
$commit,
|
|
$path);
|
|
}
|
|
|
|
}
|