Differential D5801 Diff 19009 contrib/source-control-tools/land-patch.sh

Changeset View

Standalone View

contrib/source-control-tools/land-patch.sh

This file was added.

Property	Old Value	New Value
File Mode	null	100755

				#!/usr/bin/env bash
				# Copyright (c) 2020 The Bitcoin developers
				# Distributed under the MIT software license, see the accompanying
				# file COPYING or http://www.opensource.org/licenses/mit-license.php.

				export LC_ALL=C.UTF-8

				set -euxo pipefail

				help_message() {
				cat <<EOF
				Usage:
				$0 [options]
				Push a commit after running any necessary auto-gen scripts and sanity checks.

				By default, the local commit(s) on master will be pushed (not yet supported).

				Options:
				-d, --dry-run Dry run. Does everything but actually landing the change.
				-h, --help Display this help message.
				-r, --revision Land a Differential patch instead of a local commit. This is the revision ID
				used in Phabricator that you want to land. (ex: D1234)

				Environment Variables:
				CONDUIT_TOKEN Conduit token to use when landing the patch. This allows landing a patch as
				a particular Phabricator user. This must be set if -r\|--revision is set.
				EOF
				}

				ARC_LAND_ARGS=()
				REVISION=""

				# Parse command line arguments
				while [[ $# -gt 0 ]]; do
				case $1 in
				-d\|--dry-run)
				ARC_LAND_ARGS+=("--hold")
				shift # shift past argument
				;;
				-h\|--help)
				help_message
				exit 0
				;;
				-r\|--revision)
				REVISION="$2"
				shift # shift past argument
				shift # shift past value
				;;
				*)
				echo "Error: Unrecognized argument: '$1'"
				help_message
				exit 1
				;;
				esac
				done

				# Temporarily stop verbose logging to prevent leaking CONDUIT_TOKEN
				set +x
				: "${CONDUIT_TOKEN:=}"
				if [ -n "${REVISION}" ] && [ -z "${CONDUIT_TOKEN}" ]; then
				echo "Error: CONDUIT_TOKEN was not set"
				exit 10
				fi
				set -x

				TOPLEVEL=$(git rev-parse --show-toplevel)
				DEVTOOLS_DIR="${TOPLEVEL}"/contrib/devtools
				BUILD_DIR="${TOPLEVEL}"/build
				mkdir -p "${BUILD_DIR}"
				export BUILD_DIR

				if [ -n "${REVISION}" ]; then
				# Pull the patch from Phabricator and rebase it on latest master
				"${TOPLEVEL}"/contrib/source-control-tools/autopatch.sh --revision "${REVISION}"
				else
				# TODO: This will primarily be for scheduled, automated commits.
				echo "Error: Landing unreviewed patches is not supported yet."
				exit 20
				fi
				FabienUnsubmitted Not Done Inline Actions Could be tested once to avoid boilerplate: if [ -z "${REVISION}" ]; then echo "Error: Landing unreviewed patches is not supported yet." exit 20 fi Fabien: Could be tested once to avoid boilerplate: ``` if [ -z "${REVISION}" ]; then echo "Error…
				jasonbcoxAuthorUnsubmitted Done Inline Actions I will need to add it back later. This scaffolding provides for easier to review patches later on. jasonbcox: I will need to add it back later. This scaffolding provides for easier to review patches later…

				# TODO: Autogen (such as manpages, updating timings.json, copyright header, etc.)

				# Sanity checks
				"${DEVTOOLS_DIR}"/smoke-tests.sh

				if [ -n "${REVISION}" ]; then
				echo "Landing revision '${REVISION}' with arcanist arguments: ${ARC_LAND_ARGS[*]}"
				# Stop logging verbosely to prevent leaking CONDUIT_TOKEN
				set +x
				# Land a commit using arcanist. This ensures the diff is reviewed and closed properly.
				: \| arc land "${ARC_LAND_ARGS[@]}" --revision "${REVISION}" --conduit-token "${CONDUIT_TOKEN}"
				FabienUnsubmitted Done Inline Actions Either this has a meaning that I don't know, or arc land will never be called ? Fabien: Either this has a meaning that I don't know, or arc land will never be called ?
				jasonbcoxAuthorUnsubmitted Done Inline Actions It's a short way of telling `arc land` to die if it requests user input. This isn't expected and we don't want it to hang waiting for input. jasonbcox: It's a short way of telling `arc land` to die if it requests user input. This isn't expected…
				set -x
				else
				# TODO: Push a git commit directly. This will primarily be for scheduled, automated commits.
				echo "Error: Pushing unreviewed patches is not supported yet."
				exit 30
				fi