X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fcvsbranchdiff;fp=bin%2Fcvsbranchdiff;h=0000000000000000000000000000000000000000;hp=d8a4f3b94c94a6247eb422f2f97c8b3047015f91;hb=bfbeacf31504b04e95dcebd3e9ec96ac225c9bd8;hpb=0cc7abac77065b9d06676d386c08c128cf1983b9 diff --git a/bin/cvsbranchdiff b/bin/cvsbranchdiff deleted file mode 100755 index d8a4f3b..0000000 --- a/bin/cvsbranchdiff +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -# -# $Id$ - - -if [ $# = 0 ];then - echo 'currendir == CVS (old) version; $1 == dir w/new version; [$2 == "print"]' - exit 1 - fi - -t=/tmp/cvsbranchdiff.$$ -trap 'rm -rf $t' EXIT -rm -rf $t -mkdir $t -function findnice -{ - find "$1" -not -regex '.*/CVS\(\|/[^/]+\)$' '(' '!' -type d -o -printf "%P/\n" ')' '(' '!' -type f -o -printf "%P\n" ')'|sort -} -(findnice . ;echo "/") >$t/old -(findnice "$1" ) >$t/new -diff -U 999999 $t/old $t/new|sed -e '1,/^@@.*@@$/d' >$t/diff -if [ "$2" = print ];then - grep '^[+-]' $t/diff - exit 0 - fi -echo '#! /bin/sh' -echo 'set -ex' -sed \ - -e 's#^[+]\(.*\)/$#mkdir '\''./\1'\''; cvs add -kk '\''\1'\''#' \ - -e 's#^[+]\(.*[^/]\)$#cp -p '\'"$1"'/\1'\'' '\''./\1'\''; cvs add -kk '\''\1'\''#' \ - -e '\#^[-]\(.*\)/$#d' \ - -e 's#^[-]\(.*[^/]\)$#cvs remove -f '\''\1'\''#' \ - -e '\#^[ ]\(.*\)/$#d' \ - -e 's#^[ ]\(.*[^/]\)$#cmp -s '\'"$1"'/\1'\'' '\''./\1'\'' || cp -p '\'"$1"'/\1'\'' '\''./\1'\''#' \ - <$t/diff -echo 'echo done'