Add hosting, serving, and push policy options to repository edit

Summary: Basically straight from D7391. The differences are basically: - Policy stuff is all application-scope instead of global-scope. - Made a few strings a little nicer. - Deleted a bit of dead code. - Added a big "THIS DOESN'T WORK YET" warning. Test Plan: See screenshots. Reviewers: hach-que, btrahan Reviewed By: hach-que CC: aran Maniphest Tasks: T2230 Differential Revision: https://secure.phabricator.com/D7416
2013-10-25 20:13:38 -07:00
parent 86fe020a97
commit bb35f8ec9f
9 changed files with 458 additions and 6 deletions
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
@@ -0,0 +1,229 @@
+<?php
+
+final class DiffusionRepositoryEditHostingController
+  extends DiffusionRepositoryEditController {
+
+  private $serve;
+
+  public function willProcessRequest(array $data) {
+    parent::willProcessRequest($data);
+    $this->serve = idx($data, 'serve');
+  }
+
+  public function processRequest() {
+    $request = $this->getRequest();
+    $user = $request->getUser();
+    $drequest = $this->diffusionRequest;
+    $repository = $drequest->getRepository();
+
+    $repository = id(new PhabricatorRepositoryQuery())
+      ->setViewer($user)
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->withIDs(array($repository->getID()))
+      ->executeOne();
+    if (!$repository) {
+      return new Aphront404Response();
+    }
+
+    if (!$this->serve) {
+      return $this->handleHosting($repository);
+    } else {
+      return $this->handleProtocols($repository);
+    }
+  }
+
+  public function handleHosting(PhabricatorRepository $repository) {
+    $request = $this->getRequest();
+    $user = $request->getUser();
+
+    $v_hosting = $repository->isHosted();
+
+    $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
+    $next_uri = $this->getRepositoryControllerURI($repository, 'edit/serve/');
+
+    if ($request->isFormPost()) {
+      $v_hosting = $request->getBool('hosting');
+
+      $xactions = array();
+      $template = id(new PhabricatorRepositoryTransaction());
+
+      $type_hosting = PhabricatorRepositoryTransaction::TYPE_HOSTING;
+
+      $xactions[] = id(clone $template)
+        ->setTransactionType($type_hosting)
+        ->setNewValue($v_hosting);
+
+      id(new PhabricatorRepositoryEditor())
+        ->setContinueOnNoEffect(true)
+        ->setContentSourceFromRequest($request)
+        ->setActor($user)
+        ->applyTransactions($repository, $xactions);
+
+      return id(new AphrontRedirectResponse())->setURI($next_uri);
+    }
+
+    $crumbs = $this->buildApplicationCrumbs();
+    $crumbs->addCrumb(
+      id(new PhabricatorCrumbView())
+        ->setName(pht('Edit Hosting')));
+
+    $title = pht('Edit Hosting (%s)', $repository->getName());
+
+    $hosted_control = id(new AphrontFormRadioButtonControl())
+        ->setName('hosting')
+        ->setLabel(pht('Hosting'))
+        ->addButton(
+          true,
+          pht('Host Repository on Phabricator'),
+          pht(
+            'Phabricator will host this repository. Users will be able to '.
+            'push commits to Phabricator. Phabricator will not pull '.
+            'changes from elsewhere.'))
+        ->addButton(
+          false,
+          pht('Host Repository Elsewhere'),
+          pht(
+            'Phabricator will pull updates to this repository from a master '.
+            'repository elsewhere (for example, on GitHub or Bitbucket). '.
+            'Users will not be able to push commits to this repository.'))
+        ->setValue($v_hosting);
+
+    $form = id(new AphrontFormView())
+      ->setUser($user)
+      ->appendRemarkupInstructions(
+        pht(
+          'NOTE: Hosting is extremely new and barely works! Use it at '.
+          'your own risk.'.
+          "\n\n".
+          'Phabricator can host repositories, or it can track repositories '.
+          'hosted elsewhere (like on GitHub or Bitbucket).'))
+      ->appendChild($hosted_control)
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue(pht('Save and Continue'))
+          ->addCancelButton($edit_uri));
+
+    $object_box = id(new PHUIObjectBoxView())
+      ->setHeaderText($title)
+      ->setForm($form);
+
+    return $this->buildApplicationPage(
+      array(
+        $crumbs,
+        $object_box,
+      ),
+      array(
+        'title' => $title,
+        'device' => true,
+      ));
+  }
+
+  public function handleProtocols(PhabricatorRepository $repository) {
+    $request = $this->getRequest();
+    $user = $request->getUser();
+
+    $v_http_mode = $repository->getServeOverHTTP();
+    $v_ssh_mode = $repository->getServeOverSSH();
+
+    $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
+    $prev_uri = $this->getRepositoryControllerURI($repository, 'edit/hosting/');
+
+    if ($request->isFormPost()) {
+      $v_http_mode = $request->getStr('http');
+      $v_ssh_mode = PhabricatorRepository::SERVE_OFF;
+
+      $xactions = array();
+      $template = id(new PhabricatorRepositoryTransaction());
+
+      $type_http = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP;
+      $type_ssh = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH;
+
+      $xactions[] = id(clone $template)
+        ->setTransactionType($type_http)
+        ->setNewValue($v_http_mode);
+
+      $xactions[] = id(clone $template)
+        ->setTransactionType($type_ssh)
+        ->setNewValue($v_ssh_mode);
+
+      id(new PhabricatorRepositoryEditor())
+        ->setContinueOnNoEffect(true)
+        ->setContentSourceFromRequest($request)
+        ->setActor($user)
+        ->applyTransactions($repository, $xactions);
+
+      return id(new AphrontRedirectResponse())->setURI($edit_uri);
+    }
+
+    $crumbs = $this->buildApplicationCrumbs();
+    $crumbs->addCrumb(
+      id(new PhabricatorCrumbView())
+        ->setName(pht('Edit Protocols')));
+
+    $title = pht('Edit Protocols (%s)', $repository->getName());
+
+
+    if ($repository->isHosted()) {
+      $rw_message = pht(
+        'Phabricator will serve a read-write copy of this repository');
+    } else {
+      $rw_message = pht(
+        'This repository is hosted elsewhere, so Phabricator can not perform '.
+        'writes.');
+    }
+
+    $http_control =
+      id(new AphrontFormRadioButtonControl())
+        ->setName('http')
+        ->setLabel(pht('HTTP'))
+        ->setValue($v_http_mode)
+        ->addButton(
+          PhabricatorRepository::SERVE_OFF,
+          PhabricatorRepository::getProtocolAvailabilityName(
+            PhabricatorRepository::SERVE_OFF),
+          pht('Phabricator will not serve this repository.'))
+        ->addButton(
+          PhabricatorRepository::SERVE_READONLY,
+          PhabricatorRepository::getProtocolAvailabilityName(
+            PhabricatorRepository::SERVE_READONLY),
+          pht('Phabricator will serve a read-only copy of this repository.'))
+        ->addButton(
+          PhabricatorRepository::SERVE_READWRITE,
+          PhabricatorRepository::getProtocolAvailabilityName(
+            PhabricatorRepository::SERVE_READWRITE),
+          $rw_message,
+          $repository->isHosted() ? null : 'disabled',
+          $repository->isHosted() ? null : true);
+
+    $form = id(new AphrontFormView())
+      ->setUser($user)
+      ->appendRemarkupInstructions(
+        pht(
+          'Phabricator can serve repositories over various protocols. You can '.
+          'configure server protocols here.'))
+      ->appendChild($http_control)
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue(pht('Save Changes'))
+          ->addCancelButton($prev_uri, pht('Back')));
+
+    $object_box = id(new PHUIObjectBoxView())
+      ->setHeaderText($title)
+      ->setForm($form);
+
+    return $this->buildApplicationPage(
+      array(
+        $crumbs,
+        $object_box,
+      ),
+      array(
+        'title' => $title,
+        'device' => true,
+      ));
+  }
+
+}
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -23,8 +23,7 @@ final class DiffusionRepositoryEditMainController
        $is_git = true;
        break;
      case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-        // TOOD: This will be true for hosted SVN repositories.
