view contrib/merge-test-compat.sh @ 5780:e117cf7401db

doc: switch rst `=` section underlines to `-` When using GENDOC_LOAD_CONFIGURED_EXTENSIONS=1, Mercurial's doc/gendoc.py can load extensions from outside of just the hgext directory, and pull in this doc. When added to the documentation, this should be nested inside of the following extension hierarchy: - Extensions - evolve The generated documentation has an established hierarchy of section headers, and the above uses `"` for top level, and `=` for each extension. Since gendoc just pastes it in verbatim, with `=` underlines, we get "Obsolescence Markers Discovery", "Effect Flag Experiment", and "Template keywords" as siblings to the evolve extension, instead of nested inside of it. This is not required for the string below it (that shows up with `hg help evolution`), as that is one level higher in the hierarchy (not nested inside of an "Extensions" section), so `=` is appropriate there.
author Kyle Lippincott <spectral@google.com>
date Wed, 17 Feb 2021 14:00:43 -0800
parents 17fac26833da
children
line wrap: on
line source

#!/bin/bash
set -euox pipefail

unset GREP_OPTIONS

compatbranches=$(hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse)
prev='stable'
topic=${1:-'test-compat'}
for branch in $compatbranches; do
    # Logic in the revsets below:
    # 1. There is target topic on stable or compatibility branch: merge all
    # those commits, they are related to our work and need to pass tests on all
    # compatibility branches.
    # 2. There is no target topic: avoid any commits that have topic set, they
    # are definitely unrelated to what we're doing.
    # In other words, if you want to test certain commits, assign them all to
    # one topic and provide that topic as the first argument to this script.
    uptarget="first(max(branch('$branch') and topic('$topic')) or max(branch('$branch') and not topic()))"
    hg up -r "$uptarget"
    hg topic "$topic"
    mergetarget="first(max(branch('$prev') and topic('$topic')) or max(branch('$prev') and not topic()))"
    hg merge -r "$mergetarget"
    hg commit -m "test-compat: merge $prev into $branch"
    prev=$branch
done