revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-01-16 09:41:06 +01:00
Code Issues Releases Wiki Activity

(stable) Promote 2018 Week 14

Browse source
This commit is contained in:
epriestley 2018-04-07 17:28:23 -07:00
commit 6185c89117
2 changed files with 44 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/workflow/ArcanistDiffWorkflow.php
View file

@ -966,22 +966,6 @@ EOTEXT
throw new Exception(pht('Repository API is not supported.')); throw new Exception(pht('Repository API is not supported.'));
} }
if (count($changes) > 250) {
$message = pht(
'This diff has a very large number of changes (%s). Differential '.
'works best for changes which will receive detailed human review, '.
'and not as well for large automated changes or bulk checkins. '.
'See %s for information about reviewing big checkins. Continue anyway?',
phutil_count($changes),
'https://secure.phabricator.com/book/phabricator/article/'.
'differential_large_changes/');
if (!phutil_console_confirm($message)) {
throw new ArcanistUsageException(
pht('Aborted generation of gigantic diff.'));
}
}
$limit = 1024 * 1024 * 4; $limit = 1024 * 1024 * 4;
foreach ($changes as $change) { foreach ($changes as $change) {
$size = 0; $size = 0;

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++;
}
if ($this->getArgument('arcbundle')) {
$source = self::SOURCE_BUNDLE;
$requested++;
}
if ($this->getArgument('patch')) {
$source = self::SOURCE_PATCH;
$requested++;
}
$use_revision_id = null; $sources = array();
if ($this->getArgument('name')) { foreach ($arguments as $key => $source_type) {
$namev = $this->getArgument('name'); $value = $this->getArgument($key);
if (count($namev) > 1) { if (!$value) {
throw new ArcanistUsageException( continue;
pht('Specify at most one revision name.'));
} }
$source = self::SOURCE_REVISION;
$requested++;
$use_revision_id = $this->normalizeRevisionID(head($namev)); switch ($key) {
case 'revision':
$value = $this->normalizeRevisionID($value);
break;
case 'name':
if (count($value) > 1) {
throw new ArcanistUsageException(
pht('Specify at most one revision name.'));
}
$value = $this->normalizeRevisionID(head($value));
break;
}
$sources[] = array(
$source_type,
$value,
);
} }
if ($requested === 0) { if (!$sources) {
throw new ArcanistUsageException( throw new ArcanistUsageException(
pht( pht(
"Specify one of '%s', '%s' (to select the current changes attached ". 'You must specify changes to apply to the working copy with '.
"to a Differential revision), '%s' (to select a specific, ". '"D12345", "--revision", "--diff", "--arcbundle", or "--patch".'));
"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 (count($sources) > 1) {
$this->sourceParam = nonempty( throw new ArcanistUsageException(
$use_revision_id, pht(
$this->getArgument($source)); '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() {