-        $has_local = false;
+        $has_local = $repository->isHosted();
        $is_svn = true;
        break;
      case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
@@ -63,6 +62,10 @@ final class DiffusionRepositoryEditMainController
    $encoding_properties =
      $this->buildEncodingProperties($repository, $encoding_actions);

+    $hosting_properties = $this->buildHostingProperties(
+      $repository,
+      $this->buildHostingActions($repository));
+
    $branches_properties = null;
    if ($has_branches) {
      $branches_properties = $this->buildBranchesProperties(
@@ -114,6 +117,7 @@ final class DiffusionRepositoryEditMainController
      ->setHeader($header)
      ->addPropertyList($basic_properties)
      ->addPropertyList($policy_properties)
+      ->addPropertyList($hosting_properties)
      ->addPropertyList($remote_properties);

    if ($local_properties) {
@@ -298,6 +302,10 @@ final class DiffusionRepositoryEditMainController
      pht('Editable By'),
      $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

+    $pushable = $repository->isHosted()
+      ? $descriptions[DiffusionCapabilityPush::CAPABILITY]
+      : phutil_tag('em', array(), pht('Not a Hosted Repository'));
+    $view->addProperty(pht('Pushable By'), $pushable);

    return $view;
  }
@@ -501,4 +509,57 @@ final class DiffusionRepositoryEditMainController

    return $view;
  }
+
+  private function buildHostingActions(PhabricatorRepository $repository) {
+    $user = $this->getRequest()->getUser();
+
+    $view = id(new PhabricatorActionListView())
+      ->setObjectURI($this->getRequest()->getRequestURI())
+      ->setUser($user);
+
+    $edit = id(new PhabricatorActionView())
+      ->setIcon('edit')
+      ->setName(pht('Edit Hosting'))
+      ->setHref(
+        $this->getRepositoryControllerURI($repository, 'edit/hosting/'));
+    $view->addAction($edit);
+
+    return $view;
+  }
+
+  private function buildHostingProperties(
+    PhabricatorRepository $repository,
+    PhabricatorActionListView $actions) {
+
+    $user = $this->getRequest()->getUser();
+
+    $view = id(new PHUIPropertyListView())
+      ->setUser($user)
+      ->setActionList($actions)
+      ->addSectionHeader(pht('Hosting'));
+
+    $hosting = $repository->isHosted()
+      ? pht('Hosted on Phabricator')
+      : pht('Hosted Elsewhere');
+    $view->addProperty(pht('Hosting'), phutil_tag('em', array(), $hosting));
+
+    $view->addProperty(
+      pht('Serve over HTTP'),
+      phutil_tag(
+        'em',
+        array(),
+        PhabricatorRepository::getProtocolAvailabilityName(
+          $repository->getServeOverHTTP())));
+
+    $view->addProperty(
+      pht('Serve over SSH'),
+      phutil_tag(
+        'em',
+        array(),
+        PhabricatorRepository::getProtocolAvailabilityName(
+          $repository->getServeOverSSH())));
+
+    return $view;
+  }
+
 }
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
@@ -27,16 +27,19 @@ final class DiffusionRepositoryEditPolicyController

    $v_view = $repository->getViewPolicy();
    $v_edit = $repository->getEditPolicy();
