2011-01-10 00:22:25 +01:00
|
|
|
<?php
|
|
|
|
|
2011-02-19 20:36:08 +01:00
|
|
|
/**
|
|
|
|
* Executes "svn commit" once a revision has been "Accepted".
|
|
|
|
*
|
|
|
|
* @group workflow
|
|
|
|
*/
|
2012-01-31 21:07:05 +01:00
|
|
|
final class ArcanistCommitWorkflow extends ArcanistBaseWorkflow {
|
2011-01-10 00:22:25 +01:00
|
|
|
|
2011-11-04 20:12:14 +01:00
|
|
|
private $revisionID;
|
|
|
|
|
Make Arcanist workflow names explicit
Summary:
Currently, adding a new workflow requires you to override ArcanistConfiguration, which is messy. Instead, just load everything that extends ArcanistBaseWorkflow.
Remove all the rules tying workflow names to class names through arcane incantations.
This has a very small performance cost in that we need to load every Workflow class every time now, but we don't hit __init__ and such anymore and it was pretty negligible on my machine (98ms vs 104ms or something).
Test Plan: Ran "arc help", "arc which", "arc diff", etc.
Reviewers: edward, vrana, btrahan
Reviewed By: edward
CC: aran, zeeg
Differential Revision: https://secure.phabricator.com/D3691
2012-10-17 17:35:03 +02:00
|
|
|
public function getWorkflowName() {
|
|
|
|
return 'commit';
|
|
|
|
}
|
|
|
|
|
2012-03-05 19:02:37 +01:00
|
|
|
public function getCommandSynopses() {
|
2011-01-10 00:22:25 +01:00
|
|
|
return phutil_console_format(<<<EOTEXT
|
|
|
|
**commit** [--revision __revision_id__] [--show]
|
2012-03-05 19:02:37 +01:00
|
|
|
EOTEXT
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getCommandHelp() {
|
|
|
|
return phutil_console_format(<<<EOTEXT
|
2011-01-10 00:22:25 +01:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-11-04 20:12:14 +01:00
|
|
|
public function getRevisionID() {
|
|
|
|
return $this->revisionID;
|
|
|
|
}
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
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();
|
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
if (!($repository_api instanceof ArcanistSubversionAPI)) {
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"'arc commit' is only supported under svn.");
|
|
|
|
}
|
2011-10-26 05:03:41 +02:00
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
|
|
|
|
$revision_id = $this->normalizeRevisionID($this->getArgument('revision'));
|
2011-10-26 05:03:41 +02:00
|
|
|
if (!$revision_id) {
|
2012-01-27 02:40:55 +01:00
|
|
|
$revisions = $repository_api->loadWorkingCopyDifferentialRevisions(
|
|
|
|
$this->getConduit(),
|
2011-10-26 05:03:41 +02:00
|
|
|
array(
|
2012-01-27 02:40:55 +01:00
|
|
|
'authors' => array($this->getUserPHID()),
|
|
|
|
'status' => 'status-accepted',
|
|
|
|
));
|
2011-10-26 05:03:41 +02:00
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
if (count($revisions) == 0) {
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"Unable to identify the revision in the working copy. Use ".
|
|
|
|
"'--revision <revision_id>' to select a revision.");
|
|
|
|
} else if (count($revisions) > 1) {
|
2011-10-26 05:03:41 +02:00
|
|
|
throw new ArcanistUsageException(
|
2012-01-27 02:40:55 +01:00
|
|
|
"More than one revision exists in the working copy:\n\n".
|
|
|
|
$this->renderRevisionList($revisions)."\n".
|
|
|
|
"Use '--revision <revision_id>' to select a revision.");
|
2011-10-26 05:03:41 +02:00
|
|
|
}
|
2011-11-17 01:40:09 +01:00
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
} else {
|
|
|
|
$revisions = $this->getConduit()->callMethodSynchronous(
|
|
|
|
'differential.query',
|
2011-10-26 05:03:41 +02:00
|
|
|
array(
|
2012-01-27 02:40:55 +01:00
|
|
|
'ids' => array($revision_id),
|
|
|
|
));
|
2011-10-26 05:03:41 +02:00
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
if (count($revisions) == 0) {
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"Revision 'D{$revision_id}' does not exist.");
|
2011-10-26 05:03:41 +02:00
|
|
|
}
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
$revision = head($revisions);
|
|
|
|
$this->revisionID = $revision['id'];
|
|
|
|
$revision_id = $revision['id'];
|
|
|
|
|
2012-05-01 19:35:14 +02:00
|
|
|
$is_show = $this->getArgument('show');
|
|
|
|
|
|
|
|
if (!$is_show) {
|
|
|
|
$this->runSanityChecks($revision);
|
|
|
|
}
|
2011-01-10 00:22:25 +01:00
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
$message = $this->getConduit()->callMethodSynchronous(
|
2011-01-10 00:22:25 +01:00
|
|
|
'differential.getcommitmessage',
|
|
|
|
array(
|
|
|
|
'revision_id' => $revision_id,
|
2011-05-03 03:54:20 +02:00
|
|
|
'edit' => false,
|
2011-01-10 00:22:25 +01:00
|
|
|
));
|
|
|
|
|
2012-09-04 21:08:04 +02:00
|
|
|
$event = $this->dispatchEvent(
|
2011-11-17 01:40:09 +01:00
|
|
|
ArcanistEventType::TYPE_COMMIT_WILLCOMMITSVN,
|
|
|
|
array(
|
2012-01-27 02:40:55 +01:00
|
|
|
'message' => $message,
|
2012-09-04 21:08:04 +02:00
|
|
|
));
|
2011-11-17 01:40:09 +01:00
|
|
|
|
|
|
|
$message = $event->getValue('message');
|
|
|
|
|
2012-05-01 19:35:14 +02:00
|
|
|
if ($is_show) {
|
|
|
|
echo $message."\n";
|
2011-01-10 00:22:25 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
$revision_title = $revision['title'];
|
|
|
|
echo "Committing 'D{$revision_id}: {$revision_title}'...\n";
|
2011-01-10 00:22:25 +01:00
|
|
|
|
|
|
|
$files = $this->getCommitFileList($revision);
|
|
|
|
|
2012-10-03 23:54:43 +02:00
|
|
|
$tmp_file = new TempFile();
|
|
|
|
Filesystem::writeFile($tmp_file, $message);
|
2011-01-10 00:22:25 +01:00
|
|
|
|
2012-10-03 23:54:43 +02:00
|
|
|
$command = $this->getSVNCommitCommand();
|
|
|
|
chdir($repository_api->getPath());
|
2011-05-18 19:32:00 +02:00
|
|
|
|
2012-10-03 23:54:43 +02:00
|
|
|
$err = phutil_passthru(
|
|
|
|
$command,
|
|
|
|
$files,
|
|
|
|
$tmp_file
|
|
|
|
);
|
2011-01-10 00:22:25 +01:00
|
|
|
|
|
|
|
if ($err) {
|
|
|
|
throw new Exception("Executing 'svn commit' failed!");
|
|
|
|
}
|
|
|
|
|
Automatically detect when to mark revisions committed
Summary:
See D945. We have this kludgy "remote_hooks_installed" mess right now, but we
have enough information on the server nowadays to figure this out without it.
Also reduce code duplication by sharing the "mark-committed" workflow.
This causes "arc merge" to effect commit marks.
Test Plan:
In Git, Mercurial and SVN working copies ran like a million
amend/merge/commit/mark-committed commands with and without --finalize in
various states of revision completion.
This change is really hard to exhaustively test because of the number of
combinations of VCS, revision state, command, command flags, repository state
and tracking state. All the reasonable tests I could come up with worked
correctly, though.
Reviewers: Makinde, jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 967
2011-09-27 18:37:11 +02:00
|
|
|
$mark_workflow = $this->buildChildWorkflow(
|
2012-04-17 22:51:10 +02:00
|
|
|
'close-revision',
|
Automatically detect when to mark revisions committed
Summary:
See D945. We have this kludgy "remote_hooks_installed" mess right now, but we
have enough information on the server nowadays to figure this out without it.
Also reduce code duplication by sharing the "mark-committed" workflow.
This causes "arc merge" to effect commit marks.
Test Plan:
In Git, Mercurial and SVN working copies ran like a million
amend/merge/commit/mark-committed commands with and without --finalize in
various states of revision completion.
This change is really hard to exhaustively test because of the number of
combinations of VCS, revision state, command, command flags, repository state
and tracking state. All the reasonable tests I could come up with worked
correctly, though.
Reviewers: Makinde, jungejason, nh, tuomaspelkonen, aran
Reviewed By: jungejason
CC: aran, jungejason
Differential Revision: 967
2011-09-27 18:37:11 +02:00
|
|
|
array(
|
|
|
|
'--finalize',
|
|
|
|
$revision_id,
|
|
|
|
));
|
|
|
|
$mark_workflow->run();
|
2011-01-10 00:22:25 +01:00
|
|
|
|
|
|
|
return $err;
|
|
|
|
}
|
|
|
|
|
2011-10-26 05:03:41 +02:00
|
|
|
protected function getCommitFileList(array $revision) {
|
2011-01-10 00:22:25 +01:00
|
|
|
$repository_api = $this->getRepositoryAPI();
|
2011-10-26 05:03:41 +02:00
|
|
|
$revision_id = $revision['id'];
|
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
$commit_paths = $this->getConduit()->callMethodSynchronous(
|
2011-01-10 00:22:25 +01:00
|
|
|
'differential.getcommitpaths',
|
|
|
|
array(
|
|
|
|
'revision_id' => $revision_id,
|
|
|
|
));
|
2011-12-10 00:58:13 +01:00
|
|
|
$dir_paths = array();
|
|
|
|
foreach ($commit_paths as $path) {
|
|
|
|
$path = dirname($path);
|
|
|
|
while ($path != '.') {
|
|
|
|
$dir_paths[$path] = true;
|
|
|
|
$path = dirname($path);
|
|
|
|
}
|
|
|
|
}
|
2011-01-10 00:22:25 +01:00
|
|
|
$commit_paths = array_fill_keys($commit_paths, true);
|
|
|
|
|
|
|
|
$status = $repository_api->getSVNStatus();
|
|
|
|
|
|
|
|
$modified_but_not_included = array();
|
|
|
|
foreach ($status as $path => $mask) {
|
2011-12-10 00:58:13 +01:00
|
|
|
if (!empty($dir_paths[$path])) {
|
|
|
|
$commit_paths[$path] = true;
|
|
|
|
}
|
2011-01-10 00:22:25 +01:00
|
|
|
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) {
|
2012-06-12 03:33:19 +02:00
|
|
|
$prefix = pht(
|
|
|
|
'Locally modified path(s) are not included in this revision:',
|
|
|
|
count($modified_but_not_included));
|
|
|
|
$prompt = pht(
|
|
|
|
'They will NOT be committed. Commit this revision anyway?',
|
|
|
|
count($modified_but_not_included));
|
2011-01-10 00:22:25 +01:00
|
|
|
$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) {
|
2012-06-12 03:33:19 +02:00
|
|
|
$prefix = pht(
|
|
|
|
'Revision includes changes to path(s) that do not exist:',
|
|
|
|
count($do_not_exist));
|
|
|
|
$prompt = "Commit this revision anyway?";
|
2011-01-10 00:22:25 +01:00
|
|
|
$this->promptFileWarning($prefix, $prompt, $do_not_exist);
|
|
|
|
}
|
|
|
|
|
2012-10-31 02:26:58 +01:00
|
|
|
$files = array();
|
|
|
|
foreach ($commit_paths as $file => $ignored) {
|
|
|
|
$files[] = $file.'@'; // make SVN accept commits like foo@2x.png
|
|
|
|
}
|
2011-01-10 00:22:25 +01:00
|
|
|
|
|
|
|
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();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-15 05:00:11 +01:00
|
|
|
protected function getSupportedRevisionControlSystems() {
|
|
|
|
return array('svn');
|
|
|
|
}
|
|
|
|
|
2011-05-18 19:32:00 +02:00
|
|
|
/**
|
|
|
|
* 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
|
|
|
|
*
|
2012-10-03 23:54:43 +02:00
|
|
|
* For example, it happens on epriestley's Mac (10.6.7) with
|
|
|
|
* Subversion 1.6.15.
|
2011-05-18 19:32:00 +02:00
|
|
|
*/
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-10-03 23:54:43 +02:00
|
|
|
private function getSVNCommitCommand() {
|
|
|
|
$command = 'svn commit %Ls --encoding utf-8 -F %s';
|
|
|
|
// make sure to specify LANG on non-windows systems to surpress any fancy
|
|
|
|
// warnings; see @{method:getSVNLangEnvVar}.
|
|
|
|
if (!phutil_is_windows()) {
|
|
|
|
$command = 'LANG='.$this->getSVNLangEnvVar().' '.$command;
|
|
|
|
}
|
|
|
|
return $command;
|
|
|
|
}
|
|
|
|
|
2012-01-27 02:40:55 +01:00
|
|
|
private function runSanityChecks(array $revision) {
|
|
|
|
$repository_api = $this->getRepositoryAPI();
|
|
|
|
$revision_id = $revision['id'];
|
|
|
|
$revision_title = $revision['title'];
|
|
|
|
|
|
|
|
$confirm = array();
|
|
|
|
|
|
|
|
if ($revision['status'] != ArcanistDifferentialRevisionStatus::ACCEPTED) {
|
|
|
|
$confirm[] =
|
|
|
|
"Revision 'D{$revision_id}: {$revision_title}' has not been accepted. ".
|
|
|
|
"Commit this revision anyway?";
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($revision['authorPHID'] != $this->getUserPHID()) {
|
|
|
|
$confirm[] =
|
|
|
|
"You are not the author of 'D{$revision_id}: {$revision_title}'. ".
|
|
|
|
"Commit this revision anyway?";
|
|
|
|
}
|
|
|
|
|
2012-05-01 19:35:14 +02:00
|
|
|
$revision_source = idx($revision, 'sourcePath');
|
2012-01-27 02:40:55 +01:00
|
|
|
$current_source = $repository_api->getPath();
|
|
|
|
if ($revision_source != $current_source) {
|
|
|
|
$confirm[] =
|
|
|
|
"Revision 'D{$revision_id}: {$revision_title}' was generated from ".
|
|
|
|
"'{$revision_source}', but current working copy root is ".
|
|
|
|
"'{$current_source}'. Commit this revision anyway?";
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach ($confirm as $thing) {
|
|
|
|
if (!phutil_console_confirm($thing)) {
|
|
|
|
throw new ArcanistUserAbortException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|