[PATCH] D79516: merge-request.sh: Rewrite to use git

[Tom Stellard via Phabricator via llvm-commits]

tstellar created this revision.
tstellar added a reviewer: hansw.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D79516

Files:
  llvm/utils/release/merge-request.sh


Index: llvm/utils/release/merge-request.sh
===================================================================
--- llvm/utils/release/merge-request.sh
+++ llvm/utils/release/merge-request.sh
@@ -106,6 +106,9 @@
   9.0)
     release_metabug="43360"
     ;;
+  10.0)
+    release_metabug="45309"
+    ;;
   *)
     echo "error: invalid stable version"
     exit 1
@@ -150,7 +153,12 @@
 
 rev_string=""
 for r in $revisions; do
-  rev_string="$rev_string r$r"
+  rev_string="$rev_string $r"
+done
+
+short_rev_string=""
+for r in $revisions; do
+  short_rev_string="$short_rev_string `echo $r | cut -c 1-7`"
 done
 
 echo "Checking for duplicate bugs..."
@@ -169,7 +177,7 @@
 # use the commit message for the first commit.
 commit_summary=''
 for r in $revisions; do
-  commit_msg=`svn log -r $r https://llvm.org/svn/llvm-project/`
+  commit_msg=`git show -s --format="%s" $r`
   if [ $? -ne 0 ]; then
     echo "warning: failed to get commit message."
     commit_msg=""
@@ -178,11 +186,11 @@
 done
 
 if [ -n "$commit_msg" ]; then
-  commit_summary=`echo "$commit_msg" | sed '4q;d' | cut -c1-80`
+  commit_summary=`echo "$commit_msg" | cut -c1-80`
   commit_summary=" : ${commit_summary}"
 fi
 
-bug_summary="Merge${rev_string} into the $stable_version branch${commit_summary}"
+bug_summary="Merge${short_rev_string} into the $stable_version branch${commit_summary}"
 
 set -x
 
@@ -215,5 +223,5 @@
 
 # Add links to revisions
 for r in $revisions; do
-  $BUGZILLA_CMD --ensure-logged-in modify -l "https://reviews.llvm.org/rL$r" $bug_id
+  $BUGZILLA_CMD --ensure-logged-in modify -l "https://reviews.llvm.org/rG$r" $bug_id
 done


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79516.262454.patch
Type: text/x-patch
Size: 1629 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200506/1b0f3a7b/attachment.bin>