Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13973909
D11646.id28025.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D11646.id28025.diff
View Options
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
Details
Attached
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)
Attached To
Mode
D11646: Clean up a ConduitException around Diffusion merges
Attached
Detach File
Event Timeline
Log In to Comment