From 0830e2f11cb1aabdc7af4d08492c232cdcbd1a3d Mon Sep 17 00:00:00 2001
From: Dennis Kempin <denniskempin@google.com>
Date: Fri, 3 Dec 2021 11:40:29 -0800
Subject: [PATCH] chromeos: Add script for merging from cros/main

This script can be used to manually create merge
commits to be uploaded to gerrit, and will also
be used by the buildes doing automatic uprevs.

The main purpose of the script is to create a helpful
commit message describing the commits included.

BUG=b:209034086
TEST=./tools/chromeos/create_merge

Change-Id: I65715ebefb182a5287b5052b6af56361e41d8efd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3315374
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
---
 tools/chromeos/create_merge | 74 +++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100755 tools/chromeos/create_merge

diff --git a/tools/chromeos/create_merge b/tools/chromeos/create_merge
new file mode 100755
index 0000000000..8457978746
--- /dev/null
+++ b/tools/chromeos/create_merge
@@ -0,0 +1,74 @@
+#!/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
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../../" || exit
+
+ORIGIN="$(git remote get-url cros)"
+MERGE_TARGET="${1:-cros/main}"
+
+commit_list() {
+    git log --oneline --decorate=no --no-color "HEAD..${MERGE_TARGET}"
+}
+
+prerequisites() {
+    if [[ -e "${ORIGIN}" ]]; then
+        echo "'cros' remote does not exist."
+        echo "Are you running this in a ChromeOS checkout?"
+        exit 1
+    fi
+
+    local tracking="$(git rev-parse --abbrev-ref --symbolic-full-name @{u})"
+    if [[ "${tracking}" != "cros/chromeos" ]]; then
+        echo "Not tracking the cros/chromeos 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
+}
+
+merge_message() {
+    local old=$(git rev-parse HEAD)
+    local new=$(git rev-parse "${MERGE_TARGET}")
+    local count=$(commit_list | wc -l)
+
+    echo "Merge ${count} commits from ${MERGE_TARGET}"
+    echo ""
+    commit_list
+    echo ""
+    echo "${ORIGIN}/+log/${old}..${new}"
+    echo ""
+    echo "BUG=None"
+    echo "TEST=CQ"
+}
+
+main() {
+    prerequisites
+    git merge --no-ff "${MERGE_TARGET}" -m "$(merge_message)"
+    git log -n 1
+}
+
+main