Allows branches to appear in diffusion with out triggering closing things from the commit message

Summary: Implemented it how it was suggested in ticket comments

Test Plan: create a revision in a branch, push that branch up, verify it's visible in diffusion and also that revision is not closed, then merge and push to master, verify that revision closed

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin, 20after4

Maniphest Tasks: T1210

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

src/applications/repository/controller/PhabricatorRepositoryEditController.php

@@ -246,6 +246,11 @@ final class PhabricatorRepositoryEditController
         $branch_filter = array_fill_keys($branch_filter, true);
 
         $repository->setDetail('branch-filter', $branch_filter);
+
+        $close_commits_filter = $request->getStrList('close-commits-filter');
+        $close_commits_filter = array_fill_keys($close_commits_filter, true);
+
+        $repository->setDetail('close-commits-filter', $close_commits_filter);
       }
 
       $repository->setDetail(
@@ -611,13 +616,28 @@ final class PhabricatorRepositoryEditController
             'disabled'  => 'Disabled: Ignore Pushed Revisions',
             ))
         ->setCaption(
-          "Automatically close Differential revisions which are pushed to ".
-          "this repository.")
+          "Automatically close Differential revisions when associated commits ".
+          "are pushed to this repository.")
         ->setValue(
           $repository->getDetail('disable-autoclose', false)
           ? 'disabled'
           : 'enabled'));
 
+    if ($has_branch_filter) {
+      $close_commits_filter_str = implode(
+          ', ',
+          array_keys($repository->getDetail('close-commits-filter', array())));
+      $inset
+        ->appendChild(
+          id(new AphrontFormTextControl())
+            ->setName('close-commits-filter')
+            ->setLabel('Autoclose Branches')
+            ->setValue($close_commits_filter_str)
+            ->setCaption(
+              'Optional list of branches which can trigger autoclose. '.
+              'If left empty, all branches trigger autoclose.'));
+    }
+
     $inset
       ->appendChild(
         id(new AphrontFormTextControl())