Date: Tue, 19 Jan 2016 12:38:53 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294320 - head/crypto/openssh Message-ID: <201601191238.u0JCcrsv082516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Tue Jan 19 12:38:53 2016 New Revision: 294320 URL: https://svnweb.freebsd.org/changeset/base/294320 Log: Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. Modified: head/crypto/openssh/freebsd-post-merge.sh head/crypto/openssh/freebsd-pre-merge.sh Modified: head/crypto/openssh/freebsd-post-merge.sh ============================================================================== --- head/crypto/openssh/freebsd-post-merge.sh Tue Jan 19 10:24:47 2016 (r294319) +++ head/crypto/openssh/freebsd-post-merge.sh Tue Jan 19 12:38:53 2016 (r294320) @@ -6,9 +6,9 @@ xargs perl -n -i -e ' print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print; - m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n"; ' <keywords -xargs perl -p -i -e ' - s/^\.Dd \$Mdocdate: (\w+) (\d+) (\d+) \$$/.Dd $1 $2, $3/ -' <mdocdates +xargs perl -n -i -e ' + print; + m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n"; +' <rcsid Modified: head/crypto/openssh/freebsd-pre-merge.sh ============================================================================== --- head/crypto/openssh/freebsd-pre-merge.sh Tue Jan 19 10:24:47 2016 (r294319) +++ head/crypto/openssh/freebsd-pre-merge.sh Tue Jan 19 12:38:53 2016 (r294320) @@ -3,17 +3,15 @@ # $FreeBSD$ # +:>keywords +:>rcsid find . -type f -name '*.[1-9ch]' | cut -c 3- | \ while read f ; do - svn propget svn:keywords $f | grep -q . && echo $f -done >keywords -xargs perl -n -i -e ' + svn proplist -v $f | grep -q 'FreeBSD=%H' || continue + egrep -l '/\* \$FreeBSD[:\$]' $f >>keywords + egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid +done +sort -u keywords rcsid | xargs perl -n -i -e ' $strip = $ARGV if /\$(Id|OpenBSD):.*\$/; - print unless ($strip eq $ARGV && /\$FreeBSD.*\$/); -' <keywords - -find . -type f -name '*.[1-9]' | cut -c 3- | \ - xargs grep -l '^\.Dd ' . >mdocdates -xargs perl -p -i -e ' - s/^\.Dd (\w+) (\d+), (\d+)$/.Dd \$Mdocdate: $1 $2 $3 \$/; -' <mdocdates + print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/); +'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601191238.u0JCcrsv082516>