Update commit message style to Git not CVS

[packages/rpm-build-tools.git] / kdediff.sh

diff --git a/kdediff.sh b/kdediff.sh
old mode 100644 (file)
new mode 100755 (executable)
index 15603e0..38f4ef3
--- a/kdediff.sh
+++ b/kdediff.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-
 ver=3.5.10
-pkg="$1"
+top=$(cd "$(dirname "$0")"; pwd)
 
 # http://websvn.kde.org/tags/KDE/3.5.5/
 # http://websvn.kde.org/branches/KDE/3.5/
@@ -10,6 +9,11 @@ pkg="$1"
 rundiff() {
        local pkg=$1 ver=$2
        
+       echo >&2 "Checkout $pkg"
+       cd $top
+       ./builder -g -ns $pkg
+
+       cd $top/$pkg
        echo >&2 "Running diff for $pkg-$ver"
        LC_ALL=C svn diff \
                svn://anonsvn.kde.org/home/kde/tags/KDE/$ver/$pkg \
@@ -20,12 +24,20 @@ rundiff() {
        if [ "$c" = 0 ]; then
                echo >&2 "$pkg-branch.diff: empty, skipping"
                rm $pkg-branch.diff.tmp
-               cvs remove -f $pkg-branch.diff
+               cvs remove -f $pkg-branch.diff 2>/dev/null
                return
        fi
 
        cvs up -A $pkg-branch.diff
-       cvs add $pkg-branch.diff
+       cvs add $pkg-branch.diff 2>/dev/null
+
+       local d=$(interdiff $pkg-branch.diff{,.tmp} | wc -l)
+       if [ "$d" = 0 ]; then
+               echo >&2 "$pkg-branch.diff: no new changes, skip"
+               rm $pkg-branch.diff.tmp
+               return
+       fi
+
        mv $pkg-branch.diff.tmp $pkg-branch.diff
        echo >&2 "Updated $pkg-branch.diff"
 }