revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 22:10:55 +01:00
Code Issues Releases Wiki Activity

Fixed bug resulting in duplicate field names in commit messages

Browse source 
Summary:
My earlier diff refactored some code without completely
respecting the semantics, sometimes resulting in duplicate field names
returned from differential.getcommitmessage.  This fixes that.

Test Plan:
ran "arc diff" with diff causing the bug (commit message
had an empty Revert Plan: field) and verified no duplicate fields

Reviewed By: epriestley
Reviewers: epriestley
CC: aran, dpepper, epriestley
Differential Revision: 610
This commit is contained in:
mgummelt 2011-07-07 14:51:27 -07:00
parent 3c785cdb5a
commit 00f4c37ca2
3 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/applications/conduit/method/differential/getcommitmessage/ConduitAPI_differential_getcommitmessage_Method.php
View file

@ -71,9 +71,7 @@ class ConduitAPI_differential_getcommitmessage_Method extends ConduitAPIMethod {
foreach ($fields as $field => $value) { foreach ($fields as $field => $value) {
if (isset($simple_fields[$field])) { if (isset($simple_fields[$field])) {
$message_data->overwriteFieldValue( $message_data->setField($simple_fields[$field], $value);
$simple_fields[$field],
$value);
} else { } else {
$overwrite = true; $overwrite = true;
static $overwrite_map = array( static $overwrite_map = array(
@ -93,9 +91,7 @@ class ConduitAPI_differential_getcommitmessage_Method extends ConduitAPIMethod {
break; break;
} }
if ($overwrite) { if ($overwrite) {
$message_data->overwriteFieldValue( $message_data->setField($overwrite_map[$field], $value);
$overwrite_map[$field],
$value);
} }
} }
} }

53
src/applications/differential/data/commitmessage/DifferentialCommitMessageData.php
View file

@ -66,14 +66,11 @@ class DifferentialCommitMessageData {
public function prepare() { public function prepare() {
$revision = $this->revision; $revision = $this->revision;
$fields = array();
if ($revision->getSummary()) { if ($revision->getSummary()) {
$fields[] = $this->setField('Summary', $revision->getSummary());
new DifferentialCommitMessageField('Summary', $revision->getSummary());
} }
$fields[] = $this->setField('Test Plan', $revision->getTestPlan());
new DifferentialCommitMessageField('Test Plan', $revision->getTestPlan());
$reviewer = null; $reviewer = null;
$commenters = array(); $commenters = array();
@ -97,9 +94,7 @@ class DifferentialCommitMessageData {
if ($this->mode == self::MODE_AMEND) { if ($this->mode == self::MODE_AMEND) {
if ($reviewer) { if ($reviewer) {
$fields[] = $this->setField('Reviewed By', $handles[$reviewer]->getName());
new DifferentialCommitMessageField('Reviewed By',
$handles[$reviewer]->getName());
} }
} }
@ -109,50 +104,42 @@ class DifferentialCommitMessageData {
$reviewer_names[] = $handles[$uid]->getName(); $reviewer_names[] = $handles[$uid]->getName();
} }
$reviewer_names = implode(', ', $reviewer_names); $reviewer_names = implode(', ', $reviewer_names);
$fields[] = new DifferentialCommitMessageField('Reviewers', $this->setField('Reviewers', $reviewer_names);
$reviewer_names);
} }
$user_handles = array_select_keys($handles, $commenters); $user_handles = array_select_keys($handles, $commenters);
if ($user_handles) { if ($user_handles) {
$commenters = implode(', ', mpull($user_handles, 'getName')); $commenters = implode(', ', mpull($user_handles, 'getName'));
$fields[] = new DifferentialCommitMessageField('Commenters', $commenters); $this->setField('Commenters', $commenters);
} }
$cc_handles = array_select_keys($handles, $ccphids); $cc_handles = array_select_keys($handles, $ccphids);
if ($cc_handles) { if ($cc_handles) {
$cc = implode(', ', mpull($cc_handles, 'getName')); $cc = implode(', ', mpull($cc_handles, 'getName'));
$fields[] = new DifferentialCommitMessageField('CC', $cc); $this->setField('CC', $cc);
} }
if ($revision->getRevertPlan()) { if ($revision->getRevertPlan()) {
$fields[] = $this->setField('Revert Plan', $revision->getRevertPlan());
new DifferentialCommitMessageField('Revert Plan',
$revision->getRevertPlan());
} }
if ($revision->getBlameRevision()) { if ($revision->getBlameRevision()) {
$fields[] = $this->setField('Blame Revision', $revision->getBlameRevision());
new DifferentialCommitMessageField('Blame Revision',
$revision->getBlameRevision());
} }
if ($this->mode == self::MODE_EDIT) { if ($this->mode == self::MODE_EDIT) {
// In edit mode, include blank fields. // In edit mode, include blank fields.
$fields += array( $blank_fields = array('Summary', 'Reviewers', 'CC', 'Revert Plan',
new DifferentialCommitMessageField('Summary', ''), 'Blame Revision');
new DifferentialCommitMessageField('Reviewers', ''), foreach ($blank_fields as $blank_field) {
new DifferentialCommitMessageField('CC', ''), if (!$this->getField($blank_field)) {
new DifferentialCommitMessageField('Revert Plan', ''), $this->setField($blank_field, '');
new DifferentialCommitMessageField('Blame Revision', ''), }
); }
} }
$fields[] = $this->setField('Title', $revision->getTitle());
new DifferentialCommitMessageField('Title', $revision->getTitle()); $this->setField('Differential Revision', $revision->getID());
$fields[] = new DifferentialCommitMessageField('Differential Revision',
$revision->getID());
// append custom commit message fields // append custom commit message fields
$modify_class = PhabricatorEnv::getEnvConfig( $modify_class = PhabricatorEnv::getEnvConfig(
@ -162,14 +149,14 @@ class DifferentialCommitMessageData {
$modifier = newv($modify_class, array($revision)); $modifier = newv($modify_class, array($revision));
$fields = $modifier->modifyFields($fields); $fields = $modifier->modifyFields($fields);
} }
$this->fields = $fields;
} }
public function overwriteFieldValue($name, $value) { public function setField($name, $value) {
$field = $this->getField($name); $field = $this->getField($name);
if ($field) { if ($field) {
$field->setValue($value); $field->setValue($value);
} else {
$this->fields[] = new DifferentialCommitMessageField($name, $value);
} }
return $this; return $this;
} }

1
src/applications/differential/data/commitmessage/__init__.php
View file

@ -11,7 +11,6 @@ phutil_require_module('phabricator', 'applications/differential/storage/comment'
phutil_require_module('phabricator', 'applications/phid/handle/data'); phutil_require_module('phabricator', 'applications/phid/handle/data');
phutil_require_module('phabricator', 'infrastructure/env'); phutil_require_module('phabricator', 'infrastructure/env');
phutil_require_module('phutil', 'symbols');
phutil_require_module('phutil', 'utils'); phutil_require_module('phutil', 'utils');