ML

   1 #!/bin/sh
   2 # Merge later...
   3
   4 target=maint
   5
   6 # Read from RelNotes and find mergeable topics
   7 search_topics () {
   8         tmp=/tmp/ML.$$
   9         trap 'rm -f "$tmp"' 0
  10         git rev-list --parents --first-parent $target..master >"$tmp"
  11
  12         x40='[0-9a-f]'
  13         x40="$x40$x40$x40$x40$x40"
  14         x40="$x40$x40$x40$x40$x40$x40$x40$x40"
  15         sed -n -e 's/^   (merge \([0-9a-f]*\) \([^ ]*\) later to maint.*/\1 \2/p' |
  16         while read sha1 topic
  17         do
  18                 if ! full_sha1=$(git rev-parse --verify "$sha1")
  19                 then
  20                         echo >&2 "Not found: $sha1 $topic"
  21                         continue
  22                 fi
  23
  24                 comment=
  25                 if ! git show-ref --quiet --verify "refs/heads/$topic"
  26                 then
  27                         comment="$topic gone"
  28                         tip=$full_sha1 topic=$sha1
  29                 elif tip=$(git rev-parse --verify "refs/heads/$topic") &&
  30                      test "$tip" != "$full_sha1"
  31                 then
  32                         echo >&2 "$tip moved from $sha1"
  33                         continue
  34                 fi
  35
  36                 ago= lg=0
  37                 fp=$(
  38                     sed -ne "s/^\($x40\) $x40 $tip"'$/\1/p' "$tmp"
  39                 ) &&
  40                 test -n "$fp" &&
  41                 ago=$(
  42                     git show -s --format='%ar' $fp
  43                 ) &&
  44                 lg=$(git log --oneline $target..$tip | wc -l)
  45                 if test $lg != 0
  46                 then
  47                         echo "$topic # $lg${ago+ ($ago)}${comment+ $comment}"
  48                 else
  49                         echo "# $topic already merged${ago+ ($ago)}${comment+ $comment}"
  50                 fi
  51         done
  52 }
  53
  54 while   case "$#,$1" in
  55         0,*)
  56                 break ;;
  57         *,-t)
  58                 target=${2?"-t target???"}
  59                 git show-ref --quiet --verify "refs/heads/$target" || {
  60                         echo >&2 "$target: no such branch"
  61                         exit 1
  62                 }
  63                 shift ;;
  64         *)
  65                 break ;;
  66         esac
  67 do
  68         shift
  69 done
  70
  71 case $# in
  72 0)
  73         search_topics
  74         exit $?
  75         ;;
  76 esac
  77
  78 for topic
  79 do
  80         sha1=$(git rev-parse --short $topic)
  81         echo "   (merge $sha1 $topic later to maint)."
  82 done
  83