Page MenuHomePhabricator

D11646.id28025.diff
No OneTemporary

D11646.id28025.diff

diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -873,22 +873,24 @@
private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
$drequest = $this->getDiffusionRequest();
- $limit = 50;
+ $repository = $drequest->getRepository();
- $merges = array();
- try {
- $merges = $this->callConduitWithDiffusionRequest(
- 'diffusion.mergedcommitsquery',
- array(
- 'commit' => $drequest->getCommit(),
- 'limit' => $limit + 1,
- ));
- } catch (ConduitException $ex) {
- if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
- throw $ex;
- }
+ $vcs = $repository->getVersionControlSystem();
+ switch ($vcs) {
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
+ // These aren't supported under SVN.
+ return null;
}
+ $limit = 50;
+
+ $merges = $this->callConduitWithDiffusionRequest(
+ 'diffusion.mergedcommitsquery',
+ array(
+ 'commit' => $drequest->getCommit(),
+ 'limit' => $limit + 1,
+ ));
+
if (!$merges) {
return null;
}

File Metadata

Mime Type
text/plain
Expires
Oct 19 2024, 3:14 AM (4 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6725729
Default Alt Text
D11646.id28025.diff (1 KB)

Event Timeline