Page MenuHomePhabricator
Files F13237290

D12131.id.diff
No OneTemporary
Actions

D12131.id.diff
View Options

diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -63,12 +63,16 @@
'create/' => 'DifferentialDiffCreateController',
),
'changeset/' => 'DifferentialChangesetViewController',
- 'revision/edit/(?:(?P<id>[1-9]\d*)/)?'
- => 'DifferentialRevisionEditController',
- 'revision/land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
- => 'DifferentialRevisionLandController',
- 'revision/closedetails/(?P<phid>[^/]+)/'
- => 'DifferentialRevisionCloseDetailsController',
+ 'revision/' => array(
+ 'edit/(?:(?P<id>[1-9]\d*)/)?'
+ => 'DifferentialRevisionEditController',
+ 'land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
+ => 'DifferentialRevisionLandController',
+ 'closedetails/(?P<phid>[^/]+)/'
+ => 'DifferentialRevisionCloseDetailsController',
+ 'update/(?P<revisionID>[1-9]\d*)/'
+ => 'DifferentialDiffCreateController',
+ ),
'comment/' => array(
'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',
'save/(?P<id>[1-9]\d*)/' => 'DifferentialCommentSaveController',
diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
--- a/src/applications/differential/controller/DifferentialController.php
+++ b/src/applications/differential/controller/DifferentialController.php
@@ -2,18 +2,6 @@
abstract class DifferentialController extends PhabricatorController {
- protected function buildApplicationCrumbs() {
- $crumbs = parent::buildApplicationCrumbs();
-
- $crumbs->addAction(
- id(new PHUIListItemView())
- ->setHref($this->getApplicationURI('/diff/create/'))
- ->setName(pht('Create Diff'))
- ->setIcon('fa-plus-square'));
-
- return $crumbs;
- }
-
public function buildSideNavView($for_app = false) {
$viewer = $this->getRequest()->getUser();
diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
@@ -2,10 +2,27 @@
final class DifferentialDiffCreateController extends DifferentialController {
- public function processRequest() {
-
- $request = $this->getRequest();
- $viewer = $request->getUser();
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $this->getViewer();
+
+ // If we're on the "Update Diff" workflow, load the revision we're going
+ // to update.
+ $revision = null;
+ $revision_id = $request->getURIData('revisionID');
+ if ($revision_id) {
+ $revision = id(new DifferentialRevisionQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($revision_id))
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->executeOne();
+ if (!$revision) {
+ return new Aphront404Response();
+ }
+ }
$diff = null;
// This object is just for policy stuff
@@ -32,8 +49,8 @@
if (!strlen($diff)) {
$errors[] = pht(
- 'You can not create an empty diff. Copy/paste a diff, or upload a '.
- 'diff file.');
+ 'You can not create an empty diff. Paste a diff or upload a '.
+ 'file containing a diff.');
$e_diff = pht('Required');
$e_file = pht('Required');
}
@@ -48,8 +65,16 @@
'viewPolicy' => $request->getStr('viewPolicy'),));
$call->setUser($viewer);
$result = $call->execute();
- $path = id(new PhutilURI($result['uri']))->getPath();
- return id(new AphrontRedirectResponse())->setURI($path);
+
+ $diff_id = $result['id'];
+
+ $uri = $this->getApplicationURI("diff/{$diff_id}/");
+ $uri = new PhutilURI($uri);
+ if ($revision) {
+ $uri->setQueryParam('revisionID', $revision->getID());
+ }
+
+ return id(new AphrontRedirectResponse())->setURI($uri);
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
}
@@ -64,7 +89,7 @@
'href' => $arcanist_href,
'target' => '_blank',
),
- 'Arcanist');
+ 'Learn More');
$cancel_uri = $this->getApplicationURI();
@@ -77,19 +102,53 @@
->setObject($diff_object)
->execute();
+ $info_view = null;
+ if (!$request->isFormPost()) {
+ $info_view = id(new PHUIInfoView())
+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+ ->setErrors(
+ array(
+ array(
+ pht(
+ 'The best way to create a diff is to use the Arcanist '.
+ 'command-line tool.'),
+ ' ',
+ $arcanist_link,
+ ),
+ pht(
+ 'You can also paste a diff below, or upload a file '.
+ 'containing a diff (for example, from %s, %s or %s).',
+ phutil_tag('tt', array(), 'svn diff'),
+ phutil_tag('tt', array(), 'git diff'),
+ phutil_tag('tt', array(), 'hg diff --git')),
+ ));
+ }
+
+ if ($revision) {
+ $title = pht('Update Diff');
+ $header = pht('Update Diff');
+ $button = pht('Continue');
+ } else {
+ $title = pht('Create Diff');
+ $header = pht('Create New Diff');
+ $button = pht('Create Diff');
+ }
+
$form
- ->setAction('/differential/diff/create/')
->setEncType('multipart/form-data')
- ->setUser($viewer)
- ->appendInstructions(
- pht(
- 'The best way to create a Differential diff is by using %s, but you '.
- 'can also just paste a diff (for example, from %s, %s or %s) into '.
- 'this box, or upload a diff file.',
- $arcanist_link,
- phutil_tag('tt', array(), 'svn diff'),
- phutil_tag('tt', array(), 'git diff'),
- phutil_tag('tt', array(), 'hg diff --git')))
+ ->setUser($viewer);
+
+ if ($revision) {
+ $revision_handles = $this->loadViewerHandles(array($revision->getPHID()));
+ $revision_handle = head($revision_handles);
+
+ $form->appendChild(
+ id(new AphrontFormMarkupControl())
+ ->setLabel(pht('Updating Revision'))
+ ->setValue($revision_handle->renderLink()));
+ }
+
+ $form
->appendChild(
id(new AphrontFormTextAreaControl())
->setLabel(pht('Raw Diff'))
@@ -119,16 +178,25 @@
->appendChild(
id(new AphrontFormSubmitControl())
->addCancelButton($cancel_uri)
- ->setValue(pht('Create Diff')));
+ ->setValue($button));
$form_box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Create New Diff'))
+ ->setHeaderText($header)
->setValidationException($validation_exception)
->setForm($form)
->setFormErrors($errors);
+ if ($info_view) {
+ $form_box->setInfoView($info_view);
+ }
+
$crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb(pht('Create Diff'));
+ if ($revision) {
+ $crumbs->addTextCrumb(
+ $revision->getMonogram(),
+ '/'.$revision->getMonogram());
+ }
+ $crumbs->addTextCrumb($title);
return $this->buildApplicationPage(
array(
@@ -136,7 +204,7 @@
$form_box,
),
array(
- 'title' => pht('Create Diff'),
+ 'title' => $title,
));
}
diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
--- a/src/applications/differential/controller/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
@@ -29,8 +29,6 @@
->setURI('/D'.$diff->getRevisionID().'?id='.$diff->getID());
}
- $error_view = id(new PHUIInfoView())
- ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
// TODO: implement optgroup support in AphrontFormSelectControl?
$select = array();
$select[] = hsprintf('<optgroup label="%s">', pht('Create New Revision'));
@@ -44,17 +42,31 @@
->setViewer($viewer)
->withAuthors(array($viewer->getPHID()))
->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
->execute();
+ $selected_id = $request->getInt('revisionID');
+
if ($revisions) {
$select[] = hsprintf(
'<optgroup label="%s">',
pht('Update Existing Revision'));
foreach ($revisions as $revision) {
+ if ($selected_id == $revision->getID()) {
+ $selected = 'selected';
+ } else {
+ $selected = null;
+ }
+
$select[] = phutil_tag(
'option',
array(
'value' => $revision->getID(),
+ 'selected' => $selected,
),
id(new PhutilUTF8StringTruncator())
->setMaximumGlyphs(128)
@@ -89,8 +101,6 @@
id(new AphrontFormSubmitControl())
->setValue(pht('Continue')));
- $error_view->appendChild($form);
-
$props = id(new DifferentialDiffProperty())->loadAllWhere(
'diffID = %d',
$diff->getID());
@@ -129,7 +139,7 @@
$prop_box = id(new PHUIObjectBoxView())
->setHeader($property_head)
->addPropertyList($property_view)
- ->setInfoView($error_view);
+ ->appendChild($form);
return $this->buildApplicationPage(
array(
diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
--- a/src/applications/differential/controller/DifferentialRevisionListController.php
+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
@@ -21,4 +21,16 @@
return $this->delegateToController($controller);
}
+ protected function buildApplicationCrumbs() {
+ $crumbs = parent::buildApplicationCrumbs();
+
+ $crumbs->addAction(
+ id(new PHUIListItemView())
+ ->setHref($this->getApplicationURI('/diff/create/'))
+ ->setName(pht('Create Diff'))
+ ->setIcon('fa-plus-square'));
+
+ return $crumbs;
+ }
+
}
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -525,6 +525,13 @@
->setDisabled(!$can_edit)
->setWorkflow(!$can_edit);
+ $actions[] = id(new PhabricatorActionView())
+ ->setIcon('fa-upload')
+ ->setHref("/differential/revision/update/{$revision_id}/")
+ ->setName(pht('Update Diff'))
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(!$can_edit);
+
$this->requireResource('phabricator-object-selector-css');
$this->requireResource('javelin-behavior-phabricator-object-selector');

File Metadata

Mime Type
text/plain
Expires
Wed, May 22, 1:13 PM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277302
Default Alt Text
D12131.id.diff (11 KB)

Event Timeline

Phabricator · Built by Phacility