Have mfh support multiple merges into one commit.

[mat]

• keep same indentation.

[mat]

I just used it with Tools/scripts/mfh 2015Q3 393161 395660 395703 r395908 so I know it works ?

head/Tools/scripts/mfh

ask() {
         while [ "${answer}" != "y" -a "${answer}" != "n" ] ; do
                 read -p "${question} [y/n] " answer
         done
 
         [ "${answer}" = "y" ] && return 0
         return 1
 }
 
-[ $# -ne 2 ] && err "$(basename $0) requires 2 arguments: <branch> <revnumber>"
+[ $# -le 2 ] && err "$(basename $0) requires at least 2 arguments: <branch> <revnumber> [<revnumber>...]"
 branch=$1
-rev=${2##r} # remove a leading "r"
+shift
+revs=""
+for rev in $@
+do
+  rev=${rev##r} # remove a leading "r"
   case ${rev} in
-''|*[!0-9]*) err "revision should be a number" ;;
+    ''|*[!0-9]*) err "revision \"${rev}\" should be a number" ;;
   esac
+done
 
 : ${svnserver:="svn.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)
 cd "${dir}"
 "${svn}" co --depth=empty svn+ssh://${svnserver}/ports/branches/"${branch}"
 filelist=""
+
+echo -n "MFH:" > commit.txt
+for rev in $@
+do
+  rev=${rev##r}
+  echo -n " r${rev}" >> commit.txt
+done
+echo >> commit.txt
+for rev in $@
+do
+  rev=${rev##r}
   # svn:// is faster than svn+ssh://. Use it wherever it's possible.
-for f in $("${svn}" diff --summarize -c ${rev} svn://${svnserver}/ports/head); do
-        case ${f} in
-        */*) ;;
-        *)continue;;
-        esac
-        f=${f#*/ports/head/}
-        f=${f%/*}
-        filelist="${filelist}${LF}${f}"
+  for f in $("${svn}" diff --summarize -c r${rev} svn://${svnserver}/ports/head); do
+          case ${f} in
+          */*) ;;
+          *)continue;;
+          esac
+          f=${f#*/ports/head/}
+          f=${f%/*}
+          filelist="${filelist}${LF}${f}"
   done
-filelist=$(printf '%s\n' "${filelist}" | sort -u)
-echo "MFH: r${rev}" > commit.txt
   "${svn}" log -r${rev} svn://${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
       | sed '$d' >> commit.txt
+done
+filelist=$(printf '%s\n' "${filelist}" | sort -u)
 "${svn}" up --parents $(printf '%s\n' $filelist \
     | sed "s}^}${branch}/}")
 "${svn}" up --quiet "${branch}"
+for rev in $@
+do
+  rev=${rev##r}
   "${svn}" merge -c r${rev} ^/head/ "${branch}"
+done
 "${svn}" up --quiet "${branch}"
 "${svn}" status "${branch}"
 "${svn}" diff "${branch}"
 ask "Do you want to commit? (no = start a shell)" || (
     echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script."
     cd "${branch}"
     pwd
     su -m $(id -un) || :
     ask "Do you want to commit now? (no = clean up and abort)" || clean
 )
 ${EDITOR:-vi} commit.txt
 "${svn}" ci -F commit.txt "${branch}"
 rm -rf "${dir}"
 trap - 0