From a162f188c22c66945ed54d6eb2093a2ce139bfff Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 3 Sep 2019 14:36:00 +0200 Subject: [PATCH] Differential: exclude fields from commit message to follow our guidelines Do it as a tweaks to render due to: - Those fields are considered permanent. - We still want to be able to specify them when creating new revisions (at least for subscribers/reviewers). --- .../field/DifferentialAuditorsCommitMessageField.php | 6 ++++++ .../field/DifferentialReviewersCommitMessageField.php | 6 ++++++ .../field/DifferentialSubscribersCommitMessageField.php | 6 ++++++ .../field/DifferentialTagsCommitMessageField.php | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php b/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php index bd4d9f3009..3cc8ef6f0b 100644 --- a/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php +++ b/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php @@ -42,6 +42,12 @@ final class DifferentialAuditorsCommitMessageField } public function renderFieldValue($value) { + // Blender: don't include this in commit messages. + // + // NOTE: Do it at render time to match behavior of other tweaked fields + // (such as reviewers) which are considered non-disableable. + return null; + return $this->renderHandleList($value); } diff --git a/src/applications/differential/field/DifferentialReviewersCommitMessageField.php b/src/applications/differential/field/DifferentialReviewersCommitMessageField.php index 100897c28b..c53d449492 100644 --- a/src/applications/differential/field/DifferentialReviewersCommitMessageField.php +++ b/src/applications/differential/field/DifferentialReviewersCommitMessageField.php @@ -62,6 +62,12 @@ final class DifferentialReviewersCommitMessageField } public function renderFieldValue($value) { + // Blender: don't include this in commit messages. + // + // NOTE: Do it at render time to allow specifying reviewers when creating + // a new differential revision with `arc diff`. + return null; + $value = $this->inflateReviewers($value); $phid_list = array(); diff --git a/src/applications/differential/field/DifferentialSubscribersCommitMessageField.php b/src/applications/differential/field/DifferentialSubscribersCommitMessageField.php index 12d36e4381..f697424786 100644 --- a/src/applications/differential/field/DifferentialSubscribersCommitMessageField.php +++ b/src/applications/differential/field/DifferentialSubscribersCommitMessageField.php @@ -45,6 +45,12 @@ final class DifferentialSubscribersCommitMessageField } public function renderFieldValue($value) { + // Blender: don't include this in commit messages. + // + // NOTE: Do it at render time to allow specifying subsribers when creating + // a new differential revision with `arc diff`. + return null; + return $this->renderHandleList($value); } diff --git a/src/applications/differential/field/DifferentialTagsCommitMessageField.php b/src/applications/differential/field/DifferentialTagsCommitMessageField.php index fc6267f1ce..93d8307be1 100644 --- a/src/applications/differential/field/DifferentialTagsCommitMessageField.php +++ b/src/applications/differential/field/DifferentialTagsCommitMessageField.php @@ -51,6 +51,12 @@ final class DifferentialTagsCommitMessageField } public function renderFieldValue($value) { + // Blender: don't include this in commit messages. + // + // NOTE: Do it at render time to allow specifying tags when creating + // a new differential revision with `arc diff`. + return null; + return $this->renderHandleList($value); }