git-applymbox

   1 #!/bin/sh
   2 ##
   3 ## "dotest" is my stupid name for my patch-application script, which
   4 ## I never got around to renaming after I tested it. We're now on the
   5 ## second generation of scripts, still called "dotest".
   6 ##
   7 ## Update: Ryan Anderson finally shamed me into naming this "applymbox".
   8 ##
   9 ## You give it a mbox-format collection of emails, and it will try to
  10 ## apply them to the kernel using "applypatch"
  11 ##
  12 ## applymbox [-u] [-k] [-q] (-c .dotest/msg-number | mail_archive) [Signoff_file]"
  13 ##
  14 ## The patch application may fail in the middle.  In which case:
  15 ## (1) look at .dotest/patch and fix it up to apply
  16 ## (2) re-run applymbox with -c .dotest/msg-number for the current one.
  17 ## Pay a special attention to the commit log message if you do this and
  18 ## use a Signoff_file, because applypatch wants to append the sign-off
  19 ## message to msg-clean every time it is run.
  20
  21 . git-sh-setup-script || die "Not a git archive"
  22
  23 usage () {
  24     echo >&2 "applymbox [-u] [-k] [-q] (-c .dotest/<num> | mbox) [signoff]"
  25     exit 1
  26 }
  27
  28 keep_subject= query_apply= continue= utf8= resume=t
  29 while case "$#" in 0) break ;; esac
  30 do
  31         case "$1" in
  32         -u)     utf8=-u ;;
  33         -k)     keep_subject=-k ;;
  34         -q)     query_apply=t ;;
  35         -c)     continue="$2"; resume=f; shift ;;
  36         -*)     usage ;;
  37         *)      break ;;
  38         esac
  39         shift
  40 done
  41
  42 case "$continue" in
  43 '')
  44         rm -rf .dotest
  45         mkdir .dotest
  46         git-mailsplit "$1" .dotest || exit 1
  47         shift
  48 esac
  49
  50 files=$(git-diff-cache --cached --name-only HEAD) || exit
  51 if [ "$files" ]; then
  52    echo "Dirty index: cannot apply patches (dirty: $files)" >&2
  53    exit 1
  54 fi
  55
  56 case "$query_apply" in
  57 t)      touch .dotest/.query_apply
  58 esac
  59 case "$keep_subject" in
  60 -k)     : >.dotest/.keep_subject
  61 esac
  62
  63 signoff="$1"
  64 set x .dotest/0*
  65 shift
  66 while case "$#" in 0) break;; esac
  67 do
  68     i="$1"
  69     case "$resume,$continue" in
  70     f,$i)       resume=t;;
  71     f,*)        shift
  72                 continue;;
  73     *)
  74             git-mailinfo $keep_subject $utf8 \
  75                 .dotest/msg .dotest/patch <$i >.dotest/info || exit 1
  76             git-stripspace < .dotest/msg > .dotest/msg-clean
  77             ;;
  78     esac
  79     while :; # for fixing up and retry
  80     do
  81         git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$signoff"
  82         case "$?" in
  83         0 | 2 )
  84                 # 2 is a special exit code from applypatch to indicate that
  85                 # the patch wasn't applied, but continue anyway
  86                 ;;
  87         *)
  88                 ret=$?
  89                 if test -f .dotest/.query_apply
  90                 then
  91                         echo >&2 "* Patch failed."
  92                         echo >&2 "* You could fix it up in your editor and"
  93                         echo >&2 "  retry.  If you want to do so, say yes here"
  94                         echo >&2 "  AFTER fixing .dotest/patch up."
  95                         echo >&2 -n "Retry [y/N]? "
  96                         read yesno
  97                         case "$yesno" in
  98                         [Yy]*)
  99                                 continue ;;
 100                         esac
 101                 fi
 102                 exit $ret
 103         esac
 104         break
 105     done
 106     shift
 107 done
 108 # return to pristine
 109 rm -fr .dotest