Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15413990
D12590.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
D12590.diff
View Options
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
@@ -204,6 +204,10 @@
// unclear how to best do that. For now, treat it as a miss instead.
continue;
}
+ if (preg_match('/unknown revision/', $ex->getStdErr())) {
+ // No matches for this ref.
+ continue;
+ }
throw $ex;
}
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
@@ -755,7 +755,12 @@
public function getRefAlternatives() {
// Make sure we've resolved the reference into a stable commit first.
- $this->getStableCommit();
+ try {
+ $this->getStableCommit();
+ } catch (DiffusionRefNotFoundException $ex) {
+ // If we have a bad reference, just return the empty set of
+ // alternatives.
+ }
return $this->refAlternatives;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 20, 10:22 PM (5 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7703455
Default Alt Text
D12590.diff (1 KB)
Attached To
Mode
D12590: Improve handling of bad branches in Diffusion
Attached
Detach File
Event Timeline
Log In to Comment