Page MenuHomePhabricator
Files F15370026

D11665.diff
No OneTemporary
Actions

D11665.diff
View Options

diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -2173,10 +2173,11 @@
private function loadActiveLocalCommitInfo() {
$current_diff = $this->getConduit()->callMethodSynchronous(
- 'differential.getdiff',
+ 'differential.querydiffs',
array(
- 'revision_id' => $this->revisionID,
+ 'revisionIDs' => array($this->revisionID),
));
+ $current_diff = head($current_diff);
$properties = idx($current_diff, 'properties', array());
return idx($properties, 'local:commits', array());
diff --git a/src/workflow/ArcanistFeatureWorkflow.php b/src/workflow/ArcanistFeatureWorkflow.php
--- a/src/workflow/ArcanistFeatureWorkflow.php
+++ b/src/workflow/ArcanistFeatureWorkflow.php
@@ -124,10 +124,11 @@
if (preg_match('/^D(\d+)$/', $name, $match)) {
try {
$diff = $this->getConduit()->callMethodSynchronous(
- 'differential.getdiff',
+ 'differential.querydiffs',
array(
- 'revision_id' => $match[1],
+ 'revisionIDs' => array($match[1]),
));
+ $diff = head($diff);
if ($diff['branch'] != '') {
$name = $diff['branch'];
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -1064,7 +1064,7 @@
return $this->loadBundleFromConduit(
$conduit,
array(
- 'diff_id' => $diff_id,
+ 'ids' => array($diff_id),
));
}
@@ -1075,7 +1075,7 @@
return $this->loadBundleFromConduit(
$conduit,
array(
- 'revision_id' => $revision_id,
+ 'revisionIDs' => array($revision_id),
));
}
@@ -1083,8 +1083,8 @@
ConduitClient $conduit,
$params) {
- $future = $conduit->callMethod('differential.getdiff', $params);
- $diff = $future->resolve();
+ $future = $conduit->callMethod('differential.querydiffs', $params);
+ $diff = head($future->resolve());
$changes = array();
foreach ($diff['changes'] as $changedict) {

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 9:01 AM (4 w, 2 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7613728
Default Alt Text
D11665.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility