mirror of
https://we.phorge.it/source/phorge.git
synced 2025-04-05 08:58:22 +02:00
5d27aeb240
Summary: Most checks were actually in place, but `ExecFuture` throws a `CommandException` which wasn't taken into account. Test Plan: look at the first command and no longer saw an exception. Also, other commits worked as well. Reviewers: richardvanvelzen Reviewed By: richardvanvelzen CC: krisbuist, Korvin, epriestley, aran Differential Revision: https://secure.phabricator.com/D7730
43 lines
1.1 KiB
PHP
43 lines
1.1 KiB
PHP
<?php
|
|
|
|
final class DiffusionMercurialRawDiffQuery extends DiffusionRawDiffQuery {
|
|
|
|
protected function executeQuery() {
|
|
return $this->executeRawDiffCommand();
|
|
}
|
|
|
|
|
|
protected function executeRawDiffCommand() {
|
|
$drequest = $this->getRequest();
|
|
$repository = $drequest->getRepository();
|
|
|
|
$commit = $drequest->getCommit();
|
|
|
|
// If there's no path, get the entire raw diff.
|
|
$path = nonempty($drequest->getPath(), '.');
|
|
|
|
$against = $this->getAgainstCommit();
|
|
if ($against === null) {
|
|
// If `$commit` has no parents (usually because it's the first commit
|
|
// in the repository), we want to diff against `null`. This revset will
|
|
// do that for us automatically.
|
|
$against = '('.$commit.'^ or null)';
|
|
}
|
|
|
|
$future = $repository->getLocalCommandFuture(
|
|
'diff -U %d --git --rev %s --rev %s -- %s',
|
|
$this->getLinesOfContext(),
|
|
$against,
|
|
$commit,
|
|
$path);
|
|
|
|
if ($this->getTimeout()) {
|
|
$future->setTimeout($this->getTimeout());
|
|
}
|
|
|
|
list($raw_diff) = $future->resolvex();
|
|
|
|
return $raw_diff;
|
|
}
|
|
|
|
}
|