util: Remove support for hg patches in patch creation script

Simplify the patch creation helper script by removing support for
automatic conversion to Mercurial's patch format. We no longer use
Mercurial as a primary repository, so this support is not likely to be
needed again.

Change-Id: I83f6efb9ccaee9c548b33257a4d6128153750c76
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/5162
Reviewed-by: Gabe Black <gabeblack@google.com>

1 files changed, 2 insertions, 30 deletions

diff --git a/util/maint/create_patches.sh b/util/maint/create_patches.sh
index 7c1655f78..339136ac0 100755
--- a/util/maint/create_patches.sh
+++ b/util/maint/create_patches.sh
@@ -44,11 +44,9 @@ REL_SCRIPT_DIR=`dirname "$0"`
 SCRIPT_NAME=`basename "$0"`
 SCRIPT_DIR=$(cd "$REL_SCRIPT_DIR" && echo "$(pwd -P)")
 MSG_FILTER="$SCRIPT_DIR"/upstream_msg_filter.sed
-CONV_HG="$SCRIPT_DIR"/git-patch-to-hg-patch
 
 PATCH_DIR="./patches/"
 UPSTREAM="upstream/master"
-PATCH_FORMAT=
 
 usage()
 {
@@ -59,7 +57,6 @@ Format a patch series suitable for upstream consumption.
 Options:
   -u BRANCH      Upstream branch
   -d DIR         Patch directory
-  -f FMT         Patch format (hg or git)
   -h             Show this help string.
 
 This script creates a series of patches suitable from upstream
@@ -70,7 +67,7 @@ the following operations in order:
   1. Rebase the patches in the current branch onto the upstream
      branch.
   2. Filter commit messages.
-  3. Generate a set of patches in git format or Mercurial format.
+  3. Generate a set of patches in git format.
 EOF
 }
 
@@ -79,7 +76,7 @@ branch_exists()
     git rev-parse --verify -q "$1" > /dev/null
 }
 
-while getopts ":u:d:f:h" OPT; do
+while getopts ":u:d:h" OPT; do
     case $OPT in
         d)
             PATCH_DIR="$OPTARG"
@@ -87,9 +84,6 @@ while getopts ":u:d:f:h" OPT; do
         u)
             UPSTREAM="$OPTARG"
             ;;
-        f)
-            PATCH_FORMAT="$OPTARG"
-            ;;
         h)
             usage
             exit 0
@@ -117,21 +111,6 @@ shift $((OPTIND - 1))
 
 BRANCH="${1:-HEAD}"
 
-case "$PATCH_FORMAT" in
-    git|hg)
-        ;;
-
-    "")
-        echo "Error: No patch format specified" >&2
-        exit 1
-        ;;
-
-    *)
-        echo "Error: Illegal patch format specified: '$PATCH_FORMAT'" >&2
-        exit 1
-esac
-
-
 if ! branch_exists "$BRANCH"; then
     echo "Error: Patch branch '$BRANCH' doesn't exist" 1>&2
     exit 2
@@ -168,10 +147,3 @@ git filter-branch -f \
 
 echo "Creating patches..."
 git format-patch -p -o "$PATCH_DIR" "$UPSTREAM"
-
-if [ "$PATCH_FORMAT" == "hg" ]; then
-    echo "Converting patches..."
-    for P in "$PATCH_DIR"/*.patch; do
-        "$CONV_HG" $P
-    done
-fi