No OneTemporary
Actions

Size

7 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
	index 4b4e8876ac..83852d8be7 100644
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
	+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
	@@ -1,235 +1,235 @@
	<?php

	/**
	* @group conduit
	*/
	final class ConduitAPI_diffusion_diffquery_Method
	extends ConduitAPI_diffusion_abstractquery_Method {

	private $effectiveCommit;

	public function getMethodDescription() {
	return
	'Get diff information from a repository for a specific path at an '.
	'(optional) commit.';
	}

	public function defineReturnType() {
	return 'array';
	}

	protected function defineCustomParamTypes() {
	return array(
	'path' => 'required string',
	'commit' => 'optional string',
	);
	}

	protected function getResult(ConduitAPIRequest $request) {
	$result = parent::getResult($request);

	return array(
	'changes' => mpull($result, 'toDictionary'),
	'effectiveCommit' => $this->getEffectiveCommit($request),
	);
	}

	protected function getGitResult(ConduitAPIRequest $request) {
	return $this->getGitOrMercurialResult($request);
	}

	protected function getMercurialResult(ConduitAPIRequest $request) {
	return $this->getGitOrMercurialResult($request);
	}

	/**
	* NOTE: We have to work particularly hard for SVN as compared to other VCS.
	* That's okay but means this shares little code with the other VCS.
	*/
	protected function getSVNResult(ConduitAPIRequest $request) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$effective_commit = $this->getEffectiveCommit($request);
	if (!$effective_commit) {
	return $this->getEmptyResult();
	}

	$drequest = clone $drequest;
	- $drequest->setCommit($effective_commit);
	+ $drequest->updateSymbolicCommit($effective_commit);

	$path_change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$path_changes = $path_change_query->loadChanges();

	$path = null;
	foreach ($path_changes as $change) {
	if ($change->getPath() == $drequest->getPath()) {
	$path = $change;
	}
	}

	if (!$path) {
	return $this->getEmptyResult();
	}

	$change_type = $path->getChangeType();
	switch ($change_type) {
	case DifferentialChangeType::TYPE_MULTICOPY:
	case DifferentialChangeType::TYPE_DELETE:
	if ($path->getTargetPath()) {
	$old = array(
	$path->getTargetPath(),
	$path->getTargetCommitIdentifier());
	} else {
	$old = array($path->getPath(), $path->getCommitIdentifier() - 1);
	}
	$old_name = $path->getPath();
	$new_name = '';
	$new = null;
	break;
	case DifferentialChangeType::TYPE_ADD:
	$old = null;
	$new = array($path->getPath(), $path->getCommitIdentifier());
	$old_name = '';
	$new_name = $path->getPath();
	break;
	case DifferentialChangeType::TYPE_MOVE_HERE:
	case DifferentialChangeType::TYPE_COPY_HERE:
	$old = array(
	$path->getTargetPath(),
	$path->getTargetCommitIdentifier());
	$new = array($path->getPath(), $path->getCommitIdentifier());
	$old_name = $path->getTargetPath();
	$new_name = $path->getPath();
	break;
	case DifferentialChangeType::TYPE_MOVE_AWAY:
	$old = array(
	$path->getPath(),
	$path->getCommitIdentifier() - 1);
	$old_name = $path->getPath();
	$new_name = null;
	$new = null;
	break;
	default:
	$old = array($path->getPath(), $path->getCommitIdentifier() - 1);
	$new = array($path->getPath(), $path->getCommitIdentifier());
	$old_name = $path->getPath();
	$new_name = $path->getPath();
	break;
	}

	$futures = array(
	'old' => $this->buildSVNContentFuture($old),
	'new' => $this->buildSVNContentFuture($new),
	);
	$futures = array_filter($futures);

	foreach (Futures($futures) as $key => $future) {
	$stdout = '';
	try {
	list($stdout) = $future->resolvex();
	} catch (CommandException $e) {
	if ($path->getFileType() != DifferentialChangeType::FILE_DIRECTORY) {
	throw $e;
	}
	}
	$futures[$key] = $stdout;
	}

	$old_data = idx($futures, 'old', '');
	$new_data = idx($futures, 'new', '');

	$engine = new PhabricatorDifferenceEngine();
	$engine->setOldName($old_name);
	$engine->setNewName($new_name);
	$raw_diff = $engine->generateRawDiffFromFileContent($old_data, $new_data);

	$arcanist_changes = DiffusionPathChange::convertToArcanistChanges(
	$path_changes);

	$parser = $this->getDefaultParser();
	$parser->setChanges($arcanist_changes);
	$parser->forcePath($path->getPath());
	$changes = $parser->parseDiff($raw_diff);

	$change = $changes[$path->getPath()];

	return array($change);
	}

	private function getEffectiveCommit(ConduitAPIRequest $request) {
	if ($this->effectiveCommit === null) {
	$drequest = $this->getDiffusionRequest();

	$path = $drequest->getPath();
	$result = DiffusionQuery::callConduitWithDiffusionRequest(
	$request->getUser(),
	$drequest,
	'diffusion.lastmodifiedquery',
	array(
	'paths' => array($path => $drequest->getStableCommit()),
	));

	$this->effectiveCommit = idx($result, $path);
	}

	return $this->effectiveCommit;
	}

	private function buildSVNContentFuture($spec) {
	if (!$spec) {
	return null;
	}

	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	list($ref, $rev) = $spec;
	return $repository->getRemoteCommandFuture(
	'cat %s',
	$repository->getSubversionPathURI($ref, $rev));
	}

	private function getGitOrMercurialResult(ConduitAPIRequest $request) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$effective_commit = $this->getEffectiveCommit($request);
	if (!$effective_commit) {
	return $this->getEmptyResult(1);
	}

	$raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest)
	->setAnchorCommit($effective_commit);

	$raw_diff = $raw_query->loadRawDiff();
	if (!$raw_diff) {
	return $this->getEmptyResult(2);
	}

	$parser = $this->getDefaultParser();
	$changes = $parser->parseDiff($raw_diff);

	return $changes;
	}

	private function getDefaultParser() {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$parser = new ArcanistDiffParser();
	$try_encoding = $repository->getDetail('encoding');
	if ($try_encoding) {
	$parser->setTryEncoding($try_encoding);
	}
	$parser->setDetectBinaryFiles(true);

	return $parser;
	}

	private function getEmptyResult() {
	return array();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 11:55 (4 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1124291
Default Alt Text: (7 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions