yann@1624: #!/bin/sh
yann@1624: 
yann@1624: # Get our required options
yann@1624: base="$1"
yann@1624: src="$2"
yann@1624: dst="$3"
yann@1624: shift 3
yann@1624: 
yann@1624: # The remainder is for diff
yann@1624: diff="$@"
yann@1624: 
yann@2224: do_help() {
yann@2224:     cat <<-_EOF_
yann@2224: 		${0##*/}: transform a patchset of non-p1 patches into -p1 patches
yann@2224: 		
yann@2224: 		Usage:
yann@2224: 		    ${0##*/} <basedir> <src> <dst> [diffopts ...]
yann@2224: 		
yann@2224: 		Where:
yann@2224: 		    basedir
yann@2224: 		        points to the directory of the component to patch
yann@2224: 		
yann@2224: 		    src
yann@2224: 		        points to the directory containing the existing patchset
yann@2224: 		        to transform
yann@2224: 		
yann@2224: 		    dst
yann@2224: 		        points to the directory where to put transformed patches
yann@2224: 		
yann@2224: 		    diffopts
yann@2224: 		        optional options to pass to diff, for debug purposes. You
yann@2224: 		        should not need it
yann@2224: 		
yann@2224: 		Example:
yann@2224: 		    Transform Gentoo patches against gcc-4.4.2 (some of which are
yann@2224: 		    -p0, -p1 or even -p2 patches) into all -p1 patches:
yann@2224: 		
yann@2224: 		        tar xjf gcc-4.4.2.tar.bz2
yann@2224: 		        patch-rework.sh gcc-4.4.2                   \\
yann@2224: 		                        /path/to/gentoo/gcc/patches \\
yann@2224: 		                        gcc-4.4.2.patches
yann@2224: 		_EOF_
yann@2224: }
yann@2224: 
yann@2224: # Sanity checks
yann@2224: if [    -z "${base}"                    \
yann@2224:      -o ! -d "${base}"                  \
yann@2224:      -o ! -d "${src}"                   \
yann@2224:      -o -e "${dst}" -a ! -d "${dst}"    \
yann@2224:    ]; then
yann@2224: 	do_help
yann@2224: 	exit 1
yann@2224: fi
yann@2224: 
yann@2224: mkdir -p "${dst}"
yann@2224: base="${base%%/}"
yann@2224: src="$( cd "${src}"; pwd )"
yann@2224: dst="$( cd "${dst}"; pwd )"
yann@2224: 
yann@1624: # This function checks that the files listed in the file in "$1"
yann@1624: # do exist, at the given depth-stripping level (aka diff -p#)
yann@1624: do_check_files_at_depth() {
yann@1624:   local flist="$1"
yann@1624:   local depth="$2"
yann@2224:   local ret=0   # 0: OK,  !0: KO
yann@1624: 
yann@1624:   exec 6<&0
yann@1624:   exec 7<"${flist}"
yann@1624: 
yann@1624:   while read -u7 f; do
yann@1624:     f="$( echo "${f}" |sed -r -e "s:^([^/]+/){${depth}}::;" )"
yann@2224:     [ -f "${f}" ] || ret=1
yann@1624:   done
yann@1624: 
yann@1624:   exec 7<&-
yann@1624:   exec <&6
yann@1624: 
yann@2224:   return ${ret}
yann@1624: }
yann@1624: 
yann@1624: # Iterate through patches
yann@1624: for p in "${src}/"*.patch; do
yann@1624:   pname="$( basename "${p}" )"
yann@1624: 
yann@1624:   printf "Handling patch '${pname}'...\n"
yann@1624: 
yann@1624:   printf "  creating reference..."
yann@1624:   cp -a "${base}" "${base}.orig"
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   printf "  retrieving patch comment..."
yann@1624:   comment="$( awk '
yann@1624: BEGIN { mark=0; }
yann@1624: $0~/^diff --/ { nextfile; }
yann@1624: $1=="---" { mark=1; next; }
yann@1624: $1=="+++" && mark==1 { nextfile; }
yann@1624: { mark=0; print; }
yann@1624: ' "${p}" )"
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   printf "  creating patched file list..."
yann@1624:   diffstat -f 4 -r 2 -u -p 0 "${p}"                         \
yann@1624:   |head -n -1                                               \
yann@1624:   |awk '{ for(i=NF;i>=NF-5;i--) { $(i) = ""; } print; }'    \
yann@1624:   |sort                                                     \
yann@1624:   >"diffstat.orig"
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   pushd "${base}" >/dev/null 2>&1
yann@1624: 
yann@1624:   # Check all files exist, up to depth 3
yann@1624:   printf "  checking depth:"
yann@1624:   for((d=0;d<4;d++)); do
yann@1624:     printf " ${d}"
yann@1624:     if do_check_files_at_depth "../diffstat.orig" ${d}; then
yann@1624:       printf " ok, using depth '${d}'\n"
yann@1624:       break
yann@1624:     fi
yann@1624:   done
yann@1624:   if [ ${d} -ge 4 ]; then
yann@1624:     printf "\n"
yann@1624:     printf "  checking depth failed\n"
yann@1624:     read -p "  --> enter patch depth (or Ctrl-C to abort): " d
yann@1624:   fi
yann@1624: 
antony@2564:   # Store the original list of files touched by the patch,
yann@1624:   # removing the $d leading components
yann@1624:   sed -r -e "s:^([^/]+/){${d}}::;" "../diffstat.orig" >"${dst}/${pname}.diffstat.orig"
yann@1624: 
yann@1624:   # Apply the patch proper, and check it applied cleanly.
yann@1624:   # We can't check with --dry-run because of patches that
yann@1624:   # contain multiple accumulated patches onto a single file.
yann@1624:   printf "  applying patch..."
yann@1624:   if ! patch -g0 -F1 -f -p${d} <"${p}" >"../patch.out" 2>&1; then
yann@2147:     printf " ERROR\n\n"
yann@1624:     popd >/dev/null 2>&1
yann@1624:     printf "There was an error while applying:\n  -->  ${p}  <--\n"
yann@1624:     printf "'${base}' was restored to the state it was prior to applying this faulty patch.\n"
yann@1624:     printf "Here's the 'patch' command, and its output:\n"
yann@1624:     printf "  ----8<----\n"
yann@1624:     printf "  patch -g0 -F1 -f -p${d} <'${p}'\n"
yann@2147:     sed -r -e 's/^/  /;' "patch.out"
yann@1624:     printf "  ----8<----\n"
yann@1624:     exit 1
yann@1624:   fi
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   printf "  removing '.orig' files..."
yann@1624:   find . -type f -name '*.orig' -exec rm -f {} +
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   popd >/dev/null 2>&1
yann@1624: 
yann@1624:   printf "  re-diffing the patch..."
yann@1624:   printf "%s\n\n" "${comment}" >"${dst}/${pname}"
yann@1624:   diff -durN "${base}.orig" "${base}" >>"${dst}/${pname}"
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   if [ -n "${diff}" ]; then
yann@1624:     printf "  applying diff filter..."
yann@1624:     filterdiff -x "${diff}" "${dst}/${pname}" >"tmp-diff"
yann@1624:     mv "tmp-diff" "${dst}/${pname}"
yann@1624:     printf " done\n"
yann@1624:   fi
yann@1624: 
yann@1624:   printf "  creating new patched file list..."
yann@1624:   diffstat -f 4 -r 2 -u -p 1 "${dst}/${pname}"              \
yann@1624:   |head -n -1                                               \
yann@1624:   |awk '{ for(i=NF;i>=NF-5;i--) { $(i) = ""; } print; }'    \
yann@1624:   |sort                                                     \
yann@1624:   >"${dst}/${pname}.diffstat.new"
yann@1624:   printf " done\n"
yann@1624: 
yann@1624:   printf "  removing temporary files/dirs..."
yann@1624:   rm -f "patch.out"
yann@1624:   rm -f "diffstat.tmp"
yann@2147:   rm -f "diffstat.orig"
yann@1624:   rm -rf "${base}.orig"
yann@1624:   printf " done\n"
yann@1624: done
yann@1624: 
yann@1624: # Scan all new patches to see if they touch
yann@1624: # more files than the original patches
yann@1624: printf "\nChecking resulting patchset:\n"
yann@1624: for p in "${dst}/"*.patch; do
yann@1624:   pname="$( basename "${p}" )"
yann@1624: 
yann@1624:   if ! cmp "${p}.diffstat.orig" "${p}.diffstat.new" >/dev/null; then
yann@1624:     printf "  --> '${pname}' differ in touched files <--\n"
yann@2147:   else
yann@2147:     rm -f "${p}.diffstat.orig" "${p}.diffstat.new"
yann@1624:   fi
yann@1624: done
yann@1624: printf "  done.\n"