sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Allow a leading "r" in the svn revision

Browse source 
- Use a variable for the Subversion server
- Consistently use ${} around variables
- Bail out if neither svn(1) nor svnlite(1) are installed

Approved by:	bapt
This commit is contained in:
Lars Engels 2014-01-08 22:43:21 +00:00
parent bac9d45205
commit addfd6a6e1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=339185
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Tools/scripts/mfh
View file

@ -53,35 +53,47 @@ ask() {
[ $# -ne 2 ] && err "Takes 2 arguments: <branch> <revnumber>" [ $# -ne 2 ] && err "Takes 2 arguments: <branch> <revnumber>"
branch=$1 branch=$1
rev=$2 rev=${2##r} # remove a leading "r"
case $rev in case ${rev} in
''|*[!0-9]*) err "revision should be a number" ;; ''|*[!0-9]*) err "revision should be a number" ;;
esac esac
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 "svn(1) and svnlite(1) not found. please install devel/subversion"
fi
dir=$(mktemp -d /tmp/merge.XXX) dir=$(mktemp -d /tmp/merge.XXX)
cd $dir cd ${dir}
svn co --depth=empty svn+ssh://svn.FreeBSD.org/ports/branches/${branch} ${svn} co --depth=empty svn+ssh://${svnserver}/ports/branches/${branch}
filelist="" filelist=""
for f in $(svn diff --summarize -c $rev svn://svn.FreeBSD.org/ports/head); do # 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 case ${f} in
*/*) ;; */*) ;;
*)continue;; *)continue;;
esac esac
f=${f#*/ports/head/} f=${f#*/ports/head/}
f=${f%/*} f=${f%/*}
filelist="$filelist\n$f" filelist="${filelist}\n${f}"
done done
filelist=$(echo -e $filelist | sort -u) filelist=$(echo -e ${filelist} | sort -u)
echo "MFH: r$rev" > commit.txt echo "MFH: r${rev}" > commit.txt
svn log -r$rev svn://svn.freebsd.org/ports/head | sed '1,2d;$d;/^MFH:/d' >> commit.txt ${svn} log -r${rev} svn://${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' >> commit.txt
for f in ${filelist}; do for f in ${filelist}; do
svn up --parents ${branch}/${f} ${svn} up --parents ${branch}/${f}
done done
svn up --quiet ${branch} ${svn} up --quiet ${branch}
svn merge -c r${rev} ^/head/ ${branch} ${svn} merge -c r${rev} ^/head/ ${branch}
svn up --quiet ${branch} ${svn} up --quiet ${branch}
svn diff ${branch} ${svn} diff ${branch}
ask "Do you want to commit?" || clean ask "Do you want to commit?" || clean
${EDITOR:-vi} commit.txt ${EDITOR:-vi} commit.txt
svn ci -F commit.txt ${branch} ${svn} ci -F commit.txt ${branch}
rm -rf $dir rm -rf ${dir}