Author: glen Date: Thu Jan 18 12:27:45 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add kdediff()
---- Files affected:
SOURCES:
rpm-build.sh (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SOURCES/rpm-build.sh
diff -u SOURCES/rpm-build.sh:1.16 SOURCES/rpm-build.sh:1.17
--- SOURCES/rpm-build.sh:1.16 Tue Dec 12 20:46:54 2006
+++ SOURCES/rpm-build.sh Thu Jan 18 13:27:40 2007
@@ -34,6 +34,7 @@
alias pclean="sed -i~ -e
'/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Files\|Common\|Index:\|RCS
file\|retrieving\)/d'"
# makes diff from PLD CVS urls
+# requires: cvs, tee
urldiff() {
local url="$1"
if [ -z "$url" ]; then
@@ -59,6 +60,28 @@
cvs diff -u -r$r1 -r$r2 $file | tee m.patch | diffcol
else
cvs diff -u -r$r1 -r$r2 $file
+ fi
+}
+
+# makes diff from kde svn path
+# requires: wget, tee
+kdediff() {
+ local url="$1"
+ # --- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc
#624744:624745
+ url=${url#*--- }
+ echo >&2 "Process $url"
+ r1=${url#*#}
+ r2=${r1#*:}
+ r1=${r1%:*}
+
+ #
http://websvn.kde.org/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc?rev=624745&r1=612579&r2=624745&makepatch=1&diff_format=u
+ url=http://websvn.kde.org/${url% *}
+ url="$url?r1=$r1&r2=$r2&makepatch=1&diff_format=u"
+
+ if [ -t 1 ]; then
+ wget "$url" -O -| tee m.patch | diffcol
+ else
+ wget "$url" -O -
fi
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-build.sh?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
