merge-request.sh: Rewrite to use git

[tstellar]

ping.

[hans]

Sorry, I completely missed this. lgtm

llvm/utils/release/merge-request.sh

161

That's a nice improvement.

I'm not sure 7 characters is long enough to be a unique hash though.

Running this:

$ git rev-list --all --abbrev=0 --abbrev-commit |   awk '{ a[length] += 1 } END { for (len in a) print len, a[len] }'
5 8568
6 276655
7 69935
8 4939
9 294
10 21

suggests we have some commits that require 10 chararacters for the short hash to be unique. So maybe we should use 10? Hopefully that will last a while.

llvm/utils/release/merge-request.sh

7.0)
     release_metabug="39106"
     ;;
   8.0)
     release_metabug="41221"
     ;;
   9.0)
     release_metabug="43360"
     ;;
+  10.0)
+    release_metabug="45309"
+    ;;
   *)
     echo "error: invalid stable version"
     exit 1
 esac
 bugzilla_version=$stable_version
 
 if [ -z "$revisions" ]; then
   echo "error: no revisions specified"
if [ $BUGZILLA_MAJOR_VERSION -eq 1 ]; then
   echo "***********************************************************************"
   exit 1
 fi
 
 BUGZILLA_CMD="$BUGZILLA_BIN --bugzilla=$bugzilla_url"
 
 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..."
 
 check_duplicates=`$BUGZILLA_CMD query --blocked=$release_metabug --field="cf_fixed_by_commits=$rev_string"`
 
 if [ -n "$check_duplicates" ]; then
   echo "Duplicate bug found:"
   echo $check_duplicates
   exit 1
 fi
 
 echo "Done"
 
 # Get short commit summary.  To avoid having a huge summary, we just
 # 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=""
   fi
   break
 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
 
 # Login to bugzilla
 $BUGZILLA_CMD login $bugzilla_user
 
 bug_id=`${dryrun} $BUGZILLA_CMD --ensure-logged-in new \
   -p "$bugzilla_product" \
if [ -z "$bug_id" ]; then
   exit 1
 fi
 
 echo " Created new bug:"
 echo https://llvm.org/PR$bug_id
 
 # 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