Page MenuHomePhabricator
Files F15398156

D8768.id.diff
No OneTemporary
Actions

D8768.id.diff
View Options

diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -33,6 +33,7 @@
$diffs = id(new DifferentialDiffQuery())
->setViewer($request->getUser())
->withRevisionIDs(array($this->revisionID))
+ ->needArcanistProjects(true)
->execute();
$diffs = array_reverse($diffs, $preserve_keys = true);
@@ -61,8 +62,18 @@
$diff_vs = null;
}
- $arc_project = $target->loadArcanistProject();
- $repository = ($arc_project ? $arc_project->loadRepository() : null);
+ $repository = null;
+ $repository_phid = $target->getRepositoryPHID();
+ if ($repository_phid) {
+ if ($repository_phid == $revision->getRepositoryPHID()) {
+ $repository = $revision->getRepository();
+ } else {
+ $repository = id(new PhabricatorRepositoryQuery())
+ ->setViewer($user)
+ ->withPHIDs(array($repository_phid))
+ ->executeOne();
+ }
+ }
list($changesets, $vs_map, $vs_changesets, $rendering_references) =
$this->loadChangesetsAndVsMap(
@@ -219,6 +230,7 @@
'whitespace',
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL);
+ $arc_project = $target->getArcanistProject();
if ($arc_project) {
list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
$arc_project,
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -95,27 +95,6 @@
return $name;
}
- public function loadArcanistProject() {
- if (!$this->getArcanistProjectPHID()) {
- return null;
- }
- return id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
- 'phid = %s',
- $this->getArcanistProjectPHID());
- }
-
- public function getBackingVersionControlSystem() {
- $arcanist_project = $this->loadArcanistProject();
- if (!$arcanist_project) {
- return null;
- }
- $repository = $arcanist_project->loadRepository();
- if (!$repository) {
- return null;
- }
- return $repository->getVersionControlSystem();
- }
-
public function save() {
$this->openTransaction();
$ret = parent::save();
diff --git a/src/applications/releeph/controller/project/ReleephProductEditController.php b/src/applications/releeph/controller/project/ReleephProductEditController.php
--- a/src/applications/releeph/controller/project/ReleephProductEditController.php
+++ b/src/applications/releeph/controller/project/ReleephProductEditController.php
@@ -15,6 +15,7 @@
$product = id(new ReleephProjectQuery())
->setViewer($viewer)
->withIDs(array($this->productID))
+ ->needArcanistProjects(true)
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
@@ -145,7 +146,7 @@
id(new AphrontFormStaticControl())
->setLabel(pht('Arc Project'))
->setValue(
- $product->loadArcanistProject()->getName()))
+ $product->getArcanistProject()->getName()))
->appendChild(
id(new AphrontFormStaticControl())
->setLabel(pht('Releeph Project PHID'))
diff --git a/src/applications/releeph/controller/project/ReleephProductListController.php b/src/applications/releeph/controller/project/ReleephProductListController.php
--- a/src/applications/releeph/controller/project/ReleephProductListController.php
+++ b/src/applications/releeph/controller/project/ReleephProductListController.php
@@ -53,7 +53,7 @@
),
'r'.$repo->getCallsign()));
- $arc = $product->loadArcanistProject();
+ $arc = $product->getArcanistProject();
if ($arc) {
$item->addAttribute($arc->getName());
}
diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php
--- a/src/applications/releeph/query/ReleephProductSearchEngine.php
+++ b/src/applications/releeph/query/ReleephProductSearchEngine.php
@@ -13,7 +13,8 @@
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new ReleephProjectQuery())
- ->setOrder(ReleephProjectQuery::ORDER_NAME);
+ ->setOrder(ReleephProjectQuery::ORDER_NAME)
+ ->needArcanistProjects(true);
$active = $saved->getParameter('active');
$value = idx($this->getActiveValues(), $active);
diff --git a/src/applications/releeph/query/ReleephProjectQuery.php b/src/applications/releeph/query/ReleephProjectQuery.php
--- a/src/applications/releeph/query/ReleephProjectQuery.php
+++ b/src/applications/releeph/query/ReleephProjectQuery.php
@@ -8,6 +8,7 @@
private $phids;
private $needRepositories;
+ private $needArcanistProjects;
private $order = 'order-id';
const ORDER_ID = 'order-id';
@@ -33,6 +34,11 @@
return $this;
}
+ public function needArcanistProjects($need) {
+ $this->needArcanistProjects = $need;
+ return $this;
+ }
+
public function loadPage() {
$table = new ReleephProject();
$conn_r = $table->establishConnection('r');
@@ -71,6 +77,29 @@
return $projects;
}
+ public function didFilterPage(array $products) {
+
+ if ($this->needArcanistProjects) {
+ $project_ids = array_filter(mpull($products, 'getArcanistProjectID'));
+ if ($project_ids) {
+ $projects = id(new PhabricatorRepositoryArcanistProject())
+ ->loadAllWhere('id IN (%Ld)', $project_ids);
+ $projects = mpull($projects, null, 'getID');
+ } else {
+ $projects = array();
+ }
+
+ foreach ($products as $product) {
+ $project_id = $product->getArcanistProjectID();
+ $project = idx($projects, $project_id);
+ $product->attachArcanistProject($project);
+ }
+ }
+
+ return $products;
+ }
+
+
private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
$where = array();
diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php
--- a/src/applications/releeph/storage/ReleephProject.php
+++ b/src/applications/releeph/storage/ReleephProject.php
@@ -21,6 +21,7 @@
protected $details = array();
private $repository = self::ATTACHABLE;
+ private $arcanistProject = self::ATTACHABLE;
public function getConfiguration() {
return array(
@@ -53,11 +54,14 @@
return $this;
}
- public function loadArcanistProject() {
- return $this->loadOneRelative(
- new PhabricatorRepositoryArcanistProject(),
- 'id',
- 'getArcanistProjectID');
+ public function getArcanistProject() {
+ return $this->assertAttached($this->arcanistProject);
+ }
+
+ public function attachArcanistProject(
+ PhabricatorRepositoryArcanistProject $arcanist_project = null) {
+ $this->arcanistProject = $arcanist_project;
+ return $this;
}
public function getPushers() {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 11:31 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7664286
Default Alt Text
D8768.id.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility