mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-29 02:02:41 +01:00
Add a "differential.createrawdiff" Conduit method
Summary: "differential.creatediff" requires a mostly-parsed diff, but there's no reason we can't make DifferentialDiffs out of raw diffs. This mainly serves to lower the adoption barrier if getting "arc" distributed is too much of a hassle. Test Plan: Made a diff out of a raw block of diff text. Reviewers: ffx, vrana, btrahan Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D2751
This commit is contained in:
parent
921b5dada1
commit
a4e2eb3d8c
4 changed files with 109 additions and 11 deletions
|
@ -130,9 +130,11 @@ phutil_register_library_map(array(
|
||||||
'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php',
|
'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php',
|
||||||
'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php',
|
'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php',
|
||||||
'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php',
|
'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php',
|
||||||
|
'ConduitAPI_differential_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_Method.php',
|
||||||
'ConduitAPI_differential_close_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_close_Method.php',
|
'ConduitAPI_differential_close_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_close_Method.php',
|
||||||
'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php',
|
'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php',
|
||||||
'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php',
|
'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php',
|
||||||
|
'ConduitAPI_differential_createrawdiff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrawdiff_Method.php',
|
||||||
'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php',
|
'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php',
|
||||||
'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_find_Method.php',
|
'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_find_Method.php',
|
||||||
'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php',
|
'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php',
|
||||||
|
@ -1195,9 +1197,11 @@ phutil_register_library_map(array(
|
||||||
'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_daemon_launched_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_daemon_launched_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_daemon_log_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_daemon_log_Method' => 'ConduitAPIMethod',
|
||||||
|
'ConduitAPI_differential_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_differential_close_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_close_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
|
||||||
|
'ConduitAPI_differential_createrawdiff_Method' => 'ConduitAPI_differential_Method',
|
||||||
'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
|
||||||
'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPIMethod',
|
'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPIMethod',
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Facebook, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group conduit
|
||||||
|
*/
|
||||||
|
abstract class ConduitAPI_differential_Method extends ConduitAPIMethod {
|
||||||
|
|
||||||
|
protected function buildDiffInfoDictionary(DifferentialDiff $diff) {
|
||||||
|
$uri = '/differential/diff/'.$diff->getID().'/';
|
||||||
|
$uri = PhabricatorEnv::getProductionURI($uri);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'id' => $diff->getID(),
|
||||||
|
'uri' => $uri,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,61 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Facebook, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group conduit
|
||||||
|
*/
|
||||||
|
final class ConduitAPI_differential_createrawdiff_Method
|
||||||
|
extends ConduitAPI_differential_Method {
|
||||||
|
|
||||||
|
public function getMethodDescription() {
|
||||||
|
return "Create a new Differential diff from a raw diff source.";
|
||||||
|
}
|
||||||
|
|
||||||
|
public function defineParamTypes() {
|
||||||
|
return array(
|
||||||
|
'diff' => 'required string',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function defineReturnType() {
|
||||||
|
return 'nonempty dict';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function defineErrorTypes() {
|
||||||
|
return array(
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(ConduitAPIRequest $request) {
|
||||||
|
$raw_diff = $request->getValue('diff');
|
||||||
|
|
||||||
|
$parser = new ArcanistDiffParser();
|
||||||
|
$changes = $parser->parseDiff($raw_diff);
|
||||||
|
$diff = DifferentialDiff::newFromRawChanges($changes);
|
||||||
|
|
||||||
|
$diff->setLintStatus(DifferentialLintStatus::LINT_SKIP);
|
||||||
|
$diff->setUnitStatus(DifferentialLintStatus::LINT_SKIP);
|
||||||
|
|
||||||
|
$diff->setAuthorPHID($request->getUser()->getPHID());
|
||||||
|
$diff->setCreationMethod('web');
|
||||||
|
$diff->save();
|
||||||
|
|
||||||
|
return $this->buildDiffInfoDictionary($diff);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -23,25 +23,23 @@ final class DifferentialDiffCreateController extends DifferentialController {
|
||||||
$request = $this->getRequest();
|
$request = $this->getRequest();
|
||||||
|
|
||||||
if ($request->isFormPost()) {
|
if ($request->isFormPost()) {
|
||||||
$parser = new ArcanistDiffParser();
|
|
||||||
$diff = null;
|
$diff = null;
|
||||||
try {
|
try {
|
||||||
$diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
|
$diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
|
||||||
} catch (Exception $ex) {
|
} catch (Exception $ex) {
|
||||||
$diff = $request->getStr('diff');
|
$diff = $request->getStr('diff');
|
||||||
}
|
}
|
||||||
$changes = $parser->parseDiff($diff);
|
|
||||||
$diff = DifferentialDiff::newFromRawChanges($changes);
|
|
||||||
|
|
||||||
$diff->setLintStatus(DifferentialLintStatus::LINT_SKIP);
|
$call = new ConduitCall(
|
||||||
$diff->setUnitStatus(DifferentialLintStatus::LINT_SKIP);
|
'differential.createrawdiff',
|
||||||
|
array(
|
||||||
|
'diff' => $diff,
|
||||||
|
));
|
||||||
|
$call->setUser($request->getUser());
|
||||||
|
$result = $call->execute();
|
||||||
|
|
||||||
$diff->setAuthorPHID($request->getUser()->getPHID());
|
$path = id(new PhutilURI($result['uri']))->getPath();
|
||||||
$diff->setCreationMethod('web');
|
return id(new AphrontRedirectResponse())->setURI($path);
|
||||||
$diff->save();
|
|
||||||
|
|
||||||
return id(new AphrontRedirectResponse())
|
|
||||||
->setURI('/differential/diff/'.$diff->getID().'/');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$form = new AphrontFormView();
|
$form = new AphrontFormView();
|
||||||
|
|
Loading…
Reference in a new issue