revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 21:02:41 +01:00
Code Issues Releases Wiki Activity

Fix an issue with incorrect split head detection in Mercurial after pushing a medley of varied changes

Browse source 
Summary:
Fixes T10665. See that task for discussion.

Because `$head_map` is not properly re-initialized for each ref we check, pushes which affect multiple branches (say, "A" and "B") can have information bleed from the first branch check to the second branch.

To trigger a problem behavior, you can push one commit which updates an existing branch, plus one commit which creates a new branch. If they process in the right order, the `$head_map` from the updated branch will bleed into the `$head_map` for the new branch and trigger an incorrect head split detection.

Test Plan:
  - Pushed a set of changes which updated `branch-a` and created `branch-b`.
    - Before change: improper detection of split heads.
    - After change: clean push.
  - Pushed a set of changes which split the head of `branch-d`.
    - Correct detection of split heads.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10665

Differential Revision: https://secure.phabricator.com/D15522
This commit is contained in:
epriestley 2016-03-25 05:05:08 -07:00
parent 3493d9d513
commit 4dc857e36d
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/applications/diffusion/engine/DiffusionCommitHookEngine.php
View file

@ -770,10 +770,10 @@ final class DiffusionCommitHookEngine extends Phobject {
} }
$stray_heads = array(); $stray_heads = array();
$head_map = array();
if ($old_heads && !$new_heads) { if ($old_heads && !$new_heads) {
// This is a branch deletion with "--close-branch". // This is a branch deletion with "--close-branch".
$head_map = array();
foreach ($old_heads as $old_head) { foreach ($old_heads as $old_head) {
$head_map[$old_head] = array(self::EMPTY_HASH); $head_map[$old_head] = array(self::EMPTY_HASH);
} }
@ -798,7 +798,6 @@ final class DiffusionCommitHookEngine extends Phobject {
'{node}\1'); '{node}\1');
} }
$head_map = array();
foreach (new FutureIterator($dfutures) as $future_head => $dfuture) { foreach (new FutureIterator($dfutures) as $future_head => $dfuture) {
list($stdout) = $dfuture->resolvex(); list($stdout) = $dfuture->resolvex();
$descendant_heads = array_filter(explode("\1", $stdout)); $descendant_heads = array_filter(explode("\1", $stdout));