From 01fdb465d46beb72d1c8a628c648574ecbb99d85 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 21 Sep 2009 13:34:07 +0000 Subject: [PATCH] - move filtering code to function Changed files: branch.sh -> 1.14 --- branch.sh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/branch.sh b/branch.sh index 50fd807..35b945d 100644 --- a/branch.sh +++ b/branch.sh @@ -4,15 +4,23 @@ svn=svn://svn.lighttpd.net/lighttpd tag=lighttpd-1.4.23 branch=lighttpd-1.4.x +d=$- +filter() { + set -$d + # Excluding files which change version or were not in dist tarball + filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' | \ + # remove revno's for smaller diffs + sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' +} + old=$svn/tags/$tag new=$svn/branches/$branch -echo "Running diff: $old -> $new" -LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff.tmp - -echo "Excluding files which change version or were not in dist tarball" -filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp > lighttpd-branch.diff.tmp2 -mv -f lighttpd-branch.diff.tmp2 lighttpd-branch.diff -rm -f lighttpd-branch.diff.tmp +echo >&2 "Running diff: $old -> $new" +LC_ALL=C svn diff --old=$old --new=$new | filter > lighttpd-branch.diff.tmp -# remove revno's for smaller diffs -sed -i -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' lighttpd-branch.diff +if cmp -s lighttpd-branch.diff{,.tmp}; then + echo >&2 "No new diffs..." + rm -f lighttpd-branch.diff.tmp + exit 0 +fi +mv -f lighttpd-branch.diff{.tmp,} -- 2.44.0