+    $v_push = $repository->getPushPolicy();

    if ($request->isFormPost()) {
      $v_view = $request->getStr('viewPolicy');
      $v_edit = $request->getStr('editPolicy');
+      $v_push = $request->getStr('pushPolicy');

      $xactions = array();
      $template = id(new PhabricatorRepositoryTransaction());

      $type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
      $type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
+      $type_push = PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY;

      $xactions[] = id(clone $template)
        ->setTransactionType($type_view)
@@ -46,6 +49,12 @@ final class DiffusionRepositoryEditPolicyController
        ->setTransactionType($type_edit)
        ->setNewValue($v_edit);

+      if ($repository->isHosted()) {
+        $xactions[] = id(clone $template)
+          ->setTransactionType($type_push)
+          ->setNewValue($v_push);
+      }
+
      id(new PhabricatorRepositoryEditor())
        ->setContinueOnNoEffect(true)
        ->setContentSourceFromRequest($request)
@@ -62,7 +71,7 @@ final class DiffusionRepositoryEditPolicyController
      id(new PhabricatorCrumbView())
        ->setName(pht('Edit Policies')));

-    $title = pht('Edit %s', $repository->getName());
+    $title = pht('Edit Policies (%s)', $repository->getName());

    $policies = id(new PhabricatorPolicyQuery())
      ->setViewer($viewer)
@@ -84,7 +93,25 @@ final class DiffusionRepositoryEditPolicyController
          ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
          ->setPolicyObject($repository)
          ->setPolicies($policies)
-          ->setName('editPolicy'))
+          ->setName('editPolicy'));
+
+    if ($repository->isHosted()) {
+      $form->appendChild(
+        id(new AphrontFormPolicyControl())
+          ->setUser($viewer)
+          ->setCapability(DiffusionCapabilityPush::CAPABILITY)
+          ->setPolicyObject($repository)
+          ->setPolicies($policies)
+          ->setName('pushPolicy'));
+    } else {
+      $form->appendChild(
+        id(new AphrontFormMarkupControl())
+          ->setLabel(pht('Can Push'))
+          ->setValue(
+            phutil_tag('em', array(), pht('Not a Hosted Repository'))));
+    }
+
+    $form
      ->appendChild(
        id(new AphrontFormSubmitControl())
          ->setValue(pht('Save Policies'))