Mercurial > hg
view contrib/phab-refresh-stack.sh @ 50393:f95ab2c53303
outgoing: fix common-heads computation from `missingroots` argument
When initializing a `outgoing` object, the `common set` can be defined explicitly (with the `commonheads` argument`) or implicitly (with the missingroots arguments).
It turns out the logic to compute `commonheads` from `missingroots` is buggy, as it does not consider the parents of enough changesets. Previously, it only considered parents of "missingroots` items, while it need to consider all parents of missing. Here is an example:
F
|\
C E
| |
B D
|/
A
If we use [E] as missing-roots, the missing set is [E, F], and the common-heads
are [C, D]. However you cannot only consider the parent of [E] to find them, as
[C] is not a parent of [E].
This already fix the bundle generated in one test, and it would prevent many
other to misbehave with future change from this series.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 10 Mar 2023 04:04:10 +0100 |
parents | fba2d7fab11e |
children |
line wrap: on
line source
#!/bin/bash set -eu if [[ "$PHABRICATOR_TOKEN" == "NO-PHAB" ]]; then echo 'Skipping Phabricator Step' >&2 exit 0 fi revision_in_stack=`hg log \ --rev '.#stack and ::. and topic()' \ -T '\nONE-REV\n' \ | grep 'ONE-REV' | wc -l` revision_on_phab=`hg log \ --rev '.#stack and ::. and topic() and desc("re:\nDifferential Revision: [^\n]+D\d+$")'\ -T '\nONE-REV\n' \ | grep 'ONE-REV' | wc -l` if [[ $revision_in_stack -eq 0 ]]; then echo "stack is empty" >&2 exit 0 fi if [[ $revision_on_phab -eq 0 ]]; then echo "no tracked diff in this stack" >&2 exit 0 fi if [[ $revision_on_phab -lt $revision_in_stack ]]; then echo "not all stack changesets (${revision_in_stack}) have matching Phabricator Diff (${revision_on_phab})" >&2 exit 2 fi if [[ "$PHABRICATOR_TOKEN" == "" ]]; then echo 'missing $PHABRICATOR_TOKEN variable' >&2 echo '(use PHABRICATOR_TOKEN="NO-PHAB" to disable this step)' >&2 exit 2 fi hg \ --config extensions.phabricator= \ --config phabricator.url=https://phab.mercurial-scm.org/ \ --config phabricator.callsign=HG \ --config auth.phabricator.schemes=https \ --config auth.phabricator.prefix=phab.mercurial-scm.org \ --config auth.phabricator.phabtoken=$PHABRICATOR_TOKEN \ phabsend --rev '.#stack and ::. and topic()' \ "$@"