Page MenuHomePhabricator
Files F15398727

D10872.id26110.diff
No OneTemporary
Actions

D10872.id26110.diff
View Options

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
@@ -7,12 +7,18 @@
$request = $this->getRequest();
$diff = null;
+ $repository_phid = null;
+ $repository_value = array();
$errors = array();
$e_diff = null;
$e_file = null;
$validation_exception = null;
if ($request->isFormPost()) {
+ $repository_tokenizer = $request->getArr(
+ id(new DifferentialRepositoryField())->getFieldKey());
+ $repository_phid = reset($repository_tokenizer);
+
if ($request->getFileExists('diff-file')) {
$diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
} else {
@@ -33,7 +39,7 @@
'differential.createrawdiff',
array(
'diff' => $diff,
- ));
+ 'repositoryPHID' => $repository_phid,));
$call->setUser($request->getUser());
$result = $call->execute();
$path = id(new PhutilURI($result['uri']))->getPath();
@@ -56,6 +62,10 @@
$cancel_uri = $this->getApplicationURI();
+ if ($repository_phid) {
+ $repository_value = $this->loadViewerHandles($repository_phid);
+ }
+
$form
->setAction('/differential/diff/create/')
->setEncType('multipart/form-data')
@@ -82,6 +92,13 @@
->setName('diff-file')
->setError($e_file))
->appendChild(
+ id(new AphrontFormTokenizerControl())
+ ->setName(id(new DifferentialRepositoryField())->getFieldKey())
+ ->setLabel(pht('Repository'))
+ ->setDatasource(new DiffusionRepositoryDatasource())
+ ->setValue($repository_value)
+ ->setLimit(1))
+ ->appendChild(
id(new AphrontFormSubmitControl())
->addCancelButton($cancel_uri)
->setValue(pht('Create Diff')));
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
@@ -80,6 +80,9 @@
->setAction('/differential/revision/edit/')
->addHiddenInput('diffID', $diff->getID())
->addHiddenInput('viaDiffView', 1)
+ ->addHiddenInput(
+ id(new DifferentialRepositoryField())->getFieldKey(),
+ $diff->getRepositoryPHID())
->appendRemarkupInstructions(
pht(
'Review the diff for correctness. When you are satisfied, either '.
diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
--- a/src/applications/differential/controller/DifferentialRevisionEditController.php
+++ b/src/applications/differential/controller/DifferentialRevisionEditController.php
@@ -71,6 +71,16 @@
->setViewer($viewer)
->readFieldsFromStorage($revision);
+ if ($request->getStr('viaDiffView') && $diff) {
+ $repo_key = id(new DifferentialRepositoryField())->getFieldKey();
+ $repository_field = idx(
+ $field_list->getFields(),
+ $repo_key);
+ if ($repository_field) {
+ $repository_field->setValue($request->getStr($repo_key));
+ }
+ }
+
$validation_exception = null;
if ($request->isFormPost() && !$request->getStr('viaDiffView')) {
$xactions = $field_list->buildFieldTransactionsFromRequest(
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -205,7 +205,9 @@
$diff = $this->requireDiff($xaction->getNewValue());
$object->setLineCount($diff->getLineCount());
- $object->setRepositoryPHID($diff->getRepositoryPHID());
+ if (!$this->getIsNewObject() || !$object->getRepositoryPHID()) {
+ $object->setRepositoryPHID($diff->getRepositoryPHID());
+ }
$object->setArcanistProjectPHID($diff->getArcanistProjectPHID());
$object->attachActiveDiff($diff);

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 18, 1:24 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7383774
Default Alt Text
D10872.id26110.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility