No OneTemporary
Actions

Size

34 KB

Subscribers

None

View Options

	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index dd5b4f0c..04bb86ce 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,123 +1,125 @@
	<?php

	/**
	* This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
	* @generated
	*/

	phutil_register_library_map(array(
	'class' =>
	array(
	'ArcanistAmendWorkflow' => 'workflow/amend',
	'ArcanistApacheLicenseLinter' => 'lint/linter/apachelicense',
	'ArcanistApacheLicenseLinterTestCase' => 'lint/linter/apachelicense/__tests__',
	'ArcanistBaseUnitTestEngine' => 'unit/engine/base',
	'ArcanistBaseWorkflow' => 'workflow/base',
	'ArcanistBundle' => 'parser/bundle',
	'ArcanistChooseInvalidRevisionException' => 'exception',
	'ArcanistChooseNoRevisionsException' => 'exception',
	'ArcanistCommitWorkflow' => 'workflow/commit',
	'ArcanistConfiguration' => 'configuration',
	'ArcanistCoverWorkflow' => 'workflow/cover',
	'ArcanistDiffChange' => 'parser/diff/change',
	'ArcanistDiffChangeType' => 'parser/diff/changetype',
	'ArcanistDiffHunk' => 'parser/diff/hunk',
	'ArcanistDiffParser' => 'parser/diff',
	'ArcanistDiffParserTestCase' => 'parser/diff/__tests__',
	'ArcanistDiffUtils' => 'difference',
	'ArcanistDiffWorkflow' => 'workflow/diff',
	'ArcanistDifferentialCommitMessage' => 'differential/commitmessage',
	'ArcanistDifferentialCommitMessageParserException' => 'differential/commitmessage',
	'ArcanistDifferentialRevisionRef' => 'differential/revision',
	'ArcanistExportWorkflow' => 'workflow/export',
	'ArcanistFilenameLinter' => 'lint/linter/filename',
	'ArcanistGeneratedLinter' => 'lint/linter/generated',
	'ArcanistGitAPI' => 'repository/api/git',
	'ArcanistGitHookPreReceiveWorkflow' => 'workflow/git-hook-pre-receive',
	'ArcanistHelpWorkflow' => 'workflow/help',
	'ArcanistLicenseLinter' => 'lint/linter/license',
	'ArcanistLintEngine' => 'lint/engine/base',
	'ArcanistLintMessage' => 'lint/message',
	'ArcanistLintPatcher' => 'lint/patcher',
	'ArcanistLintRenderer' => 'lint/renderer',
	'ArcanistLintResult' => 'lint/result',
	'ArcanistLintSeverity' => 'lint/severity',
	'ArcanistLintWorkflow' => 'workflow/lint',
	'ArcanistLinter' => 'lint/linter/base',
	'ArcanistLinterTestCase' => 'lint/linter/base/test',
	'ArcanistListWorkflow' => 'workflow/list',
	'ArcanistMarkCommittedWorkflow' => 'workflow/mark-committed',
	'ArcanistNoEffectException' => 'exception/usage/noeffect',
	'ArcanistNoEngineException' => 'exception/usage/noengine',
	'ArcanistNoLintLinter' => 'lint/linter/nolint',
	+ 'ArcanistNoLintTestCaseMisnamed' => 'lint/linter/nolint/__tests__',
	'ArcanistPEP8Linter' => 'lint/linter/pep8',
	'ArcanistPatchWorkflow' => 'workflow/patch',
	'ArcanistPhutilModuleLinter' => 'lint/linter/phutilmodule',
	'ArcanistPhutilTestCase' => 'unit/engine/phutil/testcase',
	'ArcanistPhutilTestTerminatedException' => 'unit/engine/phutil/testcase/exception',
	'ArcanistRepositoryAPI' => 'repository/api/base',
	'ArcanistShellCompleteWorkflow' => 'workflow/shell-complete',
	'ArcanistSubversionAPI' => 'repository/api/subversion',
	'ArcanistSvnHookPreCommitWorkflow' => 'workflow/svn-hook-pre-commit',
	'ArcanistTextLinter' => 'lint/linter/text',
	'ArcanistTextLinterTestCase' => 'lint/linter/text/__tests__',
	'ArcanistUnitTestResult' => 'unit/result',
	'ArcanistUnitWorkflow' => 'workflow/unit',
	'ArcanistUsageException' => 'exception/usage',
	'ArcanistUserAbortException' => 'exception/usage/userabort',
	'ArcanistWorkingCopyIdentity' => 'workingcopyidentity',
	'ArcanistXHPASTLinter' => 'lint/linter/xhpast',
	'ArcanistXHPASTLinterTestCase' => 'lint/linter/xhpast/__tests__',
	'PhutilLintEngine' => 'lint/engine/phutil',
	'PhutilModuleRequirements' => 'parser/phutilmodule',
	'PhutilUnitTestEngine' => 'unit/engine/phutil',
	'PhutilUnitTestEngineTestCase' => 'unit/engine/phutil/__tests__',
	'UnitTestableArcanistLintEngine' => 'lint/engine/test',
	),
	'function' =>
	array(
	),
	'requires_class' =>
	array(
	'ArcanistAmendWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistApacheLicenseLinter' => 'ArcanistLicenseLinter',
	'ArcanistApacheLicenseLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistCommitWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistCoverWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistDiffParserTestCase' => 'ArcanistPhutilTestCase',
	'ArcanistDiffWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistExportWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistFilenameLinter' => 'ArcanistLinter',
	'ArcanistGeneratedLinter' => 'ArcanistLinter',
	'ArcanistGitAPI' => 'ArcanistRepositoryAPI',
	'ArcanistGitHookPreReceiveWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistHelpWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistLicenseLinter' => 'ArcanistLinter',
	'ArcanistLintWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistLinterTestCase' => 'ArcanistPhutilTestCase',
	'ArcanistListWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistMarkCommittedWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistNoEffectException' => 'ArcanistUsageException',
	'ArcanistNoEngineException' => 'ArcanistUsageException',
	'ArcanistNoLintLinter' => 'ArcanistLinter',
	+ 'ArcanistNoLintTestCaseMisnamed' => 'ArcanistLinterTestCase',
	'ArcanistPEP8Linter' => 'ArcanistLinter',
	'ArcanistPatchWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistPhutilModuleLinter' => 'ArcanistLinter',
	'ArcanistShellCompleteWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI',
	'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistTextLinter' => 'ArcanistLinter',
	'ArcanistTextLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistUnitWorkflow' => 'ArcanistBaseWorkflow',
	'ArcanistUserAbortException' => 'ArcanistUsageException',
	'ArcanistXHPASTLinter' => 'ArcanistLinter',
	'ArcanistXHPASTLinterTestCase' => 'ArcanistLinterTestCase',
	'PhutilLintEngine' => 'ArcanistLintEngine',
	'PhutilUnitTestEngine' => 'ArcanistBaseUnitTestEngine',
	'PhutilUnitTestEngineTestCase' => 'ArcanistPhutilTestCase',
	'UnitTestableArcanistLintEngine' => 'ArcanistLintEngine',
	),
	'requires_interface' =>
	array(
	),
	));
	diff --git a/src/repository/api/git/ArcanistGitAPI.php b/src/repository/api/git/ArcanistGitAPI.php
	index 15f5c952..cc961d35 100644
	--- a/src/repository/api/git/ArcanistGitAPI.php
	+++ b/src/repository/api/git/ArcanistGitAPI.php
	@@ -1,362 +1,365 @@
	<?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.
	*/

	/**
	* Interfaces with Git working copies.
	*
	* @group workingcopy
	*/
	class ArcanistGitAPI extends ArcanistRepositoryAPI {

	private $status;
	private $relativeCommit = null;
	const SEARCH_LENGTH_FOR_PARENT_REVISIONS = 16;

	/**
	* For the repository's initial commit, 'git diff HEAD^' and similar do
	* not work. Using this instead does work.
	*/
	const GIT_MAGIC_ROOT_COMMIT = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';

	public static function newHookAPI($root) {
	return new ArcanistGitAPI($root);
	}

	public function getSourceControlSystemName() {
	return 'git';
	}

	public function setRelativeCommit($relative_commit) {
	$this->relativeCommit = $relative_commit;
	return $this;
	}

	public function getRelativeCommit() {
	if ($this->relativeCommit === null) {
	list($err) = exec_manual(
	'(cd %s; git rev-parse --verify HEAD^)',
	$this->getPath());
	if ($err) {
	$this->relativeCommit = self::GIT_MAGIC_ROOT_COMMIT;
	} else {
	$this->relativeCommit = 'HEAD^';
	}
	}
	return $this->relativeCommit;
	}

	private function getDiffOptions() {
	$options = array(
	'-M',
	'-C',
	'--no-ext-diff',
	'--no-color',
	'--src-prefix=a/',
	'--dst-prefix=b/',
	'-U'.$this->getDiffLinesOfContext(),
	);
	return implode(' ', $options);
	}

	public function getFullGitDiff() {
	$options = $this->getDiffOptions();
	list($stdout) = execx(
	"(cd %s; git diff {$options} %s --)",
	$this->getPath(),
	$this->getRelativeCommit());
	return $stdout;
	}

	public function getRawDiffText($path) {
	$relative_commit = $this->getRelativeCommit();
	$options = $this->getDiffOptions();
	list($stdout) = execx(
	"(cd %s; git diff {$options} %s -- %s)",
	$this->getPath(),
	$this->getRelativeCommit(),
	$path);
	return $stdout;
	}

	public function getBranchName() {
	// TODO: consider:
	//
	// $ git rev-parse --abbrev-ref `git symbolic-ref HEAD`
	//
	// But that may fail if you're not on a branch.
	list($stdout) = execx(
	'(cd %s; git branch)',
	$this->getPath());

	$matches = null;
	if (preg_match('/^\* (.+)$/m', $stdout, $matches)) {
	return $matches[1];
	}
	return null;
	}

	public function getSourceControlPath() {
	// TODO: Try to get something useful here.
	return null;
	}

	public function getGitCommitLog() {
	$relative = $this->getRelativeCommit();
	if ($relative == self::GIT_MAGIC_ROOT_COMMIT) {
	list($stdout) = execx(
	'(cd %s; git log --format=medium HEAD)',
	$this->getPath());
	} else {
	list($stdout) = execx(
	'(cd %s; git log --format=medium %s..HEAD)',
	$this->getPath(),
	$this->getRelativeCommit());
	}
	return $stdout;
	}

	public function getGitHistoryLog() {
	list($stdout) = execx(
	'(cd %s; git log --format=medium -n%d %s)',
	$this->getPath(),
	self::SEARCH_LENGTH_FOR_PARENT_REVISIONS,
	$this->getRelativeCommit());
	return $stdout;
	}

	public function getSourceControlBaseRevision() {
	list($stdout) = execx(
	'(cd %s; git rev-parse %s)',
	$this->getPath(),
	$this->getRelativeCommit());
	return rtrim($stdout, "\n");
	}

	public function getGitHeadRevision() {
	list($stdout) = execx(
	'(cd %s; git rev-parse HEAD)',
	$this->getPath());
	return rtrim($stdout, "\n");
	}

	public function getWorkingCopyStatus() {
	if (!isset($this->status)) {

	// Find committed changes.
	list($stdout) = execx(
	'(cd %s; git diff --no-ext-diff --raw %s --)',
	$this->getPath(),
	$this->getRelativeCommit());
	$files = $this->parseGitStatus($stdout);

	// Find uncommitted changes.
	list($stdout) = execx(
	'(cd %s; git diff --no-ext-diff --raw HEAD --)',
	$this->getPath());
	$files += $this->parseGitStatus($stdout);

	// Find untracked files.
	list($stdout) = execx(
	'(cd %s; git ls-files --others --exclude-standard)',
	$this->getPath());
	$stdout = rtrim($stdout, "\n");
	if (strlen($stdout)) {
	$stdout = explode("\n", $stdout);
	foreach ($stdout as $file) {
	$files[$file] = self::FLAG_UNTRACKED;
	}
	}

	+ // TODO: This doesn't list unstaged adds. It's not clear how to get that
	+ // list other than "git status --porcelain" and then parsing it. :/
	+
	// Find unstaged changes.
	list($stdout) = execx(
	'(cd %s; git ls-files -m)',
	$this->getPath());
	$stdout = rtrim($stdout, "\n");
	if (strlen($stdout)) {
	$stdout = explode("\n", $stdout);
	foreach ($stdout as $file) {
	$files[$file] = self::FLAG_UNSTAGED;
	}
	}

	$this->status = $files;
	}

	return $this->status;
	}

	public function amendGitHeadCommit($message) {
	execx(
	'(cd %s; git commit --amend --message %s)',
	$this->getPath(),
	$message);
	}

	public function getPreReceiveHookStatus($old_ref, $new_ref) {
	list($stdout) = execx(
	'(cd %s && git diff --no-ext-diff --raw %s %s --)',
	$this->getPath(),
	$old_ref,
	$new_ref);
	return $this->parseGitStatus($stdout, $full = true);
	}

	private function parseGitStatus($status, $full = false) {
	static $flags = array(
	'A' => self::FLAG_ADDED,
	'M' => self::FLAG_MODIFIED,
	'D' => self::FLAG_DELETED,
	);

	$status = trim($status);
	$lines = array();
	foreach (explode("\n", $status) as $line) {
	if ($line) {
	$lines[] = preg_split("/[ \t]/", $line);
	}
	}

	$files = array();
	foreach ($lines as $line) {
	$mask = 0;
	$flag = $line[4];
	$file = $line[5];
	foreach ($flags as $key => $bits) {
	if ($flag == $key) {
	$mask \|= $bits;
	}
	}
	if ($full) {
	$files[$file] = array(
	'mask' => $mask,
	'ref' => rtrim($line[3], '.'),
	);
	} else {
	$files[$file] = $mask;
	}
	}

	return $files;
	}

	public function getBlame($path) {
	// TODO: 'git blame' supports --porcelain and we should probably use it.
	list($stdout) = execx(
	'(cd %s; git blame -w -C %s -- %s)',
	$this->getPath(),
	$this->getRelativeCommit(),
	$path);

	$blame = array();
	foreach (explode("\n", trim($stdout)) as $line) {
	if (!strlen($line)) {
	continue;
	}

	// lines predating a git repo's history are blamed to the oldest revision,
	// with the commit hash prepended by a ^. we shouldn't count these lines
	// as blaming to the oldest diff's unfortunate author
	if ($line[0] == '^') {
	continue;
	}

	$matches = null;
	$ok = preg_match(
	'/^([0-9a-f]+)[^(]+?[(](.*?) +\d\d\d\d-\d\d-\d\d/',
	$line,
	$matches);
	if (!$ok) {
	throw new Exception("Bad blame? `{$line}'");
	}
	$revision = $matches[1];
	$author = $matches[2];

	$blame[] = array($author, $revision);
	}

	return $blame;
	}

	public function getOriginalFileData($path) {
	return $this->getFileDataAtRevision($path, $this->getRelativeCommit());
	}

	public function getCurrentFileData($path) {
	return $this->getFileDataAtRevision($path, 'HEAD');
	}

	private function parseGitTree($stdout) {
	$result = array();

	$stdout = trim($stdout);
	if (!strlen($stdout)) {
	return $result;
	}

	$lines = explode("\n", $stdout);
	foreach ($lines as $line) {
	$matches = array();
	$ok = preg_match(
	'/^(\d{6}) (blob\|tree) ([a-z0-9]{40})[\t](.*)$/',
	$line,
	$matches);
	if (!$ok) {
	throw new Exception("Failed to parse git ls-tree output!");
	}
	$result[$matches[4]] = array(
	'mode' => $matches[1],
	'type' => $matches[2],
	'ref' => $matches[3],
	);
	}
	return $result;
	}

	private function getFileDataAtRevision($path, $revision) {

	// NOTE: We don't want to just "git show {$revision}:{$path}" since if the
	// path was a directory at the given revision we'll get a list of its files
	// and treat it as though it as a file containing a list of other files,
	// which is silly.

	list($stdout) = execx(
	'(cd %s && git ls-tree %s -- %s)',
	$this->getPath(),
	$revision,
	$path);

	$info = $this->parseGitTree($stdout);
	if (empty($info[$path])) {
	// No such path, or the path is a directory and we executed 'ls-tree dir/'
	// and got a list of its contents back.
	return null;
	}

	if ($info[$path]['type'] != 'blob') {
	// Path is or was a directory, not a file.
	return null;
	}

	list($stdout) = execx(
	'(cd %s && git cat-file blob %s)',
	$this->getPath(),
	$info[$path]['ref']);
	return $stdout;
	}

	}
	diff --git a/src/workflow/base/ArcanistBaseWorkflow.php b/src/workflow/base/ArcanistBaseWorkflow.php
	index c66c300a..aa96dc0e 100644
	--- a/src/workflow/base/ArcanistBaseWorkflow.php
	+++ b/src/workflow/base/ArcanistBaseWorkflow.php
	@@ -1,610 +1,629 @@
	<?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.
	*/

	/**
	* Implements a runnable command, like "arc diff" or "arc help".
	*
	* @group workflow
	*/
	class ArcanistBaseWorkflow {

	private $conduit;
	private $userGUID;
	private $userName;
	private $repositoryAPI;
	private $workingCopy;
	private $arguments;
	private $command;

	private $arcanistConfiguration;
	private $parentWorkflow;

	private $changeCache = array();

	public function __construct() {

	}

	public function setArcanistConfiguration($arcanist_configuration) {
	$this->arcanistConfiguration = $arcanist_configuration;
	return $this;
	}

	public function getArcanistConfiguration() {
	return $this->arcanistConfiguration;
	}

	public function getCommandHelp() {
	return get_class($this).": Undocumented";
	}

	public function requiresWorkingCopy() {
	return false;
	}

	public function requiresConduit() {
	return false;
	}

	public function requiresAuthentication() {
	return false;
	}

	public function requiresRepositoryAPI() {
	return false;
	}

	public function setCommand($command) {
	$this->command = $command;
	return $this;
	}

	public function getCommand() {
	return $this->command;
	}

	public function setUserName($user_name) {
	$this->userName = $user_name;
	return $this;
	}

	public function getUserName() {
	return $this->userName;
	}

	public function getArguments() {
	return array();
	}

	private function setParentWorkflow($parent_workflow) {
	$this->parentWorkflow = $parent_workflow;
	return $this;
	}

	protected function getParentWorkflow() {
	return $this->parentWorkflow;
	}

	public function buildChildWorkflow($command, array $argv) {
	$arc_config = $this->getArcanistConfiguration();
	$workflow = $arc_config->buildWorkflow($command);
	$workflow->setParentWorkflow($this);
	$workflow->setCommand($command);

	if ($this->repositoryAPI) {
	$workflow->setRepositoryAPI($this->repositoryAPI);
	}

	if ($this->userGUID) {
	$workflow->setUserGUID($this->getUserGUID());
	$workflow->setUserName($this->getUserName());
	}

	if ($this->conduit) {
	$workflow->setConduit($this->conduit);
	}

	if ($this->workingCopy) {
	$workflow->setWorkingCopy($this->workingCopy);
	}

	$workflow->setArcanistConfiguration($arc_config);

	$workflow->parseArguments(array_values($argv));

	return $workflow;
	}

	public function getArgument($key, $default = null) {
	$args = $this->arguments;
	if (!array_key_exists($key, $args)) {
	return $default;
	}
	return $args[$key];
	}

	final public function getCompleteArgumentSpecification() {
	$spec = $this->getArguments();
	$arc_config = $this->getArcanistConfiguration();
	$command = $this->getCommand();
	$spec += $arc_config->getCustomArgumentsForCommand($command);
	return $spec;
	}

	public function parseArguments(array $args) {

	$spec = $this->getCompleteArgumentSpecification();

	$dict = array();

	$more_key = null;
	if (!empty($spec['*'])) {
	$more_key = $spec['*'];
	unset($spec['*']);
	$dict[$more_key] = array();
	}

	$short_to_long_map = array();
	foreach ($spec as $long => $options) {
	if (!empty($options['short'])) {
	$short_to_long_map[$options['short']] = $long;
	}
	}

	$more = array();
	for ($ii = 0; $ii < count($args); $ii++) {
	$arg = $args[$ii];
	$arg_name = null;
	$arg_key = null;
	if ($arg == '--') {
	$more = array_merge(
	$more,
	array_slice($args, $ii + 1));
	break;
	} else if (!strncmp($arg, '--', 2)) {
	$arg_key = substr($arg, 2);
	if (!array_key_exists($arg_key, $spec)) {
	throw new ArcanistUsageException(
	"Unknown argument '{$arg_key}'. Try 'arc help'.");
	}
	} else if (!strncmp($arg, '-', 1)) {
	$arg_key = substr($arg, 1);
	if (empty($short_to_long_map[$arg_key])) {
	throw new ArcanistUsageException(
	"Unknown argument '{$arg_key}'. Try 'arc help'.");
	}
	$arg_key = $short_to_long_map[$arg_key];
	} else {
	$more[] = $arg;
	continue;
	}

	$options = $spec[$arg_key];
	if (empty($options['param'])) {
	$dict[$arg_key] = true;
	} else {
	if ($ii == count($args) - 1) {
	throw new ArcanistUsageException(
	"Option '{$arg}' requires a parameter.");
	}
	$dict[$arg_key] = $args[$ii + 1];
	$ii++;
	}
	}

	if ($more) {
	if ($more_key) {
	$dict[$more_key] = $more;
	} else {
	$example = reset($more);
	throw new ArcanistUsageException(
	"Unrecognized argument '{$example}'. Try 'arc help'.");
	}
	}

	foreach ($dict as $key => $value) {
	if (empty($spec[$key]['conflicts'])) {
	continue;
	}
	foreach ($spec[$key]['conflicts'] as $conflict => $more) {
	if (isset($dict[$conflict])) {
	if ($more) {
	$more = ': '.$more;
	} else {
	$more = '.';
	}
	// TODO: We'll always display these as long-form, when the user might
	// have typed them as short form.
	throw new ArcanistUsageException(
	"Arguments '--{$key}' and '--{$conflict}' are mutually exclusive".
	$more);
	}
	}
	}

	$this->arguments = $dict;

	$this->didParseArguments();

	return $this;
	}

	protected function didParseArguments() {
	// Override this to customize workflow argument behavior.
	}

	public function getWorkingCopy() {
	if (!$this->workingCopy) {
	$workflow = get_class($this);
	throw new Exception(
	"This workflow ('{$workflow}') requires a working copy, override ".
	"requiresWorkingCopy() to return true.");
	}
	return $this->workingCopy;
	}

	public function setWorkingCopy(
	ArcanistWorkingCopyIdentity $working_copy) {
	$this->workingCopy = $working_copy;
	return $this;
	}

	public function getConduit() {
	if (!$this->conduit) {
	$workflow = get_class($this);
	throw new Exception(
	"This workflow ('{$workflow}') requires a Conduit, override ".
	"requiresConduit() to return true.");
	}
	return $this->conduit;
	}

	public function setConduit(ConduitClient $conduit) {
	$this->conduit = $conduit;
	return $this;
	}

	public function getUserGUID() {
	if (!$this->userGUID) {
	$workflow = get_class($this);
	throw new Exception(
	"This workflow ('{$workflow}') requires authentication, override ".
	"requiresAuthentication() to return true.");
	}
	return $this->userGUID;
	}

	public function setUserGUID($guid) {
	$this->userGUID = $guid;
	return $this;
	}

	public function setRepositoryAPI($api) {
	$this->repositoryAPI = $api;
	return $this;
	}

	public function getRepositoryAPI() {
	if (!$this->repositoryAPI) {
	$workflow = get_class($this);
	throw new Exception(
	"This workflow ('{$workflow}') requires a Repository API, override ".
	"requiresRepositoryAPI() to return true.");
	}
	return $this->repositoryAPI;
	}

	protected function shouldRequireCleanUntrackedFiles() {
	return empty($this->arguments['allow-untracked']);
	}

	protected function requireCleanWorkingCopy() {
	$api = $this->getRepositoryAPI();

	+ $working_copy_desc = phutil_console_format(
	+ " Working copy: __%s__\n\n",
	+ $api->getPath());
	+
	$untracked = $api->getUntrackedChanges();
	if ($this->shouldRequireCleanUntrackedFiles()) {
	if (!empty($untracked)) {
	-
	- echo "You have untracked files in this working copy:\n\n".
	+ echo "You have untracked files in this working copy.\n\n".
	+ $working_copy_desc.
	+ " Untracked files in working copy:\n".
	" ".implode("\n ", $untracked)."\n\n";

	if ($api instanceof ArcanistGitAPI) {
	echo phutil_console_wrap(
	- "Since you don't have .gitignore rules for these files and have ".
	- "not listed them in .git/info/exclude, you may have forgotten ".
	+ "Since you don't have '.gitignore' rules for these files and have ".
	+ "not listed them in '.git/info/exclude', you may have forgotten ".
	"to 'git add' them to your commit.");
	} else if ($api instanceof ArcanistSubversionAPI) {
	echo phutil_console_wrap(
	- "Since you don't have svn:ignore rules for these files, you may ".
	+ "Since you don't have 'svn:ignore' rules for these files, you may ".
	"have forgotten to 'svn add' them.");
	}

	$prompt = "Do you want to continue without adding these files?";
	if (!phutil_console_confirm($prompt, $default_no = false)) {
	throw new ArcanistUserAbortException();
	}
	}
	}

	$incomplete = $api->getIncompleteChanges();
	if ($incomplete) {
	throw new ArcanistUsageException(
	"You have incompletely checked out directories in this working copy. ".
	- "Fix them before proceeding: \n\n".
	+ "Fix them before proceeding.\n\n".
	+ $working_copy_desc.
	+ " Incomplete directories in working copy:\n".
	" ".implode("\n ", $incomplete)."\n\n".
	"You can fix these paths by running 'svn update' on them.");
	}

	- if ($api->getMergeConflicts()) {
	+ $conflicts = $api->getMergeConflicts();
	+ if ($conflicts) {
	throw new ArcanistUsageException(
	"You have merge conflicts in this working copy. Resolve merge ".
	- "conflicts before proceeding.");
	+ "conflicts before proceeding.\n\n".
	+ $working_copy_desc.
	+ " Conflicts in working copy:\n".
	+ " ".implode("\n ", $conflicts)."\n");
	}

	- if ($api->getUnstagedChanges()) {
	+ $unstaged = $api->getUnstagedChanges();
	+ if ($unstaged) {
	throw new ArcanistUsageException(
	- "You have unstaged changes in this branch. Stage and commit (or ".
	- "revert) them before proceeding.");
	+ "You have unstaged changes in this working copy. Stage and commit (or ".
	+ "revert) them before proceeding.\n\n".
	+ $working_copy_desc.
	+ " Unstaged changes in working copy:\n".
	+ " ".implode("\n ", $unstaged)."\n");
	}

	- if ($api->getUncommittedChanges()) {
	+ $uncommitted = $api->getUncommittedChanges();
	+ if ($uncommitted) {
	throw new ArcanistUsageException(
	"You have uncommitted changes in this branch. Commit (or revert) them ".
	- "before proceeding.");
	+ "before proceeding.\n\n".
	+ $working_copy_desc.
	+ " Uncommitted changes in working copy\n".
	+ " ".implode("\n ", $uncommitted)."\n");
	}
	}

	protected function chooseRevision(
	array $revision_data,
	$revision_id,
	$prompt = null) {

	$revisions = array();
	foreach ($revision_data as $data) {
	$ref = ArcanistDifferentialRevisionRef::newFromDictionary($data);
	$revisions[$ref->getID()] = $ref;
	}

	if ($revision_id) {
	$revision_id = $this->normalizeRevisionID($revision_id);
	if (empty($revisions[$revision_id])) {
	throw new ArcanistChooseInvalidRevisionException();
	}
	return $revisions[$revision_id];
	}

	if (!count($revisions)) {
	throw new ArcanistChooseNoRevisionsException();
	}

	$repository_api = $this->getRepositoryAPI();

	$candidates = array();
	$cur_path = $repository_api->getPath();
	foreach ($revisions as $revision) {
	$source_path = $revision->getSourcePath();
	if ($source_path == $cur_path) {
	$candidates[] = $revision;
	}
	}

	if (count($candidates) == 1) {
	$candidate = reset($candidates);
	$revision_id = $candidate->getID();
	}

	if ($revision_id) {
	return $revisions[$revision_id];
	}

	$revision_indexes = array_keys($revisions);

	echo "\n";
	$ii = 1;
	foreach ($revisions as $revision) {
	echo ' ['.$ii++.'] D'.$revision->getID().' '.$revision->getName()."\n";
	}

	while (true) {
	$id = phutil_console_prompt($prompt);
	$id = trim(strtoupper($id), 'D');
	if (isset($revisions[$id])) {
	return $revisions[$id];
	}
	if (isset($revision_indexes[$id - 1])) {
	return $revisions[$revision_indexes[$id - 1]];
	}
	}
	}

	protected function loadDiffBundleFromConduit(
	ConduitClient $conduit,
	$diff_id) {

	return $this->loadBundleFromConduit(
	$conduit,
	array(
	'diff_id' => $diff_id,
	));
	}

	protected function loadRevisionBundleFromConduit(
	ConduitClient $conduit,
	$revision_id) {

	return $this->loadBundleFromConduit(
	$conduit,
	array(
	'revision_id' => $revision_id,
	));
	}

	private function loadBundleFromConduit(
	ConduitClient $conduit,
	$params) {

	$future = $conduit->callMethod('differential.getdiff', $params);
	$diff = $future->resolve();

	$changes = array();
	foreach ($diff['changes'] as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}
	$bundle = ArcanistBundle::newFromChanges($changes);
	return $bundle;
	}

	protected function getChangedLines($path, $mode) {
	if (is_dir($path)) {
	return array();
	}

	$change = $this->getChange($path);
	$lines = $change->getChangedLines($mode);
	return array_keys($lines);
	}

	private function getChange($path) {
	$repository_api = $this->getRepositoryAPI();

	if ($repository_api instanceof ArcanistSubversionAPI) {
	if (empty($this->changeCache[$path])) {
	$diff = $repository_api->getRawDiffText($path);
	$parser = new ArcanistDiffParser();
	$changes = $parser->parseDiff($diff);
	if (count($changes) != 1) {
	throw new Exception("Expected exactly one change.");
	}
	$this->changeCache[$path] = reset($changes);
	}
	} else {
	if (empty($this->changeCache)) {
	$diff = $repository_api->getFullGitDiff();
	$parser = new ArcanistDiffParser();
	$changes = $parser->parseDiff($diff);
	foreach ($changes as $change) {
	$this->changeCache[$change->getCurrentPath()] = $change;
	}
	}
	}

	if (empty($this->changeCache[$path])) {
	if ($repository_api instanceof ArcanistGitAPI) {
	// This can legitimately occur under git if you make a change, "git
	// commit" it, and then revert the change in the working copy and run
	// "arc lint".
	$change = new ArcanistDiffChange();
	$change->setCurrentPath($path);
	return $change;
	} else {
	throw new Exception(
	"Trying to get change for unchanged path '{$path}'!");
	}
	}

	return $this->changeCache[$path];
	}

	final public function willRunWorkflow() {
	$spec = $this->getCompleteArgumentSpecification();
	foreach ($this->arguments as $arg => $value) {
	if (empty($spec[$arg])) {
	continue;
	}
	$options = $spec[$arg];
	if (!empty($options['supports'])) {
	$system_name = $this->getRepositoryAPI()->getSourceControlSystemName();
	if (!in_array($system_name, $options['supports'])) {
	$extended_info = null;
	if (!empty($options['nosupport'][$system_name])) {
	$extended_info = ' '.$options['nosupport'][$system_name];
	}
	throw new ArcanistUsageException(
	"Option '--{$arg}' is not supported under {$system_name}.".
	$extended_info);
	}
	}
	}
	}

	protected function parseGitRelativeCommit(ArcanistGitAPI $api, array $argv) {
	if (count($argv) == 0) {
	return;
	}
	if (count($argv) != 1) {
	throw new ArcanistUsageException(
	"Specify exactly one commit.");
	}
	$base = reset($argv);
	if ($base == ArcanistGitAPI::GIT_MAGIC_ROOT_COMMIT) {
	$merge_base = $base;
	} else {
	list($err, $merge_base) = exec_manual(
	'(cd %s; git merge-base %s HEAD)',
	$api->getPath(),
	$base);
	if ($err) {
	throw new ArcanistUsageException(
	"Unable to parse git commit name '{$base}'.");
	}
	}
	$api->setRelativeCommit(trim($merge_base));
	}

	protected function normalizeRevisionID($revision_id) {
	return ltrim(strtoupper($revision_id), 'D');
	}

	protected function shouldShellComplete() {
	return true;
	}

	protected function getShellCompletions(array $argv) {
	return array();
	}

	protected function getSupportedRevisionControlSystems() {
	return array('any');
	}

	protected function getPassthruArgumentsAsMap($command) {
	$map = array();
	foreach ($this->getCompleteArgumentSpecification() as $key => $spec) {
	if (!empty($spec['passthru'][$command])) {
	if (isset($this->arguments[$key])) {
	$map[$key] = $this->arguments[$key];
	}
	}
	}
	return $map;
	}

	protected function getPassthruArgumentsAsArgv($command) {
	$spec = $this->getCompleteArgumentSpecification();
	$map = $this->getPassthruArgumentsAsMap($command);
	$argv = array();
	foreach ($map as $key => $value) {
	$argv[] = '--'.$key;
	if (!empty($spec[$key]['param'])) {
	$argv[] = $value;
	}
	}
	return $argv;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Oct 16, 4:50 AM (1 d, 19 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 29/1f/cedb928833e94762135439ae7b1c

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions