From 964260b1e08c0f6f0e341abca24634e6f9fea155 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 20 Feb 2012 12:51:08 -0800
Subject: [PATCH] Use "differential.query", not "differential.find", in "arc
 branch"

Summary: find is deprecated, query is new hotness.

Test Plan: Ran "arc branch", got identical output.

Reviewers: nh, btrahan

Reviewed By: btrahan

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1646
---
 src/workflow/branch/ArcanistBranchWorkflow.php | 14 ++++----------
 src/workflow/branch/__init__.php               |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/workflow/branch/ArcanistBranchWorkflow.php b/src/workflow/branch/ArcanistBranchWorkflow.php
index cc56998e..e46306be 100644
--- a/src/workflow/branch/ArcanistBranchWorkflow.php
+++ b/src/workflow/branch/ArcanistBranchWorkflow.php
@@ -104,18 +104,12 @@ EOTEXT
    */
   private function loadDifferentialStatuses($rev_ids) {
     $conduit = $this->getConduit();
-    $revision_future = $conduit->callMethod(
-      'differential.find',
+    $revisions = $conduit->callMethodSynchronous(
+      'differential.query',
       array(
-        'guids' => $rev_ids,
-        'query' => 'revision-ids',
+        'ids'   => $rev_ids,
       ));
-    $revisions = array();
-    foreach ($revision_future->resolve() as $revision_dict) {
-      $revisions[] = ArcanistDifferentialRevisionRef::newFromDictionary(
-        $revision_dict);
-    }
-    $statuses = mpull($revisions, 'getStatusName', 'getId');
+    $statuses = ipull($revisions, 'statusName', 'id');
     return $statuses;
   }
 
diff --git a/src/workflow/branch/__init__.php b/src/workflow/branch/__init__.php
index d482a62e..c863211d 100644
--- a/src/workflow/branch/__init__.php
+++ b/src/workflow/branch/__init__.php
@@ -7,7 +7,6 @@
 
 
 phutil_require_module('arcanist', 'branch');
-phutil_require_module('arcanist', 'differential/revision');
 phutil_require_module('arcanist', 'exception/usage');
 phutil_require_module('arcanist', 'workflow/base');