From 8da4f981fb128b2f72d0bce274cc9edf1ca850c0 Mon Sep 17 00:00:00 2001 From: vrana Date: Sun, 12 Feb 2012 01:36:05 -0800 Subject: [PATCH] Always display Branch in revision Summary: I, as an author, sometimes forget branch associated with a revision. Plus setting ##differential.show-host-field## makes a false sense of security that branch will stay hidden so that I can name it //finally_solve_this_crap_which_makes_no_sense//. But it is published in Accepted and Request Changes e-mails anyway. Test Plan: Display revision with disabled ##differential.show-host-field##. Reviewers: epriestley Reviewed By: epriestley CC: aran, epriestley Differential Revision: https://secure.phabricator.com/D1602 --- conf/default.conf.php | 4 ++-- .../selector/default/DifferentialDefaultFieldSelector.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/default.conf.php b/conf/default.conf.php index f9833dbb2d..00a610bf1b 100644 --- a/conf/default.conf.php +++ b/conf/default.conf.php @@ -597,8 +597,8 @@ return array( 'differential.field-selector' => 'DifferentialDefaultFieldSelector', - // Differential can show "Host", "Path" and "Branch" fields on revisions, with - // information about the machine, working directory and branch where the + // Differential can show "Host" and "Path" fields on revisions, with + // information about the machine and working directory where the // change came from. These fields are disabled by default because they may // occasionally have sensitive information; you can set this to true to // enable them. diff --git a/src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php b/src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php index 8f1ec75013..5acdeee59d 100644 --- a/src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php +++ b/src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php @@ -42,13 +42,13 @@ final class DifferentialDefaultFieldSelector array( new DifferentialHostFieldSpecification(), new DifferentialPathFieldSpecification(), - new DifferentialBranchFieldSpecification(), )); } $fields = array_merge( $fields, array( + new DifferentialBranchFieldSpecification(), new DifferentialArcanistProjectFieldSpecification(), new DifferentialApplyPatchFieldSpecification(), new DifferentialRevisionIDFieldSpecification(),