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
  96                 '###')
  97                         echo >&2 "$branch"
  98                         continue ;;
  99                 '#'* | '')
 100                         continue ;;
 101                 esac
 102
 103                 case "$eh" in
 104                 "" | "#"*)
 105                         echo >&2 "* $branch"
 106
 107                         save=$(git rev-parse --verify HEAD)
 108                         tip=$(git rev-parse --verify "$branch^0")
 109                         mb=$(git merge-base "$tip" "$save")
 110                         test "$mb" = "$tip" && continue
 111
 112                         EDITOR=: git merge $accept_rerere --edit "$branch" ||
 113                         accept_rerere ||
 114                         exit
 115
 116                         annotate_merge "$branch" || exit
 117                         test -z "$edit" ||
 118                         git commit --amend || exit
 119
 120                         this=$(git rev-parse --verify HEAD)
 121                         if test "$this" = "$save"
 122                         then
 123                                 :
 124                         elif git show-ref -q --verify "refs/merge-fix/$branch"
 125                         then
 126                                 echo >&2 "Fixing up the merge"
 127                                 git cherry-pick --no-commit "refs/merge-fix/$branch" &&
 128                                 EDITOR=: git commit --amend -a || exit
 129                         fi
 130                         ;;
 131                 pick" "*)
 132                         echo >&2 "* $eh"
 133                         git cherry-pick "$branch" || exit ;;
 134                 *) echo >&2 "Eh? $branch $eh"; exit ;;
 135                 esac
 136         done
 137         exit
 138 esac
 139
 140 if test -n "$update" && test $# = 0
 141 then
 142         set x $(sed -n -e '2s/^# //p' <"$update") &&
 143         shift
 144 fi
 145
 146 # Generation (or updating)
 147
 148 x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 149 x40="$x40$x40$x40$x40$x40$x40$x40$x40"
 150 LF='
 151 '
 152
 153 show_merge () {
 154         case "$msg" in
 155         "Merge branch '"*"'"*)
 156                 branch=$(expr "$msg" : "Merge branch '\(.*\)'")
 157                 merge_hier=heads/
 158                 ;;
 159         "Merge remote branch '"*"'"*)
 160                 branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
 161                 merge_hier=
 162                 ;;
 163         *)
 164                 echo 2>&1 "Huh?: $msg"
 165                 return
 166                 ;;
 167         esac &&
 168         tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&
 169         merged=$(git name-rev --refs="refs/$merge_hier$branch" "$other" 2>/dev/null) &&
 170         merged=$(expr "$merged" : "$x40 \(.*\)") &&
 171         test "$merged" != undefined || {
 172                 other=$(git log -1 --pretty='format:%s' $other) &&
 173                 merged="$branch :rebased? $other"
 174         }
 175 }
 176
 177 show_pick () {
 178         merged="$(git rev-parse --verify "$commit") pick $msg"
 179 }
 180
 181 generate () {
 182         PROGRAM=$1
 183         shift
 184         echo '#!/bin/sh'
 185         echo "# $1"
 186         echo 'case "$#,$1" in'
 187         echo '1,-u|1,-d)'
 188         echo "  exec $PROGRAM" '"$1" "$0"'
 189         echo 'esac'
 190         echo "$PROGRAM" '"$@" <<\EOF'
 191         git log --no-decorate --pretty=oneline --first-parent "$1" |
 192         {
 193                 series=
 194                 while read commit msg
 195                 do
 196                         if other=$(git rev-parse -q --verify "$commit^2")
 197                         then
 198                                 show_merge
 199                         else
 200                                 show_pick
 201                         fi
 202
 203                         if test -z "$series"
 204                         then
 205                                 series="$merged"
 206                         else
 207                                 series="$merged$LF$series"
 208                         fi
 209                 done
 210                 echo "$series"
 211         }
 212         echo EOF
 213 }
 214
 215 if test -z "$update"
 216 then
 217         generate "$0" "$@"
 218 elif test -z "$diff"
 219 then
 220         generate "$0" "$@" | diff -u "$update" -
 221         if test $? = 0
 222         then
 223                 echo >&2 "No changes."
 224         else
 225                 echo >&2 -n "Update [y/N]? "
 226                 read yesno
 227                 case "$yesno" in
 228                 [Yy]*)
 229                         generate "$0" "$@" |
 230                         sed -e 's/ :rebased?.*//' >"$update" ;;
 231                 *)
 232                         echo >&2 "No update then." ;;
 233                 esac
 234         fi
 235 else
 236         generate "$0" "$@" | diff -u "$update" -
 237 fi