mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-15 19:32:40 +01:00
54154e4f48
Summary: Separates changeset IDs from rendering. Now each changeset has a "rendering reference" which is basically a description of what the ajax endpoint should render. For Differential, it's in the form "id/vs". For Diffusion, "branch/path;commit". I believe this fixes pretty much all of the bugs related to "show more" breaking in various obscure ways, although I never got a great repro for T153. Test Plan: Clicked "show more" in diffusion change and commit views and differential diff, diff-of-diff, standalone-diff, standalone-diff-of-diff views. Verified refs and 'whitespace' were always sent correctly. Made inline comments on diffs and diffs-of-diffs. Used "Reply". Reviewed By: tuomaspelkonen Reviewers: tuomaspelkonen, jungejason, aran CC: aran, tuomaspelkonen, epriestley Differential Revision: 274
70 lines
1.9 KiB
PHP
70 lines
1.9 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright 2011 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 DiffusionGitDiffQuery extends DiffusionDiffQuery {
|
|
|
|
protected function executeQuery() {
|
|
$drequest = $this->getRequest();
|
|
$repository = $drequest->getRepository();
|
|
|
|
if (!$drequest->getRawCommit()) {
|
|
$effective_commit = $this->getEffectiveCommit();
|
|
if (!$effective_commit) {
|
|
return null;
|
|
}
|
|
// TODO: This side effect is kind of skethcy.
|
|
$drequest->setCommit($effective_commit);
|
|
} else {
|
|
$effective_commit = $drequest->getCommit();
|
|
}
|
|
|
|
$options = array(
|
|
'-M',
|
|
'-C',
|
|
'--no-ext-diff',
|
|
'--no-color',
|
|
'--src-prefix=a/',
|
|
'--dst-prefix=b/',
|
|
'-U65535',
|
|
);
|
|
$options = implode(' ', $options);
|
|
|
|
list($raw_diff) = execx(
|
|
"(cd %s && git diff {$options} %s^ %s -- %s)",
|
|
$repository->getDetail('local-path'),
|
|
$effective_commit,
|
|
$effective_commit,
|
|
$drequest->getPath());
|
|
|
|
$parser = new ArcanistDiffParser();
|
|
$parser->setDetectBinaryFiles(true);
|
|
$changes = $parser->parseDiff($raw_diff);
|
|
|
|
$diff = DifferentialDiff::newFromRawChanges($changes);
|
|
$changesets = $diff->getChangesets();
|
|
$changeset = reset($changesets);
|
|
|
|
$this->renderingReference =
|
|
$drequest->getBranchURIComponent($drequest->getBranch()).
|
|
$drequest->getPath().';'.
|
|
$drequest->getCommit();
|
|
|
|
return $changeset;
|
|
}
|
|
|
|
}
|