guilt-new

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006-2013
   4 #
   5
   6 USAGE="[-f] [-s] [-e|-m message] <patchname>"
   7 if [ -z "$GUILT_VERSION" ]; then
   8         echo "Invoking `basename "$0"` directly is no longer supported." >&2
   9         exit 1
  10 fi
  11
  12 _main() {
  13
  14 while [ $# -gt 0 ] ; do
  15         case "$1" in
  16                 -f)
  17                         force=t
  18                         ;;
  19                 -s)
  20                         signoff=t
  21                         ;;
  22                 -e)
  23                         edit=t
  24
  25                         if [ ! -z "$msg" ]; then
  26                                 usage
  27                         fi
  28                         ;;
  29                 -m)
  30                         if [ $# -eq 1 ]; then
  31                                 usage
  32                         fi
  33                         msg="$2"
  34                         shift
  35
  36                         if [ ! -z "$edit" ]; then
  37                                 usage
  38                         fi
  39                         ;;
  40                 *)
  41                         if [ ! -z "$patch" ]; then
  42                                 usage
  43                         fi
  44                         patch="$1"
  45                         ;;
  46         esac
  47         shift
  48 done
  49
  50 if [ -z "$patch" ]; then
  51         die "You must specify a patch name"
  52 fi
  53
  54 if [ -f "$GUILT_DIR/$branch/$patch" ]; then
  55         die "patch '$patch' already exist"
  56 fi
  57
  58 iidx=`wc -l < "$applied"`
  59
  60 # make sure that there are no unapplied changes
  61 if [ -z "$force" ] && ! must_commit_first; then
  62         die "Uncommited changes detected. Refresh first."
  63 fi
  64
  65 if ! valid_patchname "$patch"; then
  66         disp "Patchname is invalid." >&2
  67         die "It must follow the rules in git-check-ref-format(1)."
  68 fi
  69
  70 # create any directories as needed
  71 mkdir_dir=`dirname "$GUILT_DIR/$branch/$patch"`
  72 [ "$mkdir_dir" != "$GUILT_DIR/$branch" ] && mkdir -p "$mkdir_dir"
  73
  74 # create the file with the right contents
  75 (
  76 # did we get a message with -m ?
  77 [ ! -z "$msg" ] && printf "$msg\n\n"
  78
  79 # add a sign-off-by (-s)
  80 [ "$signoff" = "t" ] && printf "Signed-off-by: `git var GIT_COMMITTER_IDENT | sed -e 's/>.*/>/'`\n\n"
  81 ) >> "$GUILT_DIR/$branch/$patch"
  82
  83 # edit -e ?
  84 [ "$edit" = "t" ] && git_editor "$GUILT_DIR/$branch/$patch"
  85
  86 if [ ! -z "$force" ]; then
  87         (
  88                 cd_to_toplevel
  89                 git diff --binary HEAD >> "$GUILT_DIR/$branch/$patch"
  90         )
  91 fi
  92
  93 # insert the patch name into the series file
  94 series_insert_patch "$patch"
  95
  96 # apply the patch
  97 echo "$patch" >> "$applied"
  98 commit "$patch" HEAD
  99
 100 }