Page MenuHomePhabricator
Files F13115539

No OneTemporary
Actions

View Options

diff --git a/contrib/source-control-tools/land-patch.sh b/contrib/source-control-tools/land-patch.sh
index aa83c2c35..53ba4091f 100755
--- a/contrib/source-control-tools/land-patch.sh
+++ b/contrib/source-control-tools/land-patch.sh
@@ -1,91 +1,76 @@
#!/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] revision_id
Land a Differential revision after running any necessary scripts and sanity checks.
revision_id The Differential revision ID (ex: D1234)
Options:
-d, --dry-run Dry run. Does everything but actually landing the change.
-h, --help Display this help message.
Environment Variables:
CONDUIT_TOKEN (required) Conduit token to use when landing the patch. This allows
landing a patch as a particular Phabricator user.
EOF
}
ARC_LAND_ARGS=()
# 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
;;
*)
if [ $# -gt 1 ]; then
echo "Error: Unrecognized argument: '$1'"
help_message
exit 1
fi
break
;;
esac
done
REVISION="$1"
TOPLEVEL=$(git rev-parse --show-toplevel)
"${TOPLEVEL}"/contrib/source-control-tools/check-revision-accepted.sh "${REVISION}"
# IMPORTANT NOTE: The patch is trusted past this point because it has been reviewed
# and accepted. That includes any changes that may affect this script.
# shellcheck source=sanitize-conduit-token.sh
source "${TOPLEVEL}"/contrib/source-control-tools/sanitize-conduit-token.sh
-DEVTOOLS_DIR="${TOPLEVEL}"/contrib/devtools
-BUILD_DIR="${TOPLEVEL}"/build
-mkdir -p "${BUILD_DIR}"
-export BUILD_DIR
-
-# Applying brace expansion ensures the remainder of this script is loaded into memory,
-# as most versions of bash typically load scripts in chunks as they run. For patches
-# that alter this script, this prevents those changes from affecting the remainder of
-# the execution.
-{
- # Pull the patch from Phabricator and rebase it on latest master
- "${TOPLEVEL}"/contrib/source-control-tools/autopatch.sh --revision "${REVISION}"
-
- # TODO: Autogen (such as manpages, updating timings.json, copyright header, etc.)
-
- # Sanity checks
- "${DEVTOOLS_DIR}"/smoke-tests.sh
-
- 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}"
- set -x
-
- # This MUST be the last line to ensure no changes to this script on-disk can affect the execution
- # that is running right now. See note above for more details.
- exit 0
-}
+# Pull the patch from Phabricator and rebase it on latest master
+"${TOPLEVEL}"/contrib/source-control-tools/autopatch.sh --revision "${REVISION}"
+
+# TODO: Autogen (such as manpages, updating timings.json, copyright header, etc.)
+
+# Sanity checks
+"${TOPLEVEL}"/contrib/devtools/smoke-tests.sh
+
+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}"
+set -x

File Metadata

Mime Type
text/x-diff
Expires
Sun, Mar 2, 11:20 (1 d, 5 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187574
Default Alt Text
(3 KB)

Event Timeline