No OneTemporary
Actions

Size

16 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/workflow/commit/ArcanistCommitWorkflow.php b/src/workflow/commit/ArcanistCommitWorkflow.php
	index 27b29aa5..d40a837d 100644
	--- a/src/workflow/commit/ArcanistCommitWorkflow.php
	+++ b/src/workflow/commit/ArcanistCommitWorkflow.php
	@@ -1,282 +1,324 @@
	<?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.
	*/

	/**
	* Executes "svn commit" once a revision has been "Accepted".
	*
	* @group workflow
	*/
	class ArcanistCommitWorkflow extends ArcanistBaseWorkflow {

	public function getCommandHelp() {
	return phutil_console_format(<<<EOTEXT
	commit [--revision __revision_id__] [--show]
	Supports: svn
	Commit a revision which has been accepted by a reviewer.
	EOTEXT
	);
	}

	public function requiresWorkingCopy() {
	return true;
	}

	public function requiresConduit() {
	return true;
	}

	public function requiresAuthentication() {
	return true;
	}

	public function requiresRepositoryAPI() {
	return true;
	}

	public function getArguments() {
	return array(
	'show' => array(
	'help' =>
	"Show the command which would be issued, but do not actually ".
	"commit anything."
	),
	'revision' => array(
	'param' => 'revision_id',
	'help' =>
	"Commit a specific revision. If you do not specify a revision, ".
	"arc will look for committable revisions.",
	)
	);
	}

	public function run() {
	$repository_api = $this->getRepositoryAPI();
	$conduit = $this->getConduit();

	- $revision_data = $conduit->callMethodSynchronous(
	- 'differential.find',
	- array(
	- 'query' => 'committable',
	- 'guids' => array(
	- $this->getUserPHID(),
	- ),
	- ));
	+ $revision_id = $this->getArgument('revision');
	+
	+ if (!$revision_id) {
	+ $revision_data = $conduit->callMethodSynchronous(
	+ 'differential.find',
	+ array(
	+ 'query' => 'committable',
	+ 'guids' => array(
	+ $this->getUserPHID(),
	+ ),
	+ )
	+ );
	+
	+ try {
	+ $revision = $this->chooseRevision(
	+ $revision_data,
	+ null,
	+ 'Which revision do you want to commit?'
	+ );
	+ $revision_id = $revision->getID();
	+ } catch (ArcanistChooseNoRevisionsException $ex) {
	+ throw new ArcanistUsageException(
	+ "You have no committable Differential revisions. You can only ".
	+ "commit revisions which have been 'accepted'.");
	+ }
	+ }

	+ $revision = null;
	try {
	- $revision_id = $this->getArgument('revision');
	- $revision = $this->chooseRevision(
	- $revision_data,
	- $revision_id,
	- 'Which revision do you want to commit?');
	- } catch (ArcanistChooseInvalidRevisionException $ex) {
	+ $revision = $conduit->callMethodSynchronous(
	+ 'differential.getrevision',
	+ array(
	+ 'revision_id' => $revision_id,
	+ )
	+ );
	+ } catch (Exception $ex) {
	throw new ArcanistUsageException(
	- "Revision D{$revision_id} is not committable. You can only commit ".
	- "revisions you own which have been 'accepted'.");
	- } catch (ArcanistChooseNoRevisionsException $ex) {
	+ "Revision D{$revision_id} does not exist."
	+ );
	+ }
	+
	+ if ($revision['statusName'] != 'Accepted') {
	throw new ArcanistUsageException(
	- "You have no committable Differential revisions. You can only commit ".
	- "revisions you own which have been 'accepted'.");
	+ "Revision D{$revision_id} is not committable. You can only commit ".
	+ "revisions which have been 'accepted'."
	+ );
	+ }
	+
	+ if ($revision['authorPHID'] != $this->getUserPHID()) {
	+ $prompt = "You are not the author of revision D{$revision_id}, ".
	+ 'are you sure you want to commit it?';
	+ if (!phutil_console_confirm($prompt)) {
	+ throw new ArcanistUserAbortException();
	+ }
	}

	- $revision_id = $revision->getID();
	- $revision_name = $revision->getName();
	+ $revision_name = $revision['title'];

	$message = $conduit->callMethodSynchronous(
	'differential.getcommitmessage',
	array(
	'revision_id' => $revision_id,
	'edit' => false,
	));

	if ($this->getArgument('show')) {
	echo $message;
	return 0;
	}

	echo "Committing D{$revision_id} '{$revision_name}'...\n";

	$files = $this->getCommitFileList($revision);

	$files = implode(' ', array_map('escapeshellarg', $files));
	$message = escapeshellarg($message);
	$root = escapeshellarg($repository_api->getPath());

	$lang = $this->getSVNLangEnvVar();

	// Specify LANG explicitly so that UTF-8 commit messages don't break
	// subversion.
	$command =
	"(cd {$root} && LANG={$lang} svn commit {$files} -m {$message})";

	$err = phutil_passthru('%C', $command);

	if ($err) {
	throw new Exception("Executing 'svn commit' failed!");
	}

	$mark_workflow = $this->buildChildWorkflow(
	'mark-committed',
	array(
	'--finalize',
	$revision_id,
	));
	$mark_workflow->run();

	return $err;
	}

	- protected function getCommitFileList(
	- ArcanistDifferentialRevisionRef $revision) {
	+ protected function getCommitFileList(array $revision) {
	$repository_api = $this->getRepositoryAPI();

	if (!($repository_api instanceof ArcanistSubversionAPI)) {
	throw new ArcanistUsageException(
	"arc commit is only supported under SVN. Use arc amend under git.");
	}

	$conduit = $this->getConduit();

	- $revision_id = $revision->getID();
	+ $revision_id = $revision['id'];
	+
	+ $revision = reset($conduit->callMethodSynchronous(
	+ 'differential.find',
	+ array(
	+ 'query' => 'revision-ids',
	+ 'guids' => array($revision_id,)
	+ )
	+ ));
	+ if (!$revision) {
	+ throw new ArcanistUsageException(
	+ "Revision D{$revision_id} does not exist."
	+ );
	+ }
	+ $revision_source = $revision['sourcePath'];

	- $revision_source = $revision->getSourcePath();
	$working_copy = $repository_api->getPath();
	if ($revision_source != $working_copy) {
	$prompt =
	"Revision was generated from '{$revision_source}', but the current ".
	"working copy root is '{$working_copy}'. Commit anyway?";
	if (!phutil_console_confirm($prompt)) {
	throw new ArcanistUserAbortException();
	}
	}

	$commit_paths = $conduit->callMethodSynchronous(
	'differential.getcommitpaths',
	array(
	'revision_id' => $revision_id,
	));
	$commit_paths = array_fill_keys($commit_paths, true);

	$status = $repository_api->getSVNStatus();

	$modified_but_not_included = array();
	foreach ($status as $path => $mask) {
	if (!empty($commit_paths[$path])) {
	continue;
	}
	foreach ($commit_paths as $will_commit => $ignored) {
	if (Filesystem::isDescendant($path, $will_commit)) {
	throw new ArcanistUsageException(
	"This commit includes the directory '{$will_commit}', but ".
	"it contains a modified path ('{$path}') which is NOT included ".
	"in the commit. Subversion can not handle this operation and ".
	"will commit the path anyway. You need to sort out the working ".
	"copy changes to '{$path}' before you may proceed with the ".
	"commit.");
	}
	}
	$modified_but_not_included[] = $path;
	}

	if ($modified_but_not_included) {
	if (count($modified_but_not_included) == 1) {
	$prefix = "A locally modified path is not included in this revision:";
	$prompt = "It will NOT be committed. Commit this revision anyway?";
	} else {
	$prefix = "Locally modified paths are not included in this revision:";
	$prompt = "They will NOT be committed. Commit this revision anyway?";
	}
	$this->promptFileWarning($prefix, $prompt, $modified_but_not_included);
	}

	$do_not_exist = array();
	foreach ($commit_paths as $path => $ignored) {
	$disk_path = $repository_api->getPath($path);
	if (file_exists($disk_path)) {
	continue;
	}
	if (is_link($disk_path)) {
	continue;
	}
	if (idx($status, $path) & ArcanistRepositoryAPI::FLAG_DELETED) {
	continue;
	}
	$do_not_exist[] = $path;
	unset($commit_paths[$path]);
	}

	if ($do_not_exist) {
	if (count($do_not_exist) == 1) {
	$prefix = "Revision includes changes to a path that does not exist:";
	$prompt = "Commit this revision anyway?";
	} else {
	$prefix = "Revision includes changes to paths that do not exist:";
	$prompt = "Commit this revision anyway?";
	}
	$this->promptFileWarning($prefix, $prompt, $do_not_exist);
	}

	$files = array_keys($commit_paths);

	if (empty($files)) {
	throw new ArcanistUsageException(
	"There is nothing left to commit. None of the modified paths exist.");
	}

	return $files;
	}

	protected function promptFileWarning($prefix, $prompt, array $paths) {
	echo $prefix."\n\n";
	foreach ($paths as $path) {
	echo " ".$path."\n";
	}
	if (!phutil_console_confirm($prompt)) {
	throw new ArcanistUserAbortException();
	}
	}

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

	/**
	* On some systems, we need to specify "en_US.UTF-8" instead of "en_US.utf8",
	* and SVN spews some bewildering warnings if we don't:
	*
	* svn: warning: cannot set LC_CTYPE locale
	* svn: warning: environment variable LANG is en_US.utf8
	* svn: warning: please check that your locale name is correct
	*
	* For example, is happens on my 10.6.7 machine with Subversion 1.6.15.
	*/
	private function getSVNLangEnvVar() {
	$locale = 'en_US.utf8';
	try {
	list($locales) = execx('locale -a');
	$locales = explode("\n", trim($locales));
	$locales = array_fill_keys($locales, true);
	if (isset($locales['en_US.UTF-8'])) {
	$locale = 'en_US.UTF-8';
	}
	} catch (Exception $ex) {
	// Ignore.
	}
	return $locale;
	}

	}
	diff --git a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php
	index bcfaa9b7..654b9718 100644
	--- a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php
	+++ b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php
	@@ -1,161 +1,161 @@
	<?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.
	*/

	/**
	* Explicitly marks Differential revisions as "Committed".
	*
	* @group workflow
	*/
	class ArcanistMarkCommittedWorkflow extends ArcanistBaseWorkflow {

	public function getCommandHelp() {
	return phutil_console_format(<<<EOTEXT
	mark-committed __revision__
	Supports: git, svn
	Manually mark a revision as committed. You should not normally need
	to do this; arc commit (svn), arc amend (git), arc merge (git, hg) or
	repository tracking on the master remote repository should do it for
	you. However, if these mechanisms have failed for some reason you can
	use this command to manually change a revision status from "Accepted"
	to "Committed".
	EOTEXT
	);
	}

	public function getArguments() {
	return array(
	'finalize' => array(
	'help' =>
	"Mark committed only if the repository is untracked and the ".
	"revision is accepted. Continue even if the mark can't happen. This ".
	"is a soft version of 'mark-committed' used by other workflows.",
	),
	'*' => 'revision',
	);
	}

	public function requiresConduit() {
	return true;
	}

	public function requiresAuthentication() {
	return true;
	}

	public function requiresRepositoryAPI() {
	// NOTE: Technically we only use this to generate the right message at
	// the end, and you can even get the wrong message (e.g., if you run
	// "arc mark-committed D123" from a git repository, but D123 is an SVN
	// revision). We could be smarter about this, but it's just display fluff.
	return true;
	}

	public function run() {
	$is_finalize = $this->getArgument('finalize');

	$conduit = $this->getConduit();

	$revision_list = $this->getArgument('revision', array());
	if (!$revision_list) {
	throw new ArcanistUsageException(
	"mark-committed requires a revision number.");
	}
	if (count($revision_list) != 1) {
	throw new ArcanistUsageException(
	"mark-committed requires exactly one revision.");
	}
	$revision_id = reset($revision_list);
	$revision_id = $this->normalizeRevisionID($revision_id);

	$revision = null;
	try {
	$revision = $conduit->callMethodSynchronous(
	'differential.getrevision',
	array(
	'revision_id' => $revision_id,
	)
	);
	} catch (Exception $ex) {
	if (!$is_finalize) {
	throw new ArcanistUsageException(
	"Revision D{$revision_id} does not exist."
	);
	}
	}

	if (!$is_finalize && $revision['statusName'] != 'Accepted') {
	throw new ArcanistUsageException(
	"Revision D{$revision_id} is not committable. You can only mark ".
	"revisions which have been 'accepted' as committed."
	);
	}

	if ($revision) {
	- if ($revision['authorPHID'] != $this->getUserPHID()) {
	+ if (!$is_finalize && $revision['authorPHID'] != $this->getUserPHID()) {
	$prompt = "You are not the author of revision D{$revision_id}, ".
	'are you sure you want to mark it committed?';
	if (!phutil_console_confirm($prompt)) {
	throw new ArcanistUserAbortException();
	}
	}

	$actually_mark = true;
	if ($is_finalize) {
	$project_info = $conduit->callMethodSynchronous(
	'arcanist.projectinfo',
	array(
	'name' => $this->getWorkingCopy()->getProjectID(),
	));
	if ($project_info['tracked']) {
	$actually_mark = false;
	}
	}
	if ($actually_mark) {
	$revision_name = $revision['title'];

	echo "Marking revision D{$revision_id} '{$revision_name}' ".
	"committed...\n";

	$conduit->callMethodSynchronous(
	'differential.markcommitted',
	array(
	'revision_id' => $revision_id,
	));
	}
	}

	$status = $revision['statusName'];
	if ($status == 'Accepted' \|\| $status == 'Committed') {
	// If this has already been attached to commits, don't show the
	// "you can push this commit" message since we know it's been committed
	// already.
	$is_finalized = empty($revision['commits']);
	} else {
	$is_finalized = false;
	}

	if ($is_finalized) {
	$message = $this->getRepositoryAPI()->getFinalizedRevisionMessage();
	echo phutil_console_wrap($message)."\n";
	} else {
	echo "Done.\n";
	}

	return 0;
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 13:19 (3 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125006
Default Alt Text: (16 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions