revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-28 06:29:27 +01:00
Code Issues Releases Wiki Activity

Revert D2542

Browse source 
Summary: Not required after D2730.

Test Plan: `arc diff` with invalid reviewer in commit message.

Reviewers: nh

Reviewed By: nh

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2733
This commit is contained in:
vrana 2012-06-12 16:35:39 -07:00
parent 3718e49f9c
commit 371419344a
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php
View file

@ -69,12 +69,11 @@ final class ConduitAPI_differential_parsecommitmessage_Method
$field = $aux_fields[$field_key]; $field = $aux_fields[$field_key];
try { try {
$fields[$field_key] = $field->parseValueFromCommitMessage($field_value); $fields[$field_key] = $field->parseValueFromCommitMessage($field_value);
$field->setValueFromParsedCommitMessage($fields[$field_key]);
} catch (DifferentialFieldParseException $ex) { } catch (DifferentialFieldParseException $ex) {
$field_label = $field->renderLabelForCommitMessage(); $field_label = $field->renderLabelForCommitMessage();
$errors[] = "Error parsing field '{$field_label}': ".$ex->getMessage(); $errors[] = "Error parsing field '{$field_label}': ".$ex->getMessage();
$fields[$field_key] = $ex->getPartialParse();
} }
$field->setValueFromParsedCommitMessage($fields[$field_key]);
} }
if (!$is_partial) { if (!$is_partial) {

10
src/applications/differential/field/exception/DifferentialFieldParseException.php
View file

@ -18,14 +18,4 @@
final class DifferentialFieldParseException extends Exception { final class DifferentialFieldParseException extends Exception {
private $partialParse;
public function __construct($message, $partial_parse = null) {
parent::__construct($message);
$this->partialParse = $partial_parse;
}
public function getPartialParse() {
return $this->partialParse;
}
} }

3
src/applications/differential/field/specification/DifferentialFieldSpecification.php
View file

@ -768,8 +768,7 @@ abstract class DifferentialFieldSpecification {
? "users and mailing lists" ? "users and mailing lists"
: "users"; : "users";
throw new DifferentialFieldParseException( throw new DifferentialFieldParseException(
"Commit message references nonexistent {$what}: {$invalid}.", "Commit message references nonexistent {$what}: {$invalid}.");
array_unique($results));
} }
return array_unique($results); return array_unique($results);

3
src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
View file

@ -149,8 +149,7 @@ final class DifferentialManiphestTasksFieldSpecification
} }
$invalid = implode(', ', $invalid); $invalid = implode(', ', $invalid);
throw new DifferentialFieldParseException( throw new DifferentialFieldParseException(
"Commit message references nonexistent {$what}: {$invalid}.", "Commit message references nonexistent {$what}: {$invalid}.");
$task_phids);
} }
return $task_phids; return $task_phids;