revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 16:52:40 +01:00
Code Issues Releases Wiki Activity

Improve argument parsing for "arc patch --revision Dxxx"

Browse source 
Summary: See PHI527. Ref T13116. The `--revision` flag currently fails if the argument is in the form `D123` instead of `123`. Normalize monogram arguments.

Test Plan: Ran `arc patch --revision Dxxx`, `arc patch --revision xxx`, `arc patch --revision xxx --diff yyy`, `arc patch`; got good behavior on the good ones and sensible error messages on the other ones.

Maniphest Tasks: T13116

Differential Revision: https://secure.phabricator.com/D19292
This commit is contained in:
epriestley 2018-04-03 10:31:39 -07:00
parent b8c9c385a7
commit e44a2d3ac0
1 changed files with 44 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/workflow/ArcanistPatchWorkflow.php
View file

@ -115,66 +115,59 @@ EOTEXT
} }
protected function didParseArguments() { protected function didParseArguments() {
$source = null; $arguments = array(
$requested = 0; 'revision' => self::SOURCE_REVISION,
if ($this->getArgument('revision')) { 'diff' => self::SOURCE_DIFF,
$source = self::SOURCE_REVISION; 'arcbundle' => self::SOURCE_BUNDLE,
$requested++; 'patch' => self::SOURCE_PATCH,
} 'name' => self::SOURCE_REVISION,
if ($this->getArgument('diff')) { );
$source = self::SOURCE_DIFF;
$requested++; $sources = array();
} foreach ($arguments as $key => $source_type) {
if ($this->getArgument('arcbundle')) { $value = $this->getArgument($key);
$source = self::SOURCE_BUNDLE; if (!$value) {
$requested++; continue;
}
if ($this->getArgument('patch')) {
$source = self::SOURCE_PATCH;
$requested++;
} }
$use_revision_id = null; switch ($key) {
if ($this->getArgument('name')) { case 'revision':
$namev = $this->getArgument('name'); $value = $this->normalizeRevisionID($value);
if (count($namev) > 1) { break;
case 'name':
if (count($value) > 1) {
throw new ArcanistUsageException( throw new ArcanistUsageException(
pht('Specify at most one revision name.')); pht('Specify at most one revision name.'));
} }
$source = self::SOURCE_REVISION; $value = $this->normalizeRevisionID(head($value));
$requested++; break;
$use_revision_id = $this->normalizeRevisionID(head($namev));
} }
if ($requested === 0) { $sources[] = array(
throw new ArcanistUsageException( $source_type,
pht( $value,
"Specify one of '%s', '%s' (to select the current changes attached ". );
"to a Differential revision), '%s' (to select a specific, ".
"out-of-date diff or a diff which is not attached to a revision), ".
"'%s' or '%s' to choose a patch source.",
'D12345',
'--revision <revision_id>',
'--diff <diff_id>',
'--arcbundle <file>',
'--patch <file>'));
} else if ($requested > 1) {
throw new ArcanistUsageException(
pht(
"Options '%s', '%s', '%s', '%s' and '%s' are not compatible. ".
"Choose exactly one patch source.",
'D12345',
'--revision',
'--diff',
'--arcbundle',
'--patch'));
} }
$this->source = $source; if (!$sources) {
$this->sourceParam = nonempty( throw new ArcanistUsageException(
$use_revision_id, pht(
$this->getArgument($source)); 'You must specify changes to apply to the working copy with '.
'"D12345", "--revision", "--diff", "--arcbundle", or "--patch".'));
}
if (count($sources) > 1) {
throw new ArcanistUsageException(
pht(
'Options "D12345", "--revision", "--diff", "--arcbundle" and '.
'"--patch" are mutually exclusive. Choose exactly one patch '.
'source.'));
}
$source = head($sources);
$this->source = $source[0];
$this->sourceParam = $source[1];
} }
public function requiresConduit() { public function requiresConduit() {