guilt

   1 #!/bin/bash
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006, 2007
   4 #
   5
   6 GUILT_VERSION="0.15"
   7
   8 if [ `basename $0` = "guilt" ]; then
   9         # being run as standalone
  10
  11         # by default, we shouldn't fail
  12         fail=0
  13
  14         if [ $# -ne 0 ]; then
  15                 # take first arg, and try to execute it
  16
  17                 cmd="$1"
  18                 dir=`dirname $0`
  19
  20                 if [ ! -x "$dir/guilt-$cmd" ]; then
  21                         echo "Command $cmd not found" >&2
  22                         echo "" >&2
  23                         fail=1
  24                 else
  25                         shift
  26                         exec "$dir/guilt-$cmd" "$@"
  27
  28                         # this is not reached because of the exec
  29                         echo "Exec failed! Something is terribly wrong!" >&2
  30                         exit 1
  31                 fi
  32         fi
  33
  34         # no args passed or invalid command entered, just output help summary
  35
  36         echo "Guilt v$GUILT_VERSION"
  37         echo ""
  38         echo "Pick a command:"
  39         for x in `dirname $0`/guilt-*; do
  40                 [ -x $x ] && echo -e "\t`basename $x`"
  41         done
  42
  43         echo ""
  44         echo "Example:"
  45         echo -e "\tguilt-push"
  46         echo "or"
  47         echo -e "\tguilt push"
  48
  49         # now, let's exit
  50         exit $fail
  51 fi
  52
  53 ########
  54
  55 #
  56 # Library goodies
  57 #
  58
  59 function find_git_dir
  60 {
  61         local d=`git-rev-parse --git-dir`
  62
  63         if [ $? -ne 0 -o -z "$d" ]; then
  64                 echo "Not a git repository" >&2
  65                 return 1
  66         fi
  67
  68         echo "$d"
  69 }
  70
  71 function get_branch
  72 {
  73         git-symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
  74 }
  75
  76 function verify_branch
  77 {
  78         local b=$branch
  79
  80         [ ! -d "$GIT_DIR/patches" ] &&
  81                 echo "Patches directory doesn't exist, try guilt-init" >&2 &&
  82                 return 1
  83         [ ! -d "$GIT_DIR/patches/$b" ] &&
  84                 echo "Branch $b is not initialized, try guilt-init" >&2 &&
  85                 return 1
  86         [ ! -f "$GIT_DIR/patches/$b/series" ] &&
  87                 echo "Branch $b does not have a series file" >&2 &&
  88                 return 1
  89         [ ! -f "$GIT_DIR/patches/$b/status" ] &&
  90                 echo "Branch $b does not have a status file" >&2 &&
  91                 return 1
  92         [ -f "$GIT_DIR/patches/$b/applied" ] &&
  93                 echo "Warning: Branch $b has 'applied' file - guilt is not compatible with stgit" >&2 &&
  94                 return 1
  95
  96         return 0
  97 }
  98
  99 function get_top
 100 {
 101         tail -1 $GUILT_DIR/$branch/status | cut -d: -f 2-
 102 }
 103
 104 function get_prev
 105 {
 106         local n=`wc -l < $GUILT_DIR/$branch/status`
 107         local n=`expr $n - 1`
 108
 109         local idx=0
 110         for p in `cat $GUILT_DIR/$branch/status`; do
 111                 idx=`expr $idx + 1`
 112                 [ $idx -lt $n ] && continue
 113                 [ $idx -gt $n ] && break
 114
 115                 echo $p
 116         done
 117 }
 118
 119 function get_series
 120 {
 121         # ignore all lines matching:
 122         #       - empty lines
 123         #       - whitespace only
 124         #       - optional whitespace followed by '#' followed by more
 125         #         optional whitespace
 126         grep -ve '^[[:space:]]*\(#.*\)*$' < $series
 127 }
 128
 129 # usage: index_update_magic
 130 function index_update_magic
 131 {
 132         while read l; do
 133                 fil=`echo $l | cut -d: -f 2`
 134                 git-update-index --add --remove "$fil"
 135         done
 136 }
 137
 138 # usage: do_get_header patchfile
 139 function do_get_header
 140 {
 141         # The complexity arises from the fact that we want to ignore the
 142         # From line and the empty line after it if it exists
 143
 144         # 2nd line skips the From line
 145         # 3rd line skips the empty line right after a From line
 146         do_get_full_header $1 | awk '
 147 BEGIN{skip=0}
 148 /^From:/{skip=1; next}
 149 /^[ \t\f\n\r\v]*$/ && (skip==1){skip=0; next}
 150 {print $0}
 151 END{}
 152 '
 153 }
 154
 155 # usage: do_get_full_header patchfile
 156 function do_get_full_header
 157 {
 158         # 2nd line checks for the begining of a patch
 159         # 3rd line outputs the line if it didn't get pruned by the above rules
 160         cat $1 | awk '
 161 BEGIN{ok=1}
 162 /^(diff|---)/{ok=0}
 163 (ok==1){print $0}
 164 END{}
 165 '
 166 }
 167
 168 # usage: pop_patch
 169 function pop_patch
 170 {
 171         cd $TOP_DIR
 172
 173         git reset --hard HEAD^
 174
 175         head -n -1 < $applied > $applied.tmp
 176         mv $applied{.tmp,}
 177
 178         cd - 2>&1 >/dev/null
 179 }
 180
 181 # usage: push_patch patchname
 182 function push_patch
 183 {
 184         local p="$GUILT_DIR/$branch/$1"
 185         local pname="$1"
 186
 187         local bail=0
 188
 189         cd $TOP_DIR
 190
 191         # apply the patch if and only if there is something to apply
 192         if [ `wc -l < $p` -gt 0 ]; then
 193                 git-apply --reject $p > /dev/null 2> /tmp/guilt.log.$$
 194                 bail=$?
 195
 196                 [ $bail -ne 0 ] && cat /tmp/guilt.log.$$ >&2
 197
 198                 ( git-apply --numstat $p | awk '{print "changed:" $3}';
 199                 #git-apply --summary $p | awk '
 200                 #       /^ (create|delete)/{print $1 ":" $4}
 201                 #       /^ mode change/{print "mode:" $6}'
 202                 )| index_update_magic
 203         fi
 204
 205         # grab a commit message out of the patch
 206         do_get_header $p > /tmp/guilt.msg.$$
 207
 208         # make a default commit message if patch doesn't contain one
 209         [ ! -s /tmp/guilt.msg.$$ ] && echo "patch $pname" > /tmp/guilt.msg.$$
 210
 211         # extract a From line from the patch header, and set
 212         # GIT_AUTHOR_{NAME,EMAIL}
 213         local author_str=`cat $p | grep -e '^From: ' | sed -e 's/^From: //'`
 214         if [ ! -z "$author_str" ]; then
 215                 local backup_author_name="$GIT_AUTHOR_NAME"
 216                 local backup_author_email="$GIT_AUTHOR_EMAIL"
 217                 export GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
 218                 export GIT_AUTHOR_EMAIL=`echo $author_str | sed -e 's/[^<]*//'`
 219         fi
 220
 221         # commit
 222         local treeish=`git-write-tree`
 223         local commitish=`git-commit-tree $treeish -p HEAD < /tmp/guilt.msg.$$`
 224         echo $commitish > $GIT_DIR/`git-symbolic-ref HEAD`
 225
 226         # mark patch as applied
 227         echo "$commitish:$pname" >> $applied
 228
 229         # restore original GIT_AUTHOR_{NAME,EMAIL}
 230         if [ ! -z "$author_str" ]; then
 231                 if [ ! -z "$backup_author_name" ]; then
 232                         export GIT_AUTHOR_NAME="$backup_author_name"
 233                 else
 234                         unset GIT_AUTHOR_NAME
 235                 fi
 236
 237                 if [ ! -z "$backup_author_name" ]; then
 238                         export GIT_AUTHOR_EMAIL="$backup_author_email"
 239                 else
 240                         unset GIT_AUTHOR_EMAIL
 241                 fi
 242         fi
 243
 244         rm -f /tmp/guilt.msg.$$ /tmp/guilt.log.$$
 245
 246         cd - 2>&1 >/dev/null
 247
 248         return $bail
 249 }
 250
 251 # usage: must_commit_first
 252 function must_commit_first
 253 {
 254         [ `git-diff-files | wc -l` -eq 0 ]
 255         return $?
 256 }
 257
 258 # usage: refresh_patch patchname
 259 function refresh_patch
 260 {
 261         local p="$GUILT_DIR/$branch/$1"
 262
 263         cd $TOP_DIR
 264
 265         git-diff-files --name-only | (while read n; do git-update-index $n ; done)
 266
 267         # get the patch header
 268         do_get_full_header $p > /tmp/guilt.diff.$$
 269
 270         # get the new patch
 271         git-diff HEAD^ >> /tmp/guilt.diff.$$
 272
 273         # drop the current commit
 274         git-reset --hard HEAD^
 275
 276         # move the new patch in
 277         mv $p $p.prev
 278         mv /tmp/guilt.diff.$$ $p
 279
 280         cd - 2>&1 >/dev/null
 281
 282         # push_patch does it's own cd $TOP_DIR
 283         push_patch $1
 284 }
 285
 286 #
 287 # The following gets run every time this file is source'd
 288 #
 289
 290 GIT_DIR=`find_git_dir`
 291 [ $? -ne 0 ] && exit 1
 292
 293 TOP_DIR=`git-rev-parse --show-cdup`
 294 if [ -z "$TOP_DIR" ]; then
 295         TOP_DIR="./"
 296 fi
 297
 298 GUILT_DIR="$GIT_DIR/patches"
 299
 300 branch=`get_branch`
 301
 302 # most of the time we want to verify that the repo's branch has been
 303 # initialized, but every once in a blue moon (e.g., we want to run guilt-init),
 304 # we must avoid the checks
 305 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 306         verify_branch || exit 1
 307 fi
 308
 309 # very useful files
 310 series="$GUILT_DIR/$branch/series"
 311 applied="$GUILT_DIR/$branch/status"
 312