Page MenuHomePhabricator
Files F14001170

D11477.diff
No OneTemporary
Actions

D11477.diff
View Options

diff --git a/src/applications/diffusion/DiffusionLintSaveRunner.php b/src/applications/diffusion/DiffusionLintSaveRunner.php
--- a/src/applications/diffusion/DiffusionLintSaveRunner.php
+++ b/src/applications/diffusion/DiffusionLintSaveRunner.php
@@ -236,7 +236,6 @@
foreach ($this->blame as $path => $lines) {
$drequest = DiffusionRequest::newFromDictionary(array(
'user' => PhabricatorUser::getOmnipotentUser(),
- 'initFromConduit' => false,
'repository' => $repository,
'branch' => $this->branch->getName(),
'path' => $path,
diff --git a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
@@ -102,7 +102,6 @@
'branch' => $request->getValue('branch'),
'path' => $request->getValue('path'),
'commit' => $request->getValue('commit'),
- 'initFromConduit' => false,
));
// Figure out whether we're going to handle this request on this device,
diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
--- a/src/applications/diffusion/request/DiffusionRequest.php
+++ b/src/applications/diffusion/request/DiffusionRequest.php
@@ -215,10 +215,6 @@
$this->didInitialize();
}
- final protected function shouldInitFromConduit() {
- return $this->initFromConduit;
- }
-
final public function setUser(PhabricatorUser $user) {
$this->user = $user;
return $this;
@@ -767,20 +763,13 @@
// If we couldn't pull everything out of the cache, execute the underlying
// VCS operation.
if ($refs) {
- if ($this->shouldInitFromConduit()) {
- $vcs_results = DiffusionQuery::callConduitWithDiffusionRequest(
- $this->getUser(),
- $this,
- 'diffusion.resolverefs',
- array(
- 'refs' => $refs,
- ));
- } else {
- $vcs_results = id(new DiffusionLowLevelResolveRefsQuery())
- ->setRepository($this->getRepository())
- ->withRefs($refs)
- ->execute();
- }
+ $vcs_results = DiffusionQuery::callConduitWithDiffusionRequest(
+ $this->getUser(),
+ $this,
+ 'diffusion.resolverefs',
+ array(
+ 'refs' => $refs,
+ ));
} else {
$vcs_results = array();
}
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
@@ -100,7 +100,6 @@
$drequest = DiffusionRequest::newFromDictionary(
array(
'user' => PhabricatorUser::getOmnipotentUser(),
- 'initFromConduit' => false,
'repository' => $repository,
'commit' => $commit->getCommitIdentifier(),
));
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
@@ -87,7 +87,6 @@
id(new PhabricatorRepository())->load($commit->getRepositoryID());
$data = array(
'user' => PhabricatorUser::getOmnipotentUser(),
- 'initFromConduit' => false,
'repository' => $repository,
'commit' => $commit->getCommitIdentifier(),
);
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -375,7 +375,6 @@
}
$drequest = DiffusionRequest::newFromDictionary(array(
'user' => PhabricatorUser::getOmnipotentUser(),
- 'initFromConduit' => false,
'repository' => $this->repository,
'commit' => $this->commit->getCommitIdentifier(),
'path' => $path,

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 26, 4:47 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6706638
Default Alt Text
D11477.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility