Skip to content

Commit

Permalink
Default to repo.FreeBSD.org for commits, as urged by our repo meister.
Browse files Browse the repository at this point in the history
Approved by:	portmgr (mat)
  • Loading branch information
naddy authored and naddy committed Sep 20, 2015
1 parent 261bbba commit 2894bb3
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Tools/scripts/mfh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ do
esac
done

: ${svnserver:="svn.FreeBSD.org"}
: ${svnserver:="svn+ssh://repo.FreeBSD.org"}

if [ -n "$(type svn 2>/dev/null)" ]; then
svn=svn
Expand All @@ -80,7 +80,7 @@ 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}"
"${svn}" co --depth=empty ${svnserver}/ports/branches/"${branch}"
filelist=""

echo -n "MFH:" > commit.txt
Expand All @@ -93,8 +93,7 @@ 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 r${rev} svn://${svnserver}/ports/head); do
for f in $("${svn}" diff --summarize -c r${rev} ${svnserver}/ports/head); do
case ${f} in
*/*) ;;
*)continue;;
Expand All @@ -103,7 +102,7 @@ do
f=${f%/*}
filelist="${filelist}${LF}${f}"
done
"${svn}" log -r${rev} svn://${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
"${svn}" log -r${rev} ${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
| sed '$d' >> commit.txt
done
filelist=$(printf '%s\n' "${filelist}" | sort -u)
Expand Down

0 comments on commit 2894bb3

Please sign in to comment.