Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15432489
D9308.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1011 B
Referenced Files
None
Subscribers
None
D9308.id.diff
View Options
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -760,10 +760,15 @@
// repository that's already full of garbage (strongly discouraged but
// not as inherently dangerous). These cases should be very uncommon.
+ // NOTE: We're only looking for heads on the same branch. The old
+ // tip of the branch may be the branchpoint for other branches, but that
+ // is OK.
+
$dfutures = array();
foreach ($old_heads as $old_head) {
$dfutures[$old_head] = $repository->getLocalCommandFuture(
- 'log --rev %s --template %s',
+ 'log --branch %s --rev %s --template %s',
+ $ref,
hgsprintf('(descendants(%s) and head())', $old_head),
'{node}\1');
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Mar 25, 6:17 PM (5 d, 10 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7469620
Default Alt Text
D9308.id.diff (1011 B)
Attached To
Mode
D9308: Fix a Mercurial issue where split heads would be detected incorrectly
Attached
Detach File
Event Timeline
Log In to Comment