1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00

Add an "Onto Branch" selector control to "Land Revision" dialog

Summary:
Ref T9952. This adds a typeahead so you can pick a branch to target.

It does not choose a default branch, the user must pick a branch explicitly.

Test Plan:
  - Landed rGITTESTd587fada48fc to `master` (by typing "master").
  - Landed rGITTEST86c339b2ef01 to `notmaster` (by typing "notmaster").

{F1020531}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9952

Differential Revision: https://secure.phabricator.com/D14733
This commit is contained in:
epriestley 2015-12-10 13:35:30 -08:00
parent 8dcdc7534d
commit 856bdaf77e
2 changed files with 78 additions and 23 deletions

View file

@ -27,19 +27,50 @@ final class DifferentialRevisionOperationController
->addCancelButton($detail_uri);
}
$diff = $revision->getActiveDiff();
$repository = $revision->getRepository();
$ref_types = array(
PhabricatorRepositoryRefCursor::TYPE_BRANCH,
);
$e_ref = true;
$errors = array();
if ($request->isFormPost()) {
$ref_phid = head($request->getArr('refPHIDs'));
if (!strlen($ref_phid)) {
$e_ref = pht('Required');
$errors[] = pht(
'You must select a branch to land this revision onto.');
} else {
$ref = id(new PhabricatorRepositoryRefCursorQuery())
->setViewer($viewer)
->withPHIDs(array($ref_phid))
->withRepositoryPHIDs(array($repository->getPHID()))
->withRefTypes($ref_types)
->executeOne();
if (!$ref) {
$e_ref = pht('Invalid');
$errors[] = pht(
'You must select a branch from this repository to land this '.
'revision onto.');
}
}
if (!$errors) {
// NOTE: The operation is locked to the current active diff, so if the
// revision is updated before the operation applies nothing sneaky
// occurs.
$diff = $revision->getActiveDiff();
$repository = $revision->getRepository();
$target = 'branch:'.$ref->getRefName();
$operation = DrydockRepositoryOperation::initializeNewOperation($op)
->setAuthorPHID($viewer->getPHID())
->setObjectPHID($revision->getPHID())
->setRepositoryPHID($repository->getPHID())
->setRepositoryTarget('branch:master')
->setRepositoryTarget($target)
->setProperty('differential.diffPHID', $diff->getPHID());
$operation->save();
@ -48,18 +79,38 @@ final class DifferentialRevisionOperationController
return id(new AphrontRedirectResponse())
->setURI($detail_uri);
}
}
return $this->newDialog()
->setTitle(pht('Land Revision'))
->appendParagraph(
$ref_datasource = id(new DiffusionRefDatasource())
->setParameters(
array(
'repositoryPHIDs' => array($repository->getPHID()),
'refTypes' => $ref_types,
));
$form = id(new AphrontFormView())
->setUser($viewer)
->appendRemarkupInstructions(
pht(
'In theory, this will do approximately what `arc land` would do. '.
'In practice, that is almost certainly not what it will actually '.
'do.'))
->appendParagraph(
'In practice, you will have a riveting adventure instead.'))
->appendControl(
id(new AphrontFormTokenizerControl())
->setLabel(pht('Onto Branch'))
->setName('refPHIDs')
->setLimit(1)
->setError($e_ref)
->setDatasource($ref_datasource))
->appendRemarkupInstructions(
pht(
'THIS FEATURE IS EXPERIMENTAL AND DANGEROUS! USE IT AT YOUR '.
'OWN RISK!'))
'(WARNING) THIS FEATURE IS EXPERIMENTAL AND DANGEROUS! USE IT AT '.
'YOUR OWN RISK!'));
return $this->newDialog()
->setWidth(AphrontDialogView::WIDTH_FORM)
->setTitle(pht('Land Revision'))
->setErrors($errors)
->appendForm($form)
->addCancelButton($detail_uri)
->addSubmitButton(pht('Mutate Repository Unpredictably'));
}

View file

@ -9,6 +9,10 @@ final class PhabricatorRepositoryRefCursorPHIDType
return pht('Repository Ref');
}
public function getTypeIcon() {
return 'fa-code-fork';
}
public function newObject() {
return new PhabricatorRepositoryRefCursor();
}