mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-06 02:25:23 +00:00
8d8a136eaa
This passes Cq-Depend lines through to the merge commit. Right now this is done manually by the oncaller, which then requires another person to CR+2, slowing down the process. BUG=b:210863861 TEST=./tools/chromeos/create_merge Change-Id: I4adacef8b5fb39aa3a300b56fec5ed0ed79980f1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3342734 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Tested-by: Dennis Kempin <denniskempin@google.com>
83 lines
2 KiB
Bash
Executable file
83 lines
2 KiB
Bash
Executable file
#!/bin/bash
|
|
# Copyright 2021 The Chromium OS Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
#
|
|
# Script to create a commit to merge cros/main into cros/chromeos with a useful
|
|
# commit message.
|
|
#
|
|
# Basic usage to upload a merge to gerrit:
|
|
#
|
|
# $ repo start uprev .
|
|
# $ ./tools/chromeos/create_merge
|
|
# $ git push cros HEAD:refs/for/chromeos
|
|
#
|
|
# To merge with a specific commit, use: ./tools/chromeos/create_merge $SHA
|
|
|
|
set -e
|
|
|
|
LOCAL_BRANCH=$(git branch --show-current)
|
|
REMOTE_NAME=$(git config "branch.${LOCAL_BRANCH}.remote")
|
|
URL=$(git remote get-url "${REMOTE_NAME}")
|
|
|
|
DEFAULT_TARGET="${REMOTE_NAME}/main"
|
|
MERGE_TARGET="${1:-${DEFAULT_TARGET}}"
|
|
|
|
commit_list() {
|
|
git log --oneline --decorate=no --no-color "HEAD..${MERGE_TARGET}"
|
|
}
|
|
|
|
prerequisites() {
|
|
if [[ -e "${LOCAL_BRANCH}" ]] ||
|
|
[[ -e "${REMOTE_NAME}" ]] ||
|
|
[[ -e "${URL}" ]]; then
|
|
echo "This script requires the local repository to be on" \
|
|
"a tracking branch."
|
|
exit 1
|
|
fi
|
|
|
|
if [[ -n $(git status -s) ]]; then
|
|
echo "Working directory is not clean:"
|
|
git status -s
|
|
exit 1
|
|
fi
|
|
|
|
if [[ -z "$(commit_list)" ]]; then
|
|
echo "Nothing to merge."
|
|
exit 0
|
|
fi
|
|
}
|
|
|
|
cq_depends() {
|
|
git log --no-color "HEAD..${MERGE_TARGET}" --pretty=email | grep ^Cq-Depend:
|
|
}
|
|
|
|
merge_message() {
|
|
local old=$(git rev-parse HEAD)
|
|
local new=$(git rev-parse "${MERGE_TARGET}")
|
|
local count=$(commit_list | wc -l)
|
|
|
|
local notes="$(date +%F)"
|
|
if [[ -n "$(cq_depends)" ]]; then
|
|
notes="${notes}, cq-depend"
|
|
fi
|
|
|
|
echo "Merge ${count} commits from ${MERGE_TARGET} (${notes})"
|
|
echo ""
|
|
commit_list
|
|
echo ""
|
|
echo "${URL}/+log/${old}..${new}"
|
|
echo ""
|
|
echo "BUG=None"
|
|
echo "TEST=CQ"
|
|
echo ""
|
|
cq_depends
|
|
}
|
|
|
|
main() {
|
|
prerequisites
|
|
git merge --no-ff "${MERGE_TARGET}" -m "$(merge_message)"
|
|
git --no-pager log -n 1
|
|
}
|
|
|
|
main
|