guilt-new

   1 #!/bin/bash
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006, 2007
   4 #
   5
   6 USAGE="[-s] [-e|-m message] <patchname>"
   7 . guilt
   8
   9 if [ $# -lt 1 -o $# -gt 4 ]; then
  10         usage
  11 fi
  12
  13 while [ $# -gt 0 ] ; do
  14         case "$1" in
  15                 -s)
  16                         signoff=t
  17                         ;;
  18                 -e)
  19                         edit=t
  20
  21                         if [ ! -z "$msg" ]; then
  22                                 usage
  23                         fi
  24                         ;;
  25                 -m)
  26                         msg="$2"
  27                         shift
  28
  29                         if [ ! -z "$edit" ]; then
  30                                 usage
  31                         fi
  32                         ;;
  33                 *)
  34                         if [ ! -z "$patch" ]; then
  35                                 usage
  36                         fi
  37                         patch="$1"
  38                         ;;
  39         esac
  40         shift
  41 done
  42
  43 if [ -z "$patch" ]; then
  44         die "You must specify a patch name"
  45 fi
  46
  47 if [ -f "$GUILT_DIR/$branch/$patch" ]; then
  48         die "patch '$patch' already exist"
  49 fi
  50
  51 iidx=`wc -l < $applied`
  52
  53 # make sure that there are no unapplied changes
  54 if ! must_commit_first; then
  55         die "Uncommited changes detected. Refresh first."
  56 fi
  57
  58 if ! valid_patchname "$patch"; then
  59         echo "Patchname is invalid." >&2
  60         die "it cannot begin with '/', './' or '../', or contain /./ or /../"
  61 fi
  62
  63 # create any directories as needed
  64 [ "`dirname $patch`" != "." ] && mkdir -p `dirname $GUILT_DIR/$branch/$patch`
  65
  66 # create the file with the right contents
  67 (
  68 # did we get a message with -m ?
  69 [ ! -z "$msg" ] && echo "$msg"
  70
  71 # add a sign-off-by (-s)
  72 [ "$signoff" = "t" ] && echo -e "\nSigned-off-by: `git-var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`"
  73 ) >> $GUILT_DIR/$branch/$patch
  74
  75 # edit -e ?
  76 [ "$edit" = "t" ] && $editor $GUILT_DIR/$branch/$patch
  77
  78 # insert the patch name into the series file
  79 series_insert_patch $patch
  80
  81 # apply the patch
  82 push_patch $patch