Allow editing commit message on failure and save it somewhere if declined.

With hat:       portmgr

1 files changed, 8 insertions, 1 deletions

diff --git a/Tools/scripts/mfh b/Tools/scripts/mfh
index a10182bf8fcc..c77a7d03aa8c 100755
--- a/Tools/scripts/mfh
+++ b/Tools/scripts/mfh
@@ -147,6 +147,13 @@ ask "Do you want to commit? (no = start a shell)" || (
 echo >> commit.txt
 echo "Approved by:	" >> commit.txt
 ${EDITOR:-vi} commit.txt
-"${svn}" ci -F commit.txt "${branch}"
+while ! "${svn}" ci -F commit.txt "${branch}"; do
+	if ! ask "Commit failed. Re-edit message and try again?"; then
+		save_log="$(mktemp -t mfh)"
+		cp -f commit.txt "${save_log}"
+		echo "Saving commit log to ${save_log}"
+		break
+	fi
+done
 rm -rf "${dir}"
 trap - 0