svn commit: r339185 - head/Tools/scripts

[Pietro Cerutti]

On 2014-Jan-08, 22:43, Lars Engels wrote:
> Author: lme
> Date: Wed Jan  8 22:43:21 2014
> New Revision: 339185
> URL: http://svnweb.freebsd.org/changeset/ports/339185
> 
> Log:
>   - Allow a leading "r" in the svn revision
>   - 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
> 
> Modified:
>   head/Tools/scripts/mfh   (contents, props changed)
> 
> Modified: head/Tools/scripts/mfh
> ==============================================================================
> --- head/Tools/scripts/mfh	Wed Jan  8 22:34:40 2014	(r339184)
> +++ head/Tools/scripts/mfh	Wed Jan  8 22:43:21 2014	(r339185)
> @@ -53,35 +53,47 @@ ask() {
>  
>  [ $# -ne 2 ] && err "Takes 2 arguments: <branch> <revnumber>"
>  branch=$1
> -rev=$2
> -case $rev in
> +rev=${2##r} # remove a leading "r"
> +case ${rev} in
>  ''|*[!0-9]*) err "revision should be a number" ;;
>  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)
> -cd $dir
> -svn co --depth=empty svn+ssh://svn.FreeBSD.org/ports/branches/${branch}
> +cd ${dir}
> +${svn} co --depth=empty svn+ssh://${svnserver}/ports/branches/${branch}
>  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

Would you mind switching to svn+ssh everywhere? The thing is, if you're
going to merge, you'll be using svn+ssh anyway, and it might be the case
that plain svn is not available because of some stupid firewall rules -
which is exactly my case and the reason for my asking.

Thanks,

-- 
Pietro Cerutti
The FreeBSD Project
gahr at FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 964 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140109/67579dcd/attachment-0001.sig>