gq.lib

   1 #!/bin/bash
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006
   4 #
   5
   6 function find_git_dir
   7 {
   8         local d=`git-rev-parse --git-dir`
   9
  10         if [ $? -ne 0 -o -z "$d" ]; then
  11                 echo "Not a git repository" >&2
  12                 return 1
  13         fi
  14
  15         echo "$d"
  16 }
  17
  18 function get_branch
  19 {
  20         git-symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
  21 }
  22
  23 function verify_branch
  24 {
  25         local b=$branch
  26
  27         [ ! -d "$GIT_DIR/patches" ] &&
  28                 echo "Patches directory doesn't exist, try gq-init" >&2 &&
  29                 return 1
  30         [ ! -d "$GIT_DIR/patches/$b" ] &&
  31                 echo "Branch $b is not initialized, try gq-init" >&2 &&
  32                 return 1
  33         [ ! -f "$GIT_DIR/patches/$b/series" ] &&
  34                 echo "Branch $b does not have a series file" >&2 &&
  35                 return 1
  36         [ ! -f "$GIT_DIR/patches/$b/status" ] &&
  37                 echo "Branch $b does not have a status file" >&2 &&
  38                 return 1
  39         [ -f "$GIT_DIR/patches/$b/applied" ] &&
  40                 echo "Warning: Branch $b has 'applied' file - gq is not compatible with stgit" >&2 &&
  41                 return 1
  42
  43         return 0
  44 }
  45
  46 function get_top
  47 {
  48         tail -1 $GQ_DIR/$branch/status
  49 }
  50
  51 function get_prev
  52 {
  53         local n=`wc -l < $GQ_DIR/$branch/status`
  54         local n=`expr $n - 1`
  55
  56         local idx=0
  57         for p in `cat $GQ_DIR/$branch/status`; do
  58                 idx=`expr $idx + 1`
  59                 [ $idx -lt $n ] && continue
  60                 [ $idx -gt $n ] && break
  61
  62                 echo $p
  63         done
  64 }
  65
  66 function get_series
  67 {
  68         # ignore all lines matching:
  69         #       - empty lines
  70         #       - whitespace only
  71         #       - optional whitespace followed by '#' followed by more
  72         #         optional whitespace
  73         grep -ve '^[[:space:]]*\(#.*\)*$' < $series
  74 }
  75
  76 # usage: index_update_magic
  77 function index_update_magic
  78 {
  79         while read l; do
  80                 fil=`echo $l | cut -d: -f 2`
  81                 git-update-index --add --remove "$fil"
  82         done
  83 }
  84
  85 # usage: do_get_header patchfile
  86 function do_get_header
  87 {
  88         cat $1 | awk 'BEGIN{ok=1}/^(diff|---)/{ok=0}{if (ok==1) print $0}'
  89 }
  90
  91 # usage: pop_patch
  92 function pop_patch
  93 {
  94         git reset --hard HEAD^
  95
  96         head -n -1 < $applied > $applied.tmp
  97         mv $applied{.tmp,}
  98 }
  99
 100 # usage: push_patch patchname
 101 function push_patch
 102 {
 103         local p="$GQ_DIR/$branch/$1"
 104         local pname="$1"
 105
 106         local bail=0
 107
 108         # apply the patch if and only if there is something to apply
 109         if [ `wc -l < $p` -gt 0 ]; then
 110                 git-apply --reject $p > /dev/null 2> /tmp/gq.log.$$
 111                 bail=$?
 112                 [ $bail -ne 0 ] && cat /tmp/gq.log.$$
 113
 114                 [ $bail -ne 0 ] && cat /tmp/gq.log.$$ >&2
 115
 116                 ( git-apply --numstat $p | awk '{print "changed:" $3}';
 117                 #git-apply --summary $p | awk '
 118                 #       /^ (create|delete)/{print $1 ":" $4}
 119                 #       /^ mode change/{print "mode:" $6}'
 120                 )| index_update_magic
 121         fi
 122
 123         # grab a commit message out of the patch
 124         do_get_header $p > /tmp/gq.msg.$$
 125
 126         # make a default commit message if patch doesn't contain one
 127         [ ! -s /tmp/gq.msg.$$ ] && echo "patch $pname" > /tmp/gq.msg.$$
 128
 129         # commit
 130         local treeish=`git-write-tree`
 131         local commitish=`git-commit-tree $treeish -p HEAD < /tmp/gq.msg.$$`
 132         echo $commitish > $GIT_DIR/`git-symbolic-ref HEAD`
 133
 134         rm -f /tmp/gq.msg.$$ /tmp/gq.log.$$
 135
 136         return $bail
 137 }
 138
 139 # usage: must_commit_first
 140 function must_commit_first
 141 {
 142         [ `git-diff-files | wc -l` -eq 0 ]
 143         return $?
 144 }
 145
 146 # usage: refresh_patch patchname
 147 function refresh_patch
 148 {
 149         local p="$GQ_DIR/$branch/$1"
 150
 151         git-diff-files --name-only | (while read n; do git-update-index $n ; done)
 152
 153         # get the patch header
 154         do_get_header $p > /tmp/gq.diff.$$
 155
 156         # get the new patch
 157         git-diff HEAD^ >> /tmp/gq.diff.$$
 158
 159         # drop the current commit
 160         git-reset --hard HEAD^
 161
 162         # move the new patch in
 163         mv $p $p.prev
 164         mv /tmp/gq.diff.$$ $p
 165
 166         push_patch $1
 167 }
 168
 169 #
 170 # The following gets run every time this file is source'd
 171 #
 172
 173 export GIT_DIR=`find_git_dir`
 174 [ $? -ne 0 ] && exit 1
 175
 176 GQ_DIR="$GIT_DIR/patches"
 177
 178 branch=`get_branch`
 179
 180 # most of the time we want to verify that the repo's branch has been
 181 # initialized, but every once in a blue moon (e.g., we want to run gq-init),
 182 # we must avoid the checks
 183 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 184         verify_branch || exit 1
 185 fi
 186
 187 # very useful files
 188 series="$GQ_DIR/$branch/series"
 189 applied="$GQ_DIR/$branch/status"
 190