Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 1 | # !/bin/bash |
| 2 | #===-- merge-request.sh ---------------------------------------------------===# |
| 3 | # |
| 4 | # The LLVM Compiler Infrastructure |
| 5 | # |
| 6 | # This file is distributed under the University of Illinois Open Source |
| 7 | # License. |
| 8 | # |
| 9 | #===------------------------------------------------------------------------===# |
| 10 | # |
| 11 | # Submit a merge request to bugzilla. |
| 12 | # |
| 13 | #===------------------------------------------------------------------------===# |
| 14 | |
| 15 | dryrun="" |
| 16 | stable_version="" |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 17 | revisions="" |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 18 | BUGZILLA_BIN="" |
| 19 | BUGZILLA_CMD="" |
| 20 | release_metabug="" |
| 21 | bugzilla_product="new-bugs" |
| 22 | bugzilla_component="new bugs" |
| 23 | bugzilla_assigned_to="" |
| 24 | bugzilla_user="" |
| 25 | bugzilla_version="" |
Tom Stellard | 59b664b | 2017-05-23 20:35:38 +0000 | [diff] [blame] | 26 | bugzilla_url="https://bugs.llvm.org/xmlrpc.cgi" |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 27 | |
| 28 | function usage() { |
| 29 | echo "usage: `basename $0` -user EMAIL -stable-version X.Y -r NUM" |
| 30 | echo "" |
| 31 | echo " -user EMAIL Your email address for logging into bugzilla." |
| 32 | echo " -stable-version X.Y The stable release version (e.g. 4.0, 5.0)." |
| 33 | echo " -r NUM Revision number to merge (e.g. 1234567)." |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 34 | echo " This option can be specified multiple times." |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 35 | echo " -bugzilla-bin PATH Path to bugzilla binary (optional)." |
| 36 | echo " -assign-to EMAIL Assign bug to user with EMAIL (optional)." |
| 37 | echo " -dry-run Print commands instead of executing them." |
| 38 | } |
| 39 | |
| 40 | while [ $# -gt 0 ]; do |
| 41 | case $1 in |
| 42 | -user) |
| 43 | shift |
| 44 | bugzilla_user="$1" |
| 45 | ;; |
| 46 | -stable-version) |
| 47 | shift |
| 48 | stable_version="$1" |
| 49 | ;; |
| 50 | -r) |
| 51 | shift |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 52 | revisions="$revisions $1" |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 53 | ;; |
| 54 | -project) |
| 55 | shift |
| 56 | project="$1" |
| 57 | ;; |
| 58 | -component) |
| 59 | shift |
| 60 | bugzilla_component="$1" |
| 61 | ;; |
| 62 | -bugzilla-bin) |
| 63 | shift |
| 64 | BUGZILLA_BIN="$1" |
| 65 | ;; |
| 66 | -assign-to) |
| 67 | shift |
| 68 | bugzilla_assigned_to="--assigned_to=$1" |
| 69 | ;; |
| 70 | -dry-run) |
| 71 | dryrun="echo" |
| 72 | ;; |
| 73 | -help | --help | -h | --h | -\? ) |
| 74 | usage |
| 75 | exit 0 |
| 76 | ;; |
| 77 | * ) |
| 78 | echo "unknown option: $1" |
| 79 | usage |
| 80 | exit 1 |
| 81 | ;; |
| 82 | esac |
| 83 | shift |
| 84 | done |
| 85 | |
| 86 | if [ -z "$stable_version" ]; then |
| 87 | echo "error: no stable version specified" |
| 88 | exit 1 |
| 89 | fi |
| 90 | |
| 91 | case $stable_version in |
| 92 | 4.0) |
| 93 | release_metabug="32061" |
| 94 | ;; |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 95 | 5.0) |
| 96 | release_metabug="34492" |
| 97 | ;; |
Matt Arsenault | bb50152 | 2018-01-03 18:51:22 +0000 | [diff] [blame] | 98 | 6.0) |
Tom Stellard | 8019c4f | 2018-03-08 16:29:08 +0000 | [diff] [blame] | 99 | release_metabug="36649" |
Matt Arsenault | bb50152 | 2018-01-03 18:51:22 +0000 | [diff] [blame] | 100 | ;; |
Tom Stellard | 70ae543 | 2018-09-28 02:30:42 +0000 | [diff] [blame] | 101 | 7.0) |
| 102 | release_metabug="39106" |
| 103 | ;; |
Tom Stellard | 18e41dc | 2019-03-29 03:37:22 +0000 | [diff] [blame] | 104 | 8.0) |
| 105 | release_metabug="41221" |
| 106 | ;; |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 107 | *) |
| 108 | echo "error: invalid stable version" |
| 109 | exit 1 |
| 110 | esac |
| 111 | bugzilla_version=$stable_version |
| 112 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 113 | if [ -z "$revisions" ]; then |
| 114 | echo "error: no revisions specified" |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 115 | exit 1 |
| 116 | fi |
| 117 | |
| 118 | if [ -z "$bugzilla_user" ]; then |
| 119 | echo "error: bugzilla username not specified." |
| 120 | exit 1 |
| 121 | fi |
| 122 | |
| 123 | if [ -z "$BUGZILLA_BIN" ]; then |
| 124 | BUGZILLA_BIN=`which bugzilla` |
| 125 | if [ $? -ne 0 ]; then |
| 126 | echo "error: could not find bugzilla executable." |
| 127 | echo "Make sure the bugzilla cli tool is installed on your system: " |
| 128 | echo "pip install python-bugzilla (recommended)" |
| 129 | echo "" |
| 130 | echo "Fedora: dnf install python-bugzilla" |
| 131 | echo "Ubuntu/Debian: apt-get install bugzilla-cli" |
| 132 | exit 1 |
| 133 | fi |
| 134 | fi |
| 135 | |
| 136 | BUGZILLA_MAJOR_VERSION=`$BUGZILLA_BIN --version 2>&1 | cut -d . -f 1` |
| 137 | |
| 138 | if [ $BUGZILLA_MAJOR_VERSION -eq 1 ]; then |
| 139 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 140 | echo "***************************** Error ** ********************************" |
| 141 | echo "You are using an older version of the bugzilla cli tool, which is not " |
| 142 | echo "supported. You need to use bugzilla cli version 2.0.0 or higher:" |
| 143 | echo "***********************************************************************" |
| 144 | exit 1 |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 145 | fi |
| 146 | |
| 147 | BUGZILLA_CMD="$BUGZILLA_BIN --bugzilla=$bugzilla_url" |
| 148 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 149 | rev_string="" |
| 150 | for r in $revisions; do |
| 151 | rev_string="$rev_string r$r" |
| 152 | done |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 153 | |
| 154 | echo "Checking for duplicate bugs..." |
| 155 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 156 | check_duplicates=`$BUGZILLA_CMD query --blocked=$release_metabug --field="cf_fixed_by_commits=$rev_string"` |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 157 | |
| 158 | if [ -n "$check_duplicates" ]; then |
| 159 | echo "Duplicate bug found:" |
| 160 | echo $check_duplicates |
| 161 | exit 1 |
| 162 | fi |
| 163 | |
| 164 | echo "Done" |
| 165 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 166 | # Get short commit summary. To avoid having a huge summary, we just |
| 167 | # use the commit message for the first commit. |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 168 | commit_summary='' |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 169 | for r in $revisions; do |
| 170 | commit_msg=`svn log -r $r https://llvm.org/svn/llvm-project/` |
| 171 | if [ $? -ne 0 ]; then |
| 172 | echo "warning: failed to get commit message." |
| 173 | commit_msg="" |
| 174 | fi |
| 175 | break |
| 176 | done |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 177 | |
| 178 | if [ -n "$commit_msg" ]; then |
| 179 | commit_summary=`echo "$commit_msg" | sed '4q;d' | cut -c1-80` |
| 180 | commit_summary=" : ${commit_summary}" |
| 181 | fi |
| 182 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 183 | bug_summary="Merge${rev_string} into the $stable_version branch${commit_summary}" |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 184 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 185 | set -x |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 186 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 187 | # Login to bugzilla |
| 188 | $BUGZILLA_CMD login $bugzilla_user |
| 189 | |
| 190 | bug_id=`${dryrun} $BUGZILLA_CMD --ensure-logged-in new \ |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 191 | -p "$bugzilla_product" \ |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 192 | -c "$bugzilla_component" --blocked=$release_metabug \ |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 193 | -o All --priority=P --arch All -v $bugzilla_version \ |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 194 | --field="cf_fixed_by_commits=$rev_string" \ |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 195 | --summary "${bug_summary}" \ |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 196 | -l "Is it OK to merge the following revision(s) to the $stable_version branch?" \ |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 197 | $bugzilla_assigned_to \ |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 198 | -i` |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 199 | |
| 200 | if [ -n "$dryrun" ]; then |
| 201 | exit 0 |
| 202 | fi |
| 203 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 204 | set +x |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 205 | |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 206 | if [ -z "$bug_id" ]; then |
| 207 | echo "Failed to create bug." |
| 208 | exit 1 |
Tom Stellard | 7a6e6b1 | 2017-03-24 16:13:18 +0000 | [diff] [blame] | 209 | fi |
Tom Stellard | 4d63668 | 2017-09-15 02:25:22 +0000 | [diff] [blame] | 210 | |
| 211 | echo " Created new bug:" |
| 212 | echo https://llvm.org/PR$bug_id |
| 213 | |
| 214 | # Add links to revisions |
| 215 | for r in $revisions; do |
| 216 | $BUGZILLA_CMD --ensure-logged-in modify -l "https://reviews.llvm.org/rL$r" $bug_id |
| 217 | done |