-2

src/__phutil_library_map__.php

reviewed

··· 517 517 'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php', 518 518 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php', 519 519 'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php', 520 520 - 'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php', 521 520 'DifferentialRevisionEditEngine' => 'applications/differential/editor/DifferentialRevisionEditEngine.php', 522 521 'DifferentialRevisionEditProController' => 'applications/differential/controller/DifferentialRevisionEditProController.php', 523 522 'DifferentialRevisionFulltextEngine' => 'applications/differential/search/DifferentialRevisionFulltextEngine.php', ··· 5173 5172 'DifferentialRevisionControlSystem' => 'Phobject', 5174 5173 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType', 5175 5174 'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType', 5176 5176 - 'DifferentialRevisionEditController' => 'DifferentialController', 5177 5175 'DifferentialRevisionEditEngine' => 'PhabricatorEditEngine', 5178 5176 'DifferentialRevisionEditProController' => 'DifferentialController', 5179 5177 'DifferentialRevisionFulltextEngine' => 'PhabricatorFulltextEngine',

-2

src/applications/differential/application/PhabricatorDifferentialApplication.php

reviewed

··· 65 65 ), 66 66 'changeset/' => 'DifferentialChangesetViewController', 67 67 'revision/' => array( 68 68 - 'edit/(?:(?P<id>[1-9]\d*)/)?' 69 69 - => 'DifferentialRevisionEditController', 70 68 $this->getEditRoutePattern('editpro/') 71 69 => 'DifferentialRevisionEditProController', 72 70 $this->getEditRoutePattern('attach/(?P<diffID>[^/]+)/to/')

+16 -8

src/applications/differential/controller/DifferentialDiffViewController.php

reviewed

··· 23 23 ->setURI('/D'.$diff->getRevisionID().'?id='.$diff->getID()); 24 24 } 25 25 26 26 + if ($request->isFormPost()) { 27 27 + $diff_id = $diff->getID(); 28 28 + $revision_id = $request->getInt('revisionID'); 29 29 + if ($revision_id) { 30 30 + $attach_uri = "/revision/attach/{$diff_id}/to/{$revision_id}/"; 31 31 + } else { 32 32 + $attach_uri = "/revision/attach/{$diff_id}/to/"; 33 33 + } 34 34 + $attach_uri = $this->getApplicationURI($attach_uri); 35 35 + 36 36 + return id(new AphrontRedirectResponse()) 37 37 + ->setURI($attach_uri); 38 38 + } 39 39 + 26 40 $diff_phid = $diff->getPHID(); 27 41 $buildables = id(new HarbormasterBuildableQuery()) 28 42 ->setViewer($viewer) ··· 78 92 $select); 79 93 80 94 $form = id(new AphrontFormView()) 81 81 - ->setUser($request->getUser()) 82 82 - ->setAction('/differential/revision/edit/') 83 83 - ->addHiddenInput('diffID', $diff->getID()) 84 84 - ->addHiddenInput('viaDiffView', 1) 85 85 - ->addHiddenInput( 86 86 - id(new DifferentialRepositoryField())->getFieldKey(), 87 87 - $diff->getRepositoryPHID()) 95 95 + ->setViewer($viewer) 88 96 ->appendRemarkupInstructions( 89 97 pht( 90 98 'Review the diff for correctness. When you are satisfied, either '. ··· 98 106 ->setValue(pht('Continue'))); 99 107 100 108 $props = id(new DifferentialDiffProperty())->loadAllWhere( 101 101 - 'diffID = %d', 109 109 + 'diffID = %d', 102 110 $diff->getID()); 103 111 $props = mpull($props, 'getData', 'getName'); 104 112

-214

src/applications/differential/controller/DifferentialRevisionEditController.php

reviewed

··· 1 1 - <?php 2 2 - 3 3 - final class DifferentialRevisionEditController 4 4 - extends DifferentialController { 5 5 - 6 6 - public function handleRequest(AphrontRequest $request) { 7 7 - $viewer = $this->getViewer(); 8 8 - $id = $request->getURIData('id'); 9 9 - 10 10 - if (!$id) { 11 11 - $id = $request->getInt('revisionID'); 12 12 - } 13 13 - 14 14 - if ($id) { 15 15 - $revision = id(new DifferentialRevisionQuery()) 16 16 - ->setViewer($viewer) 17 17 - ->withIDs(array($id)) 18 18 - ->needRelationships(true) 19 19 - ->needReviewerStatus(true) 20 20 - ->needActiveDiffs(true) 21 21 - ->requireCapabilities( 22 22 - array( 23 23 - PhabricatorPolicyCapability::CAN_VIEW, 24 24 - PhabricatorPolicyCapability::CAN_EDIT, 25 25 - )) 26 26 - ->executeOne(); 27 27 - if (!$revision) { 28 28 - return new Aphront404Response(); 29 29 - } 30 30 - } else { 31 31 - $revision = DifferentialRevision::initializeNewRevision($viewer); 32 32 - $revision->attachReviewerStatus(array()); 33 33 - } 34 34 - 35 35 - $diff_id = $request->getInt('diffID'); 36 36 - if ($diff_id) { 37 37 - $diff = id(new DifferentialDiffQuery()) 38 38 - ->setViewer($viewer) 39 39 - ->withIDs(array($diff_id)) 40 40 - ->executeOne(); 41 41 - if (!$diff) { 42 42 - return new Aphront404Response(); 43 43 - } 44 44 - if ($diff->getRevisionID()) { 45 45 - // TODO: Redirect? 46 46 - throw new Exception( 47 47 - pht('This diff is already attached to a revision!')); 48 48 - } 49 49 - } else { 50 50 - $diff = null; 51 51 - } 52 52 - 53 53 - if (!$diff) { 54 54 - if (!$revision->getID()) { 55 55 - throw new Exception( 56 56 - pht('You can not create a new revision without a diff!')); 57 57 - } 58 58 - } else { 59 59 - // TODO: It would be nice to show the diff being attached in the UI. 60 60 - } 61 61 - 62 62 - $field_list = PhabricatorCustomField::getObjectFields( 63 63 - $revision, 64 64 - PhabricatorCustomField::ROLE_EDIT); 65 65 - $field_list 66 66 - ->setViewer($viewer) 67 67 - ->readFieldsFromStorage($revision); 68 68 - 69 69 - if ($request->getStr('viaDiffView') && $diff) { 70 70 - $repo_key = id(new DifferentialRepositoryField())->getFieldKey(); 71 71 - $repository_field = idx( 72 72 - $field_list->getFields(), 73 73 - $repo_key); 74 74 - if ($repository_field) { 75 75 - $repository_field->setValue($request->getStr($repo_key)); 76 76 - } 77 77 - $view_policy_key = id(new DifferentialViewPolicyField())->getFieldKey(); 78 78 - $view_policy_field = idx( 79 79 - $field_list->getFields(), 80 80 - $view_policy_key); 81 81 - if ($view_policy_field) { 82 82 - $view_policy_field->setValue($diff->getViewPolicy()); 83 83 - } 84 84 - } 85 85 - 86 86 - $validation_exception = null; 87 87 - if ($request->isFormPost() && !$request->getStr('viaDiffView')) { 88 88 - 89 89 - $editor = id(new DifferentialTransactionEditor()) 90 90 - ->setActor($viewer) 91 91 - ->setContentSourceFromRequest($request) 92 92 - ->setContinueOnNoEffect(true); 93 93 - 94 94 - $xactions = $field_list->buildFieldTransactionsFromRequest( 95 95 - new DifferentialTransaction(), 96 96 - $request); 97 97 - 98 98 - if ($diff) { 99 99 - $repository_phid = null; 100 100 - $repository_tokenizer = $request->getArr( 101 101 - id(new DifferentialRepositoryField())->getFieldKey()); 102 102 - if ($repository_tokenizer) { 103 103 - $repository_phid = reset($repository_tokenizer); 104 104 - } 105 105 - 106 106 - $xactions[] = id(new DifferentialTransaction()) 107 107 - ->setTransactionType(DifferentialTransaction::TYPE_UPDATE) 108 108 - ->setNewValue($diff->getPHID()); 109 109 - 110 110 - $editor->setRepositoryPHIDOverride($repository_phid); 111 111 - } 112 112 - 113 113 - $comments = $request->getStr('comments'); 114 114 - if (strlen($comments)) { 115 115 - $xactions[] = id(new DifferentialTransaction()) 116 116 - ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT) 117 117 - ->attachComment( 118 118 - id(new DifferentialTransactionComment()) 119 119 - ->setContent($comments)); 120 120 - } 121 121 - 122 122 - try { 123 123 - $editor->applyTransactions($revision, $xactions); 124 124 - $revision_uri = '/D'.$revision->getID(); 125 125 - return id(new AphrontRedirectResponse())->setURI($revision_uri); 126 126 - } catch (PhabricatorApplicationTransactionValidationException $ex) { 127 127 - $validation_exception = $ex; 128 128 - } 129 129 - } 130 130 - 131 131 - 132 132 - $form = new AphrontFormView(); 133 133 - $form->setUser($request->getUser()); 134 134 - if ($diff) { 135 135 - $form->addHiddenInput('diffID', $diff->getID()); 136 136 - } 137 137 - 138 138 - if ($revision->getID()) { 139 139 - $form->setAction('/differential/revision/edit/'.$revision->getID().'/'); 140 140 - } else { 141 141 - $form->setAction('/differential/revision/edit/'); 142 142 - } 143 143 - 144 144 - if ($diff && $revision->getID()) { 145 145 - $form 146 146 - ->appendChild( 147 147 - id(new AphrontFormTextAreaControl()) 148 148 - ->setLabel(pht('Comments')) 149 149 - ->setName('comments') 150 150 - ->setCaption(pht("Explain what's new in this diff.")) 151 151 - ->setValue($request->getStr('comments'))) 152 152 - ->appendChild( 153 153 - id(new AphrontFormSubmitControl()) 154 154 - ->setValue(pht('Save'))) 155 155 - ->appendChild( 156 156 - id(new AphrontFormDividerControl())); 157 157 - } 158 158 - 159 159 - $field_list->appendFieldsToForm($form); 160 160 - 161 161 - $submit = id(new AphrontFormSubmitControl()) 162 162 - ->setValue('Save'); 163 163 - if ($diff) { 164 164 - $submit->addCancelButton('/differential/diff/'.$diff->getID().'/'); 165 165 - } else { 166 166 - $submit->addCancelButton('/D'.$revision->getID()); 167 167 - } 168 168 - 169 169 - $form->appendChild($submit); 170 170 - 171 171 - $crumbs = $this->buildApplicationCrumbs(); 172 172 - if ($revision->getID()) { 173 173 - if ($diff) { 174 174 - $header_icon = 'fa-upload'; 175 175 - $title = pht('Update Revision'); 176 176 - $crumbs->addTextCrumb( 177 177 - 'D'.$revision->getID(), 178 178 - '/differential/diff/'.$diff->getID().'/'); 179 179 - } else { 180 180 - $header_icon = 'fa-pencil'; 181 181 - $title = pht('Edit Revision: %s', $revision->getTitle()); 182 182 - $crumbs->addTextCrumb( 183 183 - 'D'.$revision->getID(), 184 184 - '/D'.$revision->getID()); 185 185 - } 186 186 - } else { 187 187 - $header_icon = 'fa-plus-square'; 188 188 - $title = pht('Create New Differential Revision'); 189 189 - } 190 190 - 191 191 - $form_box = id(new PHUIObjectBoxView()) 192 192 - ->setHeaderText('Revision') 193 193 - ->setValidationException($validation_exception) 194 194 - ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) 195 195 - ->setForm($form); 196 196 - 197 197 - $crumbs->addTextCrumb($title); 198 198 - $crumbs->setBorder(true); 199 199 - 200 200 - $header = id(new PHUIHeaderView()) 201 201 - ->setHeader($title) 202 202 - ->setHeaderIcon($header_icon); 203 203 - 204 204 - $view = id(new PHUITwoColumnView()) 205 205 - ->setHeader($header) 206 206 - ->setFooter($form_box); 207 207 - 208 208 - return $this->newPage() 209 209 - ->setTitle($title) 210 210 - ->setCrumbs($crumbs) 211 211 - ->appendChild($view); 212 212 - } 213 213 - 214 214 - }

+1 -1

src/applications/differential/controller/DifferentialRevisionViewController.php

reviewed

··· 570 570 $curtain->addAction( 571 571 id(new PhabricatorActionView()) 572 572 ->setIcon('fa-pencil') 573 573 - ->setHref("/differential/revision/edit/{$revision_id}/") 573 573 + ->setHref("/differential/revision/editpro/{$revision_id}/") 574 574 ->setName(pht('Edit Revision')) 575 575 ->setDisabled(!$can_edit) 576 576 ->setWorkflow(!$can_edit));

-4

src/applications/differential/customfield/DifferentialCoreCustomField.php

reviewed

··· 118 118 return true; 119 119 } 120 120 121 121 - public function shouldAppearInEditView() { 122 122 - return true; 123 123 - } 124 124 - 125 121 public function readValueFromObject(PhabricatorCustomFieldInterface $object) { 126 122 if ($this->isCoreFieldRequired()) { 127 123 $this->setFieldError(true);

-4

src/applications/differential/customfield/DifferentialManiphestTasksField.php

reviewed

··· 15 15 return false; 16 16 } 17 17 18 18 - public function shouldAppearInEditView() { 19 19 - return false; 20 20 - } 21 21 - 22 18 public function getFieldName() { 23 19 return pht('Maniphest Tasks'); 24 20 }

-4

src/applications/differential/customfield/DifferentialProjectsField.php

reviewed

··· 19 19 return false; 20 20 } 21 21 22 22 - public function shouldAppearInEditView() { 23 23 - return true; 24 24 - } 25 25 - 26 22 public function shouldAppearInApplicationTransactions() { 27 23 return true; 28 24 }

-4

src/applications/differential/customfield/DifferentialRequiredSignaturesField.php

reviewed

··· 19 19 return true; 20 20 } 21 21 22 22 - public function shouldAppearInEditView() { 23 23 - return false; 24 24 - } 25 25 - 26 22 protected function readValueFromRevision(DifferentialRevision $revision) { 27 23 return self::loadForRevision($revision); 28 24 }

-4

src/applications/differential/customfield/DifferentialReviewedByField.php

reviewed

··· 23 23 return false; 24 24 } 25 25 26 26 - public function shouldAppearInEditView() { 27 27 - return false; 28 28 - } 29 29 - 30 26 public function canDisableField() { 31 27 return true; 32 28 }

+18 -15

src/applications/differential/editor/DifferentialRevisionEditEngine.php

reviewed

··· 95 95 $diff_phid = null; 96 96 } 97 97 98 98 - $is_update = ($diff && $object->getID()); 98 98 + $is_create = $this->getIsCreate(); 99 99 + $is_update = ($diff && !$is_create); 99 100 100 101 $fields = array(); 101 102 102 102 - $fields[] = id(new PhabricatorHandlesEditField()) 103 103 - ->setKey('update') 104 104 - ->setLabel(pht('Update Diff')) 105 105 - ->setDescription(pht('New diff to create or update the revision with.')) 106 106 - ->setConduitDescription(pht('Create or update a revision with a diff.')) 107 107 - ->setConduitTypeDescription(pht('PHID of the diff.')) 108 108 - ->setTransactionType(DifferentialTransaction::TYPE_UPDATE) 109 109 - ->setHandleParameterType(new AphrontPHIDListHTTPParameterType()) 110 110 - ->setSingleValue($diff_phid) 111 111 - ->setIsReorderable(false) 112 112 - ->setIsDefaultable(false) 113 113 - ->setIsInvisible(true) 114 114 - ->setIsLockable(false); 103 103 + if ($diff || $is_create) { 104 104 + $fields[] = id(new PhabricatorHandlesEditField()) 105 105 + ->setKey('update') 106 106 + ->setLabel(pht('Update Diff')) 107 107 + ->setDescription(pht('New diff to create or update the revision with.')) 108 108 + ->setConduitDescription(pht('Create or update a revision with a diff.')) 109 109 + ->setConduitTypeDescription(pht('PHID of the diff.')) 110 110 + ->setTransactionType(DifferentialTransaction::TYPE_UPDATE) 111 111 + ->setHandleParameterType(new AphrontPHIDListHTTPParameterType()) 112 112 + ->setSingleValue($diff_phid) 113 113 + ->setIsReorderable(false) 114 114 + ->setIsDefaultable(false) 115 115 + ->setIsInvisible(true) 116 116 + ->setIsLockable(false); 117 117 + } 115 118 116 119 if ($is_update) { 117 120 $fields[] = id(new PhabricatorInstructionsEditField()) ··· 194 197 private function isCustomFieldEnabled(DifferentialRevision $revision, $key) { 195 198 $field_list = PhabricatorCustomField::getObjectFields( 196 199 $revision, 197 197 - PhabricatorCustomField::ROLE_EDIT); 200 200 + PhabricatorCustomField::ROLE_VIEW); 198 201 199 202 $fields = $field_list->getFields(); 200 203 return isset($fields[$key]);

+1

src/applications/differential/storage/DifferentialRevision.php

reviewed

··· 70 70 ->setAuthorPHID($actor->getPHID()) 71 71 ->attachRelationships(array()) 72 72 ->attachRepository(null) 73 73 + ->attachReviewerStatus(array()) 73 74 ->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW); 74 75 } 75 76

