guilt-fold

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006, 2007
   4 #
   5
   6 USAGE="[-k] <patchname>"
   7 . `dirname $0`/guilt
   8
   9 if [ "$1" = "-k" ]; then
  10         keep=t
  11         shift
  12 fi
  13
  14 if [ $# -ne 1 ]; then
  15         usage
  16 fi
  17
  18 patch="$1"
  19 if [ -z "$patch" ]; then
  20         die "No patch name supplied."
  21 fi
  22
  23 # make sure it is a file
  24 if [ ! -f "$GUILT_DIR/$branch/$patch" ]; then
  25         die "Patch $patch does not exist."
  26 fi
  27
  28 # make sure that there are no unapplied changes
  29 if ! must_commit_first; then
  30         die "Uncommited changes detected. Refresh first."
  31 fi
  32
  33 # make sure it is not applied
  34 pline=`cat $applied | grep -e "^$patch$"`
  35 if [ ! -z "$pline" ]; then
  36         die "Patch is applied. Pop the patch first."
  37 fi
  38
  39 fold_patch "$patch"
  40
  41 # back it up just in case :)
  42 [ -z "$keep" ] && mv "$GUILT_DIR/$branch/$patch" "$GUILT_DIR/$branch/$patch~"