gq.lib

   1 #!/bin/bash
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006
   4 #
   5
   6 function find_git_dir_nice
   7 {
   8         git-rev-parse --git-dir
   9 }
  10
  11 function find_git_dir
  12 {
  13         d=`find_git_dir_nice`
  14
  15         [ $? -ne 0 -o -z "$d" ] && exit 1
  16
  17         echo "$d"
  18 }
  19
  20 function get_branch
  21 {
  22         git-symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
  23 }
  24
  25 function get_branch_verify
  26 {
  27         b=`get_branch`
  28
  29         [ ! -d "$GIT_DIR/patches/$b" ] && echo "Branch $b is not initialized, try gq-init" >&2 && exit 1
  30         [ ! -f "$GIT_DIR/patches/$b/series" ] && echo "Branch $b does not have a series file" >&2 && exit 1
  31         [ ! -f "$GIT_DIR/patches/$b/status" ] && echo "Branch $b does not have a status file" >&2 && exit 1
  32         [ -f "$GIT_DIR/patches/$b/applied" ] && echo "Warning: Branch $b has 'applied' file - gq is not compatible with stgit" >&2
  33
  34         echo "$b"
  35 }
  36
  37 function get_top
  38 {
  39         tail -1 $GQ_DIR/$branch/status
  40 }
  41
  42 function get_prev
  43 {
  44         n=`wc -l < $GQ_DIR/$branch/status`
  45         n=`expr $n - 1`
  46
  47         idx=0
  48         for p in `cat $GQ_DIR/$branch/status`; do
  49                 idx=`expr $idx + 1`
  50                 [ $idx -lt $n ] && continue
  51                 [ $idx -gt $n ] && break
  52
  53                 echo $p
  54         done
  55 }
  56
  57 function refresh_patch
  58 {
  59         rev="$1"
  60         fname="$GQ_DIR/$branch/$2"
  61
  62         # grab the commit message
  63         git-cat-file -p $rev | awk 'BEGIN{ok=0}{if (ok==1) print $0}/^$/{ok=1}' > "$fname.tmp"
  64
  65         lines=`wc -l < "$fname.tmp"`
  66         tline=`cat "$fname.tmp"`
  67         if [ $lines -eq 1 -a "$tline" = "patch $2" ]; then
  68                 # no real commit message
  69                 echo -n "" > "$fname.tmp"
  70         else
  71                 # real commit message, separate by an empty line
  72                 echo "" >> "$fname.tmp"
  73         fi
  74
  75         # get the diff
  76         git-diff $rev^ $rev >> "$fname.tmp"
  77
  78         mv "$fname.tmp" "$fname"
  79 }
  80
  81 function index_update_magic
  82 {
  83         while read l; do
  84                 fil=`echo $l | cut -d: -f 2`
  85                 git-update-index --add --remove "$fil"
  86         done
  87 }
  88
  89 # usage: push_patch patch
  90 function push_patch
  91 {
  92         local p="$GQ_DIR/$branch/$1"
  93         local pname="$1"
  94
  95         git-apply --reject $p
  96         local bail=$?
  97
  98         ( git-apply --numstat $p | awk '{print "changed:" $3}';
  99         #git-apply --summary $p | awk '
 100         #       /^ (create|delete)/{print $1 ":" $4}
 101         #       /^ mode change/{print "mode:" $6}'
 102         )| index_update_magic
 103
 104         # grab a commit message out of the patch
 105         cat $p | awk 'BEGIN{ok=1}/^(diff|---)/{ok=0}{if (ok==1) print $0}' > /tmp/gq.msg.$$
 106
 107         # make a default commit message if patch doesn't contain one
 108         [ ! -s /tmp/gq.msg.$$ ] && echo "patch $pname" > /tmp/gq.msg.$$
 109
 110         # commit
 111         local treeish=`git-write-tree`
 112         local commitish=`git-commit-tree $treeish -p HEAD < /tmp/gq.msg.$$`
 113         echo $commitish > $GIT_DIR/`git-symbolic-ref HEAD`
 114
 115         rm -f /tmp/gq.msg.$$
 116
 117         return $bail
 118 }
 119
 120 function must_commit_first
 121 {
 122         [ `git-diff-files | wc -l` -eq 0 ]
 123         return $?
 124 }