guilt-new

   1 #!/bin/bash
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006, 2007
   4 #
   5
   6 source "`dirname $0`/guilt"
   7
   8 USAGE="$USAGE [-s] [-m message] <patchname>"
   9
  10 if [ $# -lt 1 -o $# -gt 4 ]; then
  11         print_usage
  12         exit 1
  13 fi
  14
  15 while [ $# -gt 0 ] ; do
  16         case "$1" in
  17                 -s)
  18                         signoff=t
  19                         ;;
  20                 -m)
  21                         msg="$2"
  22                         shift
  23                         ;;
  24                 *)
  25                         if [ ! -z "$patch" ]; then
  26                                 print_usage
  27                                 exit 1
  28                         fi
  29                         patch="$1"
  30                         ;;
  31         esac
  32         shift
  33 done
  34
  35 if [ -z "$patch" ]; then
  36         print_usage
  37         echo "You must specify a patch name"
  38         exit 1
  39 fi
  40
  41 iidx=`wc -l < $applied`
  42
  43 # make sure that there are no unapplied changes
  44 if ! must_commit_first; then
  45         echo "Uncommited changes detected. Refresh first."
  46         exit 1
  47 fi
  48
  49 # create any directories as needed
  50 [ "`dirname $patch`" != "." ] && mkdir -p `dirname $GUILT_DIR/$branch/$patch`
  51
  52 # create the empty patch file
  53 touch $GUILT_DIR/$branch/$patch
  54
  55 [ ! -z "$msg" ] && echo "$msg" > $GUILT_DIR/$branch/$patch
  56
  57 [ "$signoff" = "t" ] && echo -e "\nSigned-off-by: `git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`" >> $GUILT_DIR/$branch/$patch
  58
  59 top=`get_top`
  60
  61 if [ ! -z "$top" ]; then
  62         sed -i -e "s,^$top\$,$top\n$patch," $series
  63 else
  64         echo "$patch" > $series.tmp
  65         cat $series >> $series.tmp
  66         mv $series.tmp $series
  67 fi
  68
  69 # apply the patch
  70 push_patch $patch