Make sure the merge is done on the latest branch.

Also, make the branch argument optional.

Discussed with:	swills
Sponsored by:	Absolight

1 files changed, 24 insertions, 11 deletions

diff --git a/Tools/scripts/mfh b/Tools/scripts/mfh
index a8b4cc323beb..6d393c19f02c 100755
--- a/Tools/scripts/mfh
+++ b/Tools/scripts/mfh
@@ -55,9 +55,31 @@ ask() {
 	return 1
 }
 
-[ $# -lt 2 ] && err "$(basename $0) requires at least 2 arguments: <branch> <revnumber> [<revnumber>...]"
+: ${svnserver:="svn+ssh://repo.FreeBSD.org"}
+
+if [ -n "$(type svn 2>/dev/null)" ]; then
+	svn=svn
+elif [ -n "$(type svnlite 2>/dev/null)" ]; then
+	svn=svnlite
+else
+	err "Neither svn(1) nor svnlite(1) found. Please install devel/subversion."
+fi
+
+latest_branch=$("${svn}" ls ${svnserver}/ports/branches/|sed -ne '/^2.*Q./s|/$||p'|tail -1)
+
+[ $# -lt 1 ] && err "$(basename $0) requires at least 1 arguments: [<branch>] <revnumber> [<revnumber>...]"
 branch=$1
-shift
+
+# I sure hope by 2030 we'll be doing something else. Yes, famous last words.
+if expr ${branch} : '20[12][0-9]Q[1-4]' > /dev/null; then
+	shift
+	if [ ${latest_branch} != ${branch} ]; then
+		ask "/!\\ The latest branch is ${latest_branch}, do you really want to commit to ${branch}?" || exit 1
+	fi
+else
+	branch=${latest_branch}
+fi
+
 revs=""
 for rev in $@
 do
@@ -67,15 +89,6 @@ do
   esac
 done
 
-: ${svnserver:="svn+ssh://repo.FreeBSD.org"}
-
-if [ -n "$(type svn 2>/dev/null)" ]; then
-	svn=svn
-elif [ -n "$(type svnlite 2>/dev/null)" ]; then
-	svn=svnlite
-else
-	err "Neither svn(1) nor svnlite(1) found. Please install devel/subversion."
-fi
 
 trap "rc=\$? ; rm -rf \"\${dir}\" ; exit \$rc" EXIT
 dir=$(mktemp -d /tmp/merge.XXXXXX)