SPECS: builder - add support to confirm each chunk to adapter - sk...

glen glen at pld-linux.org
Mon Dec 12 13:57:42 CET 2005


Author: glen                         Date: Mon Dec 12 12:57:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add support to confirm each chunk to adapter
- skip xterm title updates when output is not terminal

---- Files affected:
SPECS:
   builder (1.355 -> 1.356) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.355 SPECS/builder:1.356
--- SPECS/builder:1.355	Sat Dec  3 04:07:51 2005
+++ SPECS/builder	Mon Dec 12 13:57:37 2005
@@ -286,6 +286,7 @@
 }
 
 update_shell_title() {
+	[ -t 1 ] || return
 	local msg="builder[$SPECFILE] $*"
 	case "$TERM" in
 		cygwin|xterm*)
@@ -1474,12 +1475,30 @@
 		  if [ -t 1 ]; then
 				diffcol $tmpdir/$SPECFILE.diff | less -r
 				while : ; do
-					 echo -n "Accept? [yn] "
+					 echo -n "Accept? (Yes, No, Confirm)? "
 					 read ans
 					 case "$ans" in
 					 [yYoO]) # y0 mama
 						  mv -f $tmpdir/$SPECFILE $SPECFILE
 						  echo "Ok, adapterized."
+						  break
+					 ;;
+					 [cC]) # confirm each chunk
+						  head -n 2 $tmpdir/$SPECFILE.diff > $tmpdir/header.diff
+						  lines=$(grep -n ^@@ $tmpdir/$SPECFILE.diff | cut -d: -f1)
+						  for a in $lines; do
+								t=$tmpdir/chunk-$a.diff
+								cat $tmpdir/header.diff > $t
+								sed -ne "$a,/@@/p" $tmpdir/$SPECFILE.diff >> $t
+								diffcol $t | less -r
+								echo -n "Accept? (Yes, [N]o)? "
+								read ans
+								case "$ans" in
+								[yYoO]) # y0 mama
+									patch < $t
+									;;
+								esac
+						  done
 						  break
 					 ;;
 					 [nNsS])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.355&r2=1.356&f=u




More information about the pld-cvs-commit mailing list