Herald - fix change type bug

Summary: wasn't working due to some type issues. Fixes T4756. I also made it display nicer while I was debugging this.

Test Plan: created a herald rule to block changes that added refs. git tag -a "test" -m "test test"; git push origin test got me blocked!

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T4756

Differential Revision: https://secure.phabricator.com/D8724

Author: bobtrahan

src/applications/herald/adapter/HeraldAdapter.php

@@ -544,9 +544,9 @@ public function doesConditionMatch(
         }
         return $result;
       case self::CONDITION_HAS_BIT:
-        return (($condition_value & $field_value) === $condition_value);
+        return (($condition_value & $field_value) === (int) $condition_value);
       case self::CONDITION_NOT_BIT:
-        return (($condition_value & $field_value) !== $condition_value);
+        return (($condition_value & $field_value) !== (int) $condition_value);
       default:
         throw new HeraldInvalidConditionException(
           "Unknown condition '{$condition_type}'.");
@@ -1039,6 +1039,16 @@ private function renderConditionValueAsText(
           }
         }
         break;
+      case HeraldPreCommitRefAdapter::FIELD_REF_CHANGE:
+        $change_map =
+          PhabricatorRepositoryPushLog::getHeraldChangeflagConditionOptions();
+        foreach ($value as $index => $val) {
+          $name = idx($change_map, $val);
+          if ($name) {
+            $value[$index] = $name;
+          }
+        }
+        break;
       default:
         foreach ($value as $index => $val) {
           $handle = idx($handles, $val);

src/applications/herald/controller/HeraldRuleController.php

@@ -463,6 +463,8 @@ private function setupEditorBehavior(
        $rule->getRuleType());
     }
 
+    $changeflag_options =
+      PhabricatorRepositoryPushLog::getHeraldChangeflagConditionOptions();
     Javelin::initBehavior(
       'herald-rule-editor',
       array(
@@ -490,16 +492,7 @@ private function setupEditorBehavior(
             'default' => PhabricatorRepositoryPushLog::REFTYPE_BRANCH,
           ),
           HeraldPreCommitRefAdapter::VALUE_REF_CHANGE => array(
-            'options' => array(
-              PhabricatorRepositoryPushLog::CHANGEFLAG_ADD =>
-                pht('change creates ref'),
-              PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE =>
-                pht('change deletes ref'),
-              PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE =>
-                pht('change rewrites ref'),
-              PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS =>
-                pht('dangerous change'),
-            ),
+            'options' => $changeflag_options,
             'default' => PhabricatorRepositoryPushLog::CHANGEFLAG_ADD,
           ),
         ),

src/applications/repository/storage/PhabricatorRepositoryPushLog.php

@@ -52,6 +52,18 @@ public static function initializeNewLog(PhabricatorUser $viewer) {
       ->setPusherPHID($viewer->getPHID());
   }
 
+  public static function getHeraldChangeflagConditionOptions() {
+    return array(
+      PhabricatorRepositoryPushLog::CHANGEFLAG_ADD =>
+        pht('change creates ref'),
+      PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE =>
+        pht('change deletes ref'),
+      PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE =>
+        pht('change rewrites ref'),
+      PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS =>
+        pht('dangerous change'));
+  }
+
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,