Changeset 83667 in vbox for trunk/tools

Timestamp:

Apr 10, 2020 1:02:38 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137143

Message:

Forward-ported r137138 from 6.1: backport-commit.sh: multi-revision fixes.

File:

• trunk/tools/bin/backport-commit.sh (modified) (5 diffs)

trunk/tools/bin/backport-commit.sh

@@ -67 +67 @@
     done
     echo "." >> "${MY_MSG_FILE}"
+    echo ""  >> "${MY_MSG_FILE}"
 
     # One bullet with the commit text.
@@ -72 +73 @@
     do
         echo -n "* r${MY_REV}: " >> "${MY_MSG_FILE}"
-        if ! "${MY_SVN}" log "-r${MY_REV}" "${MY_TRUNK}" > "${MY_TMP_FILE}"; then
+        if ! "${MY_SVN}" log "-r${MY_REV}" "${MY_TRUNK_DIR}" > "${MY_TMP_FILE}"; then
             echo "error: failed to get log entry for revision ${MY_REV}"
             exit 1;
@@ -81 +82 @@
         fi
     done
+
+    # This is a line ending hack for windows hosts.
+    if    "${MY_SED}" -e 's/1/1/g' --output-text "${MY_TMP_FILE}" "${MY_MSG_FILE}"
+       && "${MY_SED}" -e 's/1/1/g' --output-text "${MY_MSG_FILE}" "${MY_TMP_FILE}"; then
+
+    else
+        echo "error: SED failed to clean up commit message line-endings."
+        exit 1;
+    fi
 fi
 "${MY_RM}" -f -- "${MY_TMP_FILE}"
@@ -90 +100 @@
 echo "*** Commit message:"
 "${MY_CAT}" "${MY_MSG_FILE}"
+echo "*** end commit message ***"
 echo "***"
 IFS=`"${MY_PRINTF}" " \t\r\n"` # windows needs \r for proper 'read' operation.
@@ -114 +125 @@
             ;;
         *)
+            echo
             echo "Please answer 'y' or 'n'... (MY_ANSWER=${MY_ANSWER})"
     esac