Reintegrate

   1 #!/bin/sh
   2
   3 accept_rerere="--rerere-autoupdate" generate=no update= diff= edit= stop_at_cut=
   4 while case "$#,$1" in 0,*) break;; *,-*) ;; esac
   5 do
   6         case "$1" in
   7         -n)     accept_rerere= ;;
   8         -e)     edit=t ;;
   9         -c)     stop_at_cut=1 ;;
  10         -c?*)   stop_at_cut=${1#-c} ;;
  11         -d)     update=${2?"diff with what?"}
  12                 diff=yes
  13                 generate=yes
  14                 shift ;;
  15         -u)     update=${2?"update what?"}
  16                 generate=yes
  17                 shift ;;
  18         *)      generate=yes
  19                 break ;;
  20         esac
  21         shift
  22 done
  23
  24 annotate_merge () {
  25         test -f Meta/whats-cooking.txt || return 0
  26
  27         perl -e '
  28                 my ($branch) = $ARGV[0];
  29                 my ($in_section, $in_desc);
  30                 my @msg = ();
  31                 while (<STDIN>) {
  32                         chomp;
  33                         if (/^\* $branch /) {
  34                                 $in_section = 1;
  35                                 next;
  36                         }
  37                         last if (/^[-*\[]/ && $in_section);
  38                         next unless $in_section;
  39                         s/^\s+//;
  40                         if (/^$/) {
  41                                 $in_desc = 1;
  42                         }
  43                         next unless ($in_section && $in_desc);
  44                         push @msg, "$_\n";
  45                 }
  46
  47                 if ($in_section && @msg) {
  48                         open(my $fh, "-|", qw(git cat-file commit HEAD));
  49                         my @original = (<$fh>);
  50                         my @final;
  51                         $in_section = 0;
  52                         for (@original) {
  53                                 if (!$in_section) {
  54                                         $in_section = 1 if (/^$/);
  55                                         next;
  56                                 }
  57                                 push @final, $_;
  58                                 if (/^$/ && $in_section == 1) {
  59                                         push @final, @msg;
  60                                         push @final, "\n";
  61                                         $in_section = 2;
  62                                 }
  63                         }
  64                         close $fh;
  65                         open($fh, "|-", qw(git commit --amend -F -));
  66                         print $fh @final;
  67                         close $fh;
  68                 }
  69         ' <Meta/whats-cooking.txt "$1"
  70 }
  71
  72 case "$generate" in
  73 no)
  74         accept_rerere () {
  75                 if ! git write-tree 2>/dev/null >/dev/null
  76                 then
  77                         git rerere remaining
  78                         return 1
  79                 else
  80                         EDITOR=: git commit --no-verify
  81                         echo "Accepted previous resolution"
  82                         return 0
  83                 fi
  84         }
  85
  86         cut_seen=0
  87         while read branch eh
  88         do
  89                 case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
  90                 if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
  91                 then
  92                         continue
  93                 fi
  94
  95                 case "$branch" in '#'* | '') continue ;; esac
  96
  97                 case "$eh" in
  98                 "" | "#"*)
  99                         echo >&2 "* $branch"
 100
 101                         save=$(git rev-parse --verify HEAD)
 102                         tip=$(git rev-parse --verify "$branch^0")
 103                         mb=$(git merge-base "$tip" "$save")
 104                         test "$mb" = "$tip" && continue
 105
 106                         EDITOR=: git merge $accept_rerere --edit "$branch" ||
 107                         accept_rerere ||
 108                         exit
 109
 110                         annotate_merge "$branch" || exit
 111                         test -z "$edit" ||
 112                         git commit --amend || exit
 113
 114                         this=$(git rev-parse --verify HEAD)
 115                         if test "$this" = "$save"
 116                         then
 117                                 :
 118                         elif git show-ref -q --verify "refs/merge-fix/$branch"
 119                         then
 120                                 echo >&2 "Fixing up the merge"
 121                                 git cherry-pick --no-commit "refs/merge-fix/$branch" &&
 122                                 EDITOR=: git commit --amend -a || exit
 123                         fi
 124                         ;;
 125                 pick" "*)
 126                         echo >&2 "* $eh"
 127                         git cherry-pick "$branch" || exit ;;
 128                 *) echo >&2 "Eh? $branch $eh"; exit ;;
 129                 esac
 130         done
 131         exit
 132 esac
 133
 134 if test -n "$update" && test $# = 0
 135 then
 136         set x $(sed -n -e '2s/^# //p' <"$update") &&
 137         shift
 138 fi
 139
 140 # Generation (or updating)
 141
 142 x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 143 x40="$x40$x40$x40$x40$x40$x40$x40$x40"
 144 LF='
 145 '
 146
 147 show_merge () {
 148         case "$msg" in
 149         "Merge branch '"*"'"*)
 150                 branch=$(expr "$msg" : "Merge branch '\(.*\)'")
 151                 merge_hier=heads/
 152                 ;;
 153         "Merge remote branch '"*"'"*)
 154                 branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
 155                 merge_hier=
 156                 ;;
 157         *)
 158                 echo 2>&1 "Huh?: $msg"
 159                 return
 160                 ;;
 161         esac &&
 162         tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&
 163         merged=$(git name-rev --refs="refs/$merge_hier$branch" "$other" 2>/dev/null) &&
 164         merged=$(expr "$merged" : "$x40 \(.*\)") &&
 165         test "$merged" != undefined || {
 166                 other=$(git log -1 --pretty='format:%s' $other) &&
 167                 merged="$branch :rebased? $other"
 168         }
 169 }
 170
 171 show_pick () {
 172         merged="$(git rev-parse --verify "$commit") pick $msg"
 173 }
 174
 175 generate () {
 176         PROGRAM=$1
 177         shift
 178         echo '#!/bin/sh'
 179         echo "# $1"
 180         echo 'case "$#,$1" in'
 181         echo '1,-u|1,-d)'
 182         echo "  exec $PROGRAM" '"$1" "$0"'
 183         echo 'esac'
 184         echo "$PROGRAM" '"$@" <<\EOF'
 185         git log --no-decorate --pretty=oneline --first-parent "$1" |
 186         {
 187                 series=
 188                 while read commit msg
 189                 do
 190                         if other=$(git rev-parse -q --verify "$commit^2")
 191                         then
 192                                 show_merge
 193                         else
 194                                 show_pick
 195                         fi
 196
 197                         if test -z "$series"
 198                         then
 199                                 series="$merged"
 200                         else
 201                                 series="$merged$LF$series"
 202                         fi
 203                 done
 204                 echo "$series"
 205         }
 206         echo EOF
 207 }
 208
 209 if test -z "$update"
 210 then
 211         generate "$0" "$@"
 212 elif test -z "$diff"
 213 then
 214         generate "$0" "$@" | diff -u "$update" -
 215         if test $? = 0
 216         then
 217                 echo >&2 "No changes."
 218         else
 219                 echo >&2 -n "Update [y/N]? "
 220                 read yesno
 221                 case "$yesno" in
 222                 [Yy]*)
 223                         generate "$0" "$@" |
 224                         sed -e 's/ :rebased?.*//' >"$update" ;;
 225                 *)
 226                         echo >&2 "No update then." ;;
 227                 esac
 228         fi
 229 else
 230         generate "$0" "$@" | diff -u "$update" -
 231 fi