File diffpatches.diff of Package patchview

Overview Repositories Revisions Requests Users Attributes Meta

File diffpatches.diff of Package patchview (Revision 2b605e3f2b3e38780829c3cf7965233f)

Currently displaying revision 2b605e3f2b3e38780829c3cf7965233f , Show latest

--- patchview.007.orig	2006-12-29 03:34:00.000000000 +0100
+++ patchview.007	2007-01-25 17:21:01.000000000 +0100
@@ -12,6 +12,8 @@
 function usage()
 {
 	echo "usage: $PROG [-f] [-s] [-t] srctree patchfile(s) {ver. $VERSION}"
+	echo "       $PROG -d srctree patchfile1 patchfile2"
+	echo "  -d : compare two patchfiles"
 	echo "  -f : force tkdiff even if 'patch' has errors"
 	echo "  -s : single tkdiff even if patchfile contains multiple files"
 	echo "  -t : use tkdiff even if mtkdiff is available"
@@ -52,6 +54,7 @@
 # call cleanup function when script finishes or gets killed
 trap cleanup EXIT
 
+diff=0
 force=0
 single=0
 tkonly=0
@@ -66,6 +69,9 @@
 while [ -n "$1" ]
 do
 	case $1 in
+	-d)
+		diff=1
+		;;
 	-f)
 		force=1
 		;;
@@ -89,7 +95,8 @@
 		# Accept filename or report a warning
 		if [ -z "${srctree}" ]; then
 			srctree=$1; shift
-			patchfiles=$@
+			declare -a patchfiles
+			patchfiles=($@)
 			break
 		else
 			usage
@@ -101,7 +108,11 @@
     	shift
 done
 
-if [ "$patchfiles" = "" -o "$srctree" = "" ]; then
+if [ "${patchfiles[*]}" = "" -o "$srctree" = "" ]; then
+	usage
+fi
+
+if [ $diff -ne 0 -a ${#patchfiles[@]} -ne 2 ] ; then
 	usage
 fi
 
@@ -120,45 +131,77 @@
 WORKDIR=`mktemp -d -p ${TMPDIR} src.XXXXXX` || \
 	{ echo "failed mktemp for patch files dir."; exit 1; }
 
-pfiles=`lsdiff --strip 1 -h $patchfiles | sort | uniq`
+pfiles=`lsdiff --strip 1 -h ${patchfiles[*]} | sort | uniq`
 
 for pf in $pfiles ; do
 	strip_filename $pf	# sets 'base'
 	if [ "$base" != "" ]; then
 		if [ ! -e $WORKDIR/$base ]; then
-			mkdir -p $WORKDIR/$base
+			if [ $diff -ne 0 ] ; then
+				mkdir -p $WORKDIR/${patchfiles[0]}/$base
+				mkdir -p $WORKDIR/${patchfiles[1]}/$base
+			else
+				mkdir -p $WORKDIR/$base
+			fi
 		fi
 	fi
 	if [ -e $srctree/$pf ]; then
-		cp -a $srctree/$pf $WORKDIR/$pf
+		if [ $diff -ne 0 ] ; then
+			cp -a $srctree/$pf $WORKDIR/${patchfiles[0]}/$pf
+			cp -a $srctree/$pf $WORKDIR/${patchfiles[1]}/$pf
+		else
+			cp -a $srctree/$pf $WORKDIR/$pf
+		fi
 	else
 		# work around the .orig file permissions of 000
-		touch $WORKDIR/$pf
+		if [ $diff -ne 0 ] ; then
+			touch $WORKDIR/${patchfiles[0]}/$pf
+			touch $WORKDIR/${patchfiles[1]}/$pf
+		else
+			touch $WORKDIR/$pf
+		fi
 		##echo "##### creating empty $WORKDIR/$pf #####"
 	fi
 done
 
-for patchfile in $patchfiles
-do
-  patch -p1 -bs -d $WORKDIR < $patchfile
-  sts=$?
-  if [ $sts -ne 0 ] && [ $force -eq 0 ]; then
+if [ $diff -ne 0 ] ; then
+    patch -p1 -bs -d $WORKDIR/${patchfiles[0]} < ${patchfiles[0]}
+    if [ $? -ne 0 ] && [ $force -eq 0 ]; then
 	echo "patch errors, use '$PROG -f' to force continuation"
-	rm -rf $WORKDIR
 	exit 1
-  fi
-done
+    fi
+    patch -p1 -bs -d $WORKDIR/${patchfiles[1]} < ${patchfiles[1]}
+    if [ $? -ne 0 ] && [ $force -eq 0 ]; then
+	echo "patch errors, use '$PROG -f' to force continuation"
+	exit 1
+    fi
+else
+    for patchfile in ${patchfiles[@]}
+      do
+      patch -p1 -bs -d $WORKDIR < $patchfile
+      sts=$?
+      if [ $sts -ne 0 ] && [ $force -eq 0 ]; then
+	  echo "patch errors, use '$PROG -f' to force continuation"
+	  exit 1
+      fi
+    done
+fi
 
 case $VIEWER in
 mtkdiff)
 	i=0
 	argv[i++]="-gdesc"
-	argv[i++]=`diffstat $patchfile`
+	argv[i++]=`diffstat ${patchfiles[0]}`
 	for pf in $pfiles ; do
 		argv[i++]="-fname"
 		argv[i++]="$pf"
-		argv[i++]="$WORKDIR/$pf.orig"
-		argv[i++]="$WORKDIR/$pf"
+		if [ $diff -ne 0 ] ; then
+			argv[i++]="$WORKDIR/${patchfiles[0]}/$pf"
+			argv[i++]="$WORKDIR/${patchfiles[1]}/$pf"
+		else
+			argv[i++]="$WORKDIR/$pf.orig"
+			argv[i++]="$WORKDIR/$pf"
+		fi
 	done
 	mtkdiff "${argv[@]}"
 	;;

Places

File diffpatches.diff of Package patchview (Revision 2b605e3f2b3e38780829c3cf7965233f)

Places