+5 -6

src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php

reviewed

··· 47 47 } 48 48 49 49 protected function newEditType() { 50 50 + $type = id(new PhabricatorCustomFieldEditType()) 51 51 + ->setCustomField($this->getCustomField()); 52 52 + 50 53 $conduit_type = $this->newConduitParameterType(); 51 51 - if (!$conduit_type) { 52 52 - return null; 54 54 + if ($conduit_type) { 55 55 + $type->setConduitParameterType($conduit_type); 53 56 } 54 54 - 55 55 - $type = id(new PhabricatorCustomFieldEditType()) 56 56 - ->setCustomField($this->getCustomField()) 57 57 - ->setConduitParameterType($conduit_type); 58 57 59 58 return $type; 60 59 }

-6

src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php

reviewed

··· 27 27 PhabricatorEditEngine $engine, 28 28 PhabricatorApplicationTransactionInterface $object) { 29 29 30 30 - // TODO: Remove this hack once Differential modernizes more fully. Today, 31 31 - // its custom fields are too custom to interact cleanly with EditEngine. 32 32 - if ($object instanceof DifferentialRevision) { 33 33 - return array(); 34 34 - } 35 35 - 36 30 $viewer = $this->getViewer(); 37 31 38 32 $field_list = PhabricatorCustomField::getObjectFields(