Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jun 2017 17:31:56 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r443456 - head/Tools/scripts
Message-ID:  <201706121731.v5CHVug4003616@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Mon Jun 12 17:31:56 2017
New Revision: 443456
URL: https://svnweb.freebsd.org/changeset/ports/443456

Log:
  Allow editing commit message on failure and save it somewhere if declined.
  
  With hat:       portmgr

Modified:
  head/Tools/scripts/mfh

Modified: head/Tools/scripts/mfh
==============================================================================
--- head/Tools/scripts/mfh	Mon Jun 12 17:29:04 2017	(r443455)
+++ head/Tools/scripts/mfh	Mon Jun 12 17:31:56 2017	(r443456)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706121731.v5CHVug4003616>