guilt

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006-2011
   4 #
   5
   6 GUILT_VERSION="0.35"
   7 GUILT_NAME="Gloria"
   8
   9 # If the first argument is one of the below, display the man page instead of
  10 # the rather silly and mostly useless usage string
  11 case $1 in
  12         -h|--h|--he|--hel|--help)
  13         shift
  14         exec "guilt help" "`basename $0`"
  15         exit
  16         ;;
  17         -V|--ver|--versi|--versio|--version)
  18         echo "Guilt version $GUILT_VERSION"
  19         exit
  20         ;;
  21 esac
  22
  23 # we change directories ourselves
  24 SUBDIRECTORY_OK=1
  25
  26 . "$(git --exec-path)/git-sh-setup"
  27
  28 #
  29 # Git version check
  30 #
  31 gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'`
  32 case "$gitver" in
  33         1.5.*)  ;; # git config
  34         1.6.*)  ;; # git config
  35         1.7.*)  ;; # git config
  36         *)      die "Unsupported version of git ($gitver)" ;;
  37 esac
  38
  39 #
  40 # Shell library
  41 #
  42 usage()
  43 {
  44         echo "Usage: guilt $CMDNAME $USAGE" >&2
  45         exit 1
  46 }
  47
  48 # echo -n is a bashism, use printf instead
  49 _disp()
  50 {
  51         printf "%b" "$*"
  52 }
  53
  54 # echo -e is a bashism, use printf instead
  55 disp()
  56 {
  57         printf "%b\n" "$*"
  58 }
  59
  60 noerr()
  61 {
  62         "$@" 2>/dev/null
  63 }
  64
  65 silent()
  66 {
  67         "$@" >/dev/null 2>/dev/null
  68 }
  69
  70 ########
  71
  72 guilt_commands()
  73 {
  74         find "`dirname $0`/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/`basename $0`-//"
  75         find "`dirname $0`" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/`basename $0`-//"
  76 }
  77
  78 # by default, we shouldn't fail
  79 cmd=
  80
  81 if [ $# -ne 0 ]; then
  82         # take first arg, and try to execute it
  83
  84         arg="$1"
  85         dir=`dirname $0`
  86         libdir="`dirname $0`/../lib/guilt"
  87
  88         if [ -x "$dir/guilt-$arg" ]; then
  89                 cmd="$dir/guilt-$arg"
  90                 CMDNAME=$arg
  91         elif [ -x "$libdir/guilt-$arg" ]; then
  92                 cmd="$libdir/guilt-$arg"
  93                 CMDNAME=$arg
  94         else
  95                 # might be a short handed
  96                 for command in $(guilt_commands); do
  97                         case $command in
  98                         $arg*)
  99                                 if [ -x "$dir/guilt-$command" ]; then
 100                                         cmd="$dir/guilt-$command"
 101                                         CMDNAME=$command
 102                                 elif [ -x "$libdir/guilt-$command" ]; then
 103                                         cmd="$libdir/guilt-$command"
 104                                         CMDNAME=$command
 105                                 fi
 106                                 ;;
 107                         esac
 108                 done
 109         fi
 110         if [ -z "$cmd" ]; then
 111                 disp "Command $arg not found" >&2
 112                 disp "" >&2
 113                 exit 1
 114         fi
 115
 116         shift
 117 else
 118         # no args passed or invalid command entered, just output help summary
 119
 120         disp "Guilt v$GUILT_VERSION"
 121         disp ""
 122         disp "Pick a command:"
 123         guilt_commands | sort | column | column -t | sed -e 's/^/       /'
 124
 125         disp ""
 126         disp "Example:"
 127         disp "\tguilt push"
 128
 129         # now, let's exit
 130         exit 1
 131 fi
 132
 133 ########
 134
 135 #
 136 # Library goodies
 137 #
 138
 139 # usage: valid_patchname <patchname>
 140 valid_patchname()
 141 {
 142         case "$1" in
 143                 /*|./*|../*|*/./*|*/../*|*/.|*/..|*/|*\ *|*\    *)
 144                         return 1;;
 145                 *:*)
 146                         return 1;;
 147                 *)
 148                         return 0;;
 149         esac
 150 }
 151
 152 get_branch()
 153 {
 154         silent git symbolic-ref HEAD || \
 155                 die "Working on a detached HEAD is unsupported."
 156
 157         git symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
 158 }
 159
 160 verify_branch()
 161 {
 162         [ ! -d "$GIT_DIR/patches" ] &&
 163                 die "Patches directory doesn't exist, try guilt init"
 164         [ ! -d "$GIT_DIR/patches/$branch" ] &&
 165                 die "Branch $branch is not initialized, try guilt init"
 166         [ ! -f "$GIT_DIR/patches/$branch/series" ] &&
 167                 die "Branch $branch does not have a series file"
 168         [ ! -f "$GIT_DIR/patches/$branch/status" ] &&
 169                 die "Branch $branch does not have a status file"
 170         [ -f "$GIT_DIR/patches/$branch/applied" ] &&
 171                 die "Warning: Branch $branch has 'applied' file - guilt is not compatible with stgit"
 172 }
 173
 174 get_top()
 175 {
 176         tail -n 1 "$GUILT_DIR/$branch/status"
 177 }
 178
 179 get_prev()
 180 {
 181         if [ `wc -l < "$GUILT_DIR/$branch/status"` -gt 1 ]; then
 182                 tail -n 2 "$GUILT_DIR/$branch/status" | head_n 1
 183         fi
 184 }
 185
 186 get_full_series()
 187 {
 188         # ignore all lines matching:
 189         #       - empty lines
 190         #       - whitespace only
 191         #       - optional whitespace followed by '#' followed by more
 192         #         optional whitespace
 193         # also remove comments from end of lines
 194         sed -n -e "/^[[:space:]]*\(#.*\)*\$/ ! {
 195                 s/[[:space:]]*#.*\$//
 196
 197                 p
 198                 }
 199                 " $series
 200 }
 201
 202 get_series()
 203 {
 204         get_full_series | while read p; do
 205                 check_guards "$p" && echo "$p"
 206         done
 207 }
 208
 209 # usage: check_guards <patch>
 210 # Returns 0 if the patch should be pushed
 211 check_guards()
 212 {
 213         get_guards "$1" | while read guard; do
 214                 g=`echo $guard | sed "s/^[+-]//"`
 215                 case "$guard" in
 216                         +*)
 217                                 # Push +guard *only if* guard selected
 218                                 silent grep -F "$g" "$guards_file" || return 1
 219                                 ;;
 220                         -*)
 221                                 # Push -guard *unless* guard selected
 222                                 silent grep -F "$g" "$guards_file" && return 1
 223                                 true
 224                                 ;;
 225                 esac
 226         done
 227
 228         # propagate return from subshell
 229         return $?
 230 }
 231
 232 # usage: get_guards <patch>
 233 get_guards()
 234 {
 235         awk -v pname="$1" '
 236 ($1 == pname) {
 237         guards = "";
 238
 239         for(i=2; i<=NF; i++) {
 240                 sub(/#[^+-]*/, "", $i);
 241                 if (length($i)) {
 242                         if (length(guards))
 243                                 guards = guards " " $i;
 244                         else
 245                                 guards = $i;
 246                 }
 247         }
 248
 249         print guards;
 250 }' < "$series"
 251 }
 252
 253 # usage: set_guards <patch> <guards...>
 254 set_guards()
 255 {
 256         (
 257                 p="$1"
 258                 shift
 259                 for x in "$@"; do
 260                         case "$x" in
 261                                 [+-]*)
 262                                         awk -v pname="$p" -v newguard="$x" '{
 263 if ($1 == pname)
 264         print $0 " #" newguard;
 265 else
 266         print $0;
 267 }' < "$series" > "$series.tmp"
 268                                         mv "$series.tmp" "$series"
 269                                         ;;
 270                                 *)
 271                                         echo "'$x' is not a valid guard name" >&2
 272                                         ;;
 273                         esac
 274                 done
 275         )
 276 }
 277
 278 # usage: unset_guards <patch> <guards...>
 279 unset_guards()
 280 {
 281         (
 282                 p="$1"
 283                 shift
 284                 for x in "$@"; do
 285                         awk -v pname="$p" -v oldguard="$x" '{
 286 if ($1 == pname) {
 287         guards = "";
 288
 289         for(i=2; i<=NF; i++) {
 290                 if ($i == "#" oldguard)
 291                         continue;
 292
 293                 if (length(guards))
 294                         guards = guards " " $i;
 295                 else
 296                         guards = $i;
 297         }
 298
 299         if (length(guards))
 300                 print $1 " " guards;
 301         else
 302                 print $1;
 303 } else
 304         print $0;
 305 }' < "$series" > "$series.tmp"
 306                         mv "$series.tmp" "$series"
 307                 done
 308         )
 309 }
 310
 311 # usage: do_make_header <hash>
 312 do_make_header()
 313 {
 314         # we should try to work with commit objects only
 315         if [ `git cat-file -t "$1"` != "commit" ]; then
 316                 disp "Hash $1 is not a commit object" >&2
 317                 disp "Aborting..." >&2
 318                 exit 2
 319         fi
 320
 321         git cat-file -p "$1" | awk '
 322                 BEGIN{headers=1; firstline=1}
 323                 /^author / && headers {
 324                         sub(/^author +/, "");
 325                         sub(/ [0-9]* [+-]*[0-9][0-9]*$/, "");
 326                         author=$0
 327                 }
 328                 !headers {
 329                         print
 330                         if (firstline) {
 331                                 firstline = 0;
 332                                 print "\nFrom: " author;
 333                         }
 334                 }
 335                 /^$/ && headers { headers = 0 }
 336         '
 337 }
 338
 339 # usage: do_get_patch patchfile
 340 do_get_patch()
 341 {
 342         cat "$1" | awk '
 343 BEGIN{}
 344 /^(diff |---$|--- )/,/END{}/
 345 '
 346 }
 347
 348 # usage: do_get_header patchfile
 349 do_get_header()
 350 {
 351         # The complexity arises from the fact that we want to ignore all but the
 352         # Subject line of the header, and any empty lines after it, if these
 353         # exist, and inject only the Subject line as the first line of the
 354         # commit message.
 355         #
 356         # We also need to strip "from:" lines from the body of the patch
 357         # description as these are used by people to manually set the author of
 358         # the patch to be different to their local email address and failing to
 359         # strip them results in duplicate from: lines in output from guilt
 360         # patchbomb.
 361
 362         # 1st line prints first encountered Subject line plus empty line.
 363         # 2nd line skips standard email/git patch header lines.
 364         # 3th line skips "from:" lines throughout the patch description
 365         # 4rd line skips tip's additional header lines.
 366         # 5th line skips any empty lines thereafter.
 367         # 6th line turns off empty line skip upon seeing a non-empty line.
 368         # 7th line terminates execution when we encounter the diff
 369         awk '
 370 BEGIN{body=0; subj=0}
 371 /^Subject:/ && (body == 0 && subj == 0){subj=1; print substr($0, 10) "\n"; next}
 372 /^(Subject:|Author:|Date:|commit)/ && (body == 0){next}
 373 /^From:/ {next}
 374 /^(Commit-ID:|Gitweb:|AuthorDate:|Committer:CommitDate:)/ && (body == 0){next}
 375 /^[ \t\f\n\r\v]*$/ && (body==0){next}
 376 /^.*$/ && (body==0){body=1}
 377 /^(diff |---$|--- )/{exit}
 378 {print $0}
 379 END{}
 380 ' < "$1"
 381 }
 382
 383 # usage: do_get_full_header patchfile
 384 do_get_full_header()
 385 {
 386         # 2nd line checks for the begining of a patch
 387         # 3rd line outputs the line if it didn't get pruned by the above rules
 388         awk '
 389 BEGIN{}
 390 /^(diff |---$|--- )/{exit}
 391 {print $0}
 392 END{}
 393 ' < "$1"
 394 }
 395
 396 # usage: assert_head_check
 397 assert_head_check()
 398 {
 399         if ! head_check refs/patches/$branch/`get_top`; then
 400                 die "aborting..."
 401         fi
 402 }
 403
 404 # usage: head_check <expected hash>
 405 head_check()
 406 {
 407         # make sure we're not doing funky things to commits that don't
 408         # belong to us
 409
 410         case "$1" in
 411                 '')
 412                         # the expected hash is empty
 413                         return 0 ;;
 414                 refs/patches/$branch/)
 415                         # the expected hash is an invalid rev
 416                         return 0 ;;
 417         esac
 418
 419         if [ "`git rev-parse refs/heads/$branch`" != "`git rev-parse $1`" ]; then
 420                 disp "Expected HEAD commit $1" >&2
 421                 disp "                 got `git rev-parse refs/heads/$branch`" >&2
 422                 return 1
 423         fi
 424         return 0
 425 }
 426
 427 # usage: series_insert_patch <patchname>
 428 series_insert_patch()
 429 {
 430         awk -v top="`get_top`" -v new="$1" \
 431                 'BEGIN{if (top == "") print new;}
 432                 {
 433                         print $0;
 434                         if (top != "" && top == $0) print new;
 435                 }' "$series" > "$series.tmp"
 436         mv "$series.tmp" "$series"
 437 }
 438
 439 # usage: series_remove_patch <patchname>
 440 series_remove_patch()
 441 {
 442         grep -v "^$1\([[:space:]].*\)\?$" < "$series" > "$series.tmp"
 443         mv "$series.tmp" "$series"
 444 }
 445
 446 # usage: series_rename_patch <oldname> <newname>
 447 series_rename_patch()
 448 {
 449         # Rename the patch, but preserve comments on the line
 450         awk -v old="$1" -v new="$2" '
 451 {
 452         if (index($0, old) == 1)
 453                 print new substr($0, length(old) + 1);
 454         else
 455                 print $0;
 456 }' "$series" > "$series.tmp"
 457
 458         mv "$series.tmp" "$series"
 459 }
 460
 461 # usage: series_rename_patch <oldpatchname> <newpatchname>
 462 ref_rename_patch()
 463 {
 464         git update-ref "refs/patches/$branch/$2" `git rev-parse "refs/patches/$branch/$1"`
 465         remove_ref "refs/patches/$branch/$1"
 466 }
 467
 468 # Beware! This is one of the few (only?) places where we modify the applied
 469 # file directly
 470 #
 471 # usage: applied_rename_patch <oldname> <newname>
 472 applied_rename_patch()
 473 {
 474         awk -v old="$1" -v new="$2" \
 475                         'BEGIN{FS=":"}
 476                         { if ($0 == old)
 477                                 print new;
 478                         else
 479                                 print;
 480                         }' "$applied" > "$applied.tmp"
 481
 482         mv "$applied.tmp" "$applied"
 483 }
 484
 485 # usage: remove_patch_refs
 486 # reads patch names from stdin
 487 remove_patch_refs()
 488 {
 489         while read pname; do
 490                 remove_ref "refs/patches/$branch/$pname"
 491         done
 492 }
 493
 494 # usage: pop_many_patches <commitish> <number of patches>
 495 pop_many_patches()
 496 {
 497         assert_head_check
 498
 499         (
 500                 cd_to_toplevel
 501
 502                 # remove the patches refs
 503                 tail -n $2 < "$applied" | remove_patch_refs
 504
 505                 git reset --hard "$1" > /dev/null
 506
 507                 n=`wc -l < "$applied"`
 508                 n=`expr $n - $2`
 509                 head_n "$n" < "$applied" > "$applied.tmp"
 510                 mv "$applied.tmp" "$applied"
 511         )
 512 }
 513
 514 # usage: pop_all_patches
 515 pop_all_patches()
 516 {
 517         pop_many_patches \
 518                 `git rev-parse refs/patches/$branch/$(head_n 1 "$applied")^` \
 519                 `wc -l < "$applied"`
 520 }
 521
 522 # usage: remove_ref <refname>
 523 remove_ref()
 524 {
 525         (
 526                 # does the ref exist?
 527                 r=`git show-ref --verify -s "$1" 2> /dev/null`
 528                 [ $? -ne 0 ] && exit 0
 529
 530                 # remove it
 531                 git update-ref -d "$1" "$r"
 532         )
 533 }
 534
 535 # usage: commit patchname parent
 536 commit()
 537 {
 538         (
 539                 TMP_MSG=`get_tmp_file msg`
 540
 541                 p="$GUILT_DIR/$branch/$1"
 542                 pname="$1"
 543                 cd_to_toplevel
 544
 545                 git diff-files --name-only | (while read n; do git update-index "$n" ; done)
 546
 547                 # grab a commit message out of the patch
 548                 do_get_header "$p" > "$TMP_MSG"
 549
 550                 # make a default commit message if patch doesn't contain one
 551                 [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG"
 552
 553                 # extract author and date lines from the patch header, and set
 554                 # GIT_AUTHOR_{NAME,EMAIL,DATE}
 555                 # prefering Author/AuthorDate lines if available.
 556                 author_str=`sed -n -e '/^Author:/ { s/^Author: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 557                 if [ -z "$author_str" ]; then
 558                         author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 559                 fi
 560
 561                 if [ ! -z "$author_str" ]; then
 562                         GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
 563                         export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
 564                         export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
 565
 566                         author_date_str=`sed -n -e '/^AuthorDate:/ { s/^AuthorDate: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 567                         if [ -z "$author_date_str" ]; then
 568                                 author_date_str=`sed -n -e '/^Date:/ { s/^Date: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 569                         fi
 570                         if [ ! -z "$author_date_str" ]; then
 571                                 export GIT_AUTHOR_DATE=`echo $author_date_str`
 572                         fi
 573                 fi
 574
 575                 # `git log -1 --pretty=%ct` doesn't work on Git 1.5.x
 576                 ct=`git cat-file commit HEAD | awk '/^committer /{ print $(NF-1); exit; }'`
 577                 if [ $ct -gt `last_modified "$p"` ]; then
 578                         ct=`expr $ct + 60`
 579                         if [ $ct -gt `date +%s` ]; then
 580                                 touch "$p"
 581                         else
 582                                 touch_date $ct "$p"
 583                         fi
 584                 fi
 585
 586                 export GIT_COMMITTER_DATE="`format_last_modified "$p"`"
 587
 588                 # export GIT_AUTHOR_DATE only if a Date line was unavailable
 589                 if [ -z "$author_date_str" ]; then
 590                         export GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
 591                 fi
 592
 593                 # commit
 594                 treeish=`git write-tree`
 595                 commitish=`git commit-tree $treeish -p $2 < "$TMP_MSG"`
 596                 git update-ref HEAD $commitish
 597
 598                 # mark patch as applied
 599                 git update-ref "refs/patches/$branch/$pname" HEAD
 600
 601                 rm -f "$TMP_MSG"
 602         )
 603 }
 604
 605 # usage: push_patch patchname [bail_action]
 606 push_patch()
 607 {
 608         __push_patch_bail=0
 609
 610         (
 611                 TMP_LOG=`get_tmp_file log`
 612
 613                 p="$GUILT_DIR/$branch/$1"
 614                 pname="$1"
 615                 bail_action="$2"
 616                 reject="--reject"
 617
 618                 assert_head_check
 619                 cd_to_toplevel
 620
 621                 # apply the patch if and only if there is something to apply
 622                 if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
 623                         if [ "$bail_action" = abort ]; then
 624                                 reject=""
 625                         fi
 626                         git apply -C$guilt_push_diff_context --index \
 627                                 $reject "$p" > /dev/null 2> "$TMP_LOG"
 628                         __push_patch_bail=$?
 629
 630                         if [ $__push_patch_bail -ne 0 ]; then
 631                                 cat "$TMP_LOG" >&2
 632                                 if [ "$bail_action" = "abort" ]; then
 633                                         rm -f "$TMP_LOG" "$TMP_MSG"
 634                                         return $__push_patch_bail
 635                                 fi
 636                         fi
 637                 fi
 638
 639                 commit "$pname" HEAD
 640
 641                 echo "$pname" >> $applied
 642
 643                 rm -f "$TMP_LOG"
 644         )
 645
 646         # sub-shell funky-ness
 647         __push_patch_bail=$?
 648
 649         return $__push_patch_bail
 650 }
 651
 652 # usage: must_commit_first
 653 must_commit_first()
 654 {
 655         git update-index --refresh --unmerged -q > /dev/null
 656         [ `git diff-files | wc -l` -eq 0 ] || return $?
 657         [ `git diff-index HEAD | wc -l` -eq 0 ]
 658         return $?
 659 }
 660
 661 # usage: fold_patch patchname
 662 fold_patch()
 663 {
 664         set -- "$1" "`get_top`"
 665
 666         assert_head_check
 667
 668         push_patch "$1"
 669
 670         # merge the patch headers
 671         (
 672                 pcur="$GUILT_DIR/$branch/$2"
 673                 pnext="$GUILT_DIR/$branch/$1"
 674                 TMP_CUR=`get_tmp_file diff-cur`
 675                 TMP_NEXT=`get_tmp_file diff-next`
 676                 TMP_DIFF=`get_tmp_file diff`
 677                 do_get_full_header "$pcur" > "$TMP_CUR"
 678                 do_get_full_header "$pnext" > "$TMP_NEXT"
 679                 do_get_patch "$pcur" > "$TMP_DIFF"
 680
 681                 case "`stat -c %s \"$TMP_CUR\"`,`stat -c %s \"$TMP_NEXT\"`" in
 682                         *,0)
 683                                 # since the new patch header is empty, we
 684                                 # don't have to do anything
 685                                 ;;
 686                         0,*)
 687                                 # current is empty; new is not
 688                                 mv "$pcur" "$pcur~"
 689                                 cat "$TMP_NEXT" > "$pcur"
 690                                 cat "$TMP_DIFF" >> "$pcur"
 691                                 ;;
 692                         *,*)
 693                                 mv "$pcur" "$pcur~"
 694                                 cat "$TMP_CUR" > "$pcur"
 695                                 echo >> "$pcur"
 696                                 echo "Header from folded patch '$1':" >> "$pcur"
 697                                 echo >> "$pcur"
 698                                 cat "$TMP_NEXT" >> "$pcur"
 699                                 cat "$TMP_DIFF" >> "$pcur"
 700                                 ;;
 701                 esac
 702
 703                 rm -f "$TMP_CUR" "$TMP_NEXT" "$TMP_DIFF"
 704         )
 705
 706         __refresh_patch "$2" HEAD^^ 2 "" ""
 707
 708         series_remove_patch "$1"
 709 }
 710
 711 # usage: refresh_patch patchname gengitdiff incldiffstat
 712 refresh_patch()
 713 {
 714         __refresh_patch "$1" HEAD^ 1 "$2" "$3"
 715 }
 716
 717 # usage: __refresh_patch patchname commitish number_of_commits gengitdiff
 718 #                        incldiffstat
 719 __refresh_patch()
 720 {
 721         assert_head_check
 722
 723         (
 724                 TMP_DIFF=`get_tmp_file diff`
 725
 726                 cd_to_toplevel
 727                 p="$GUILT_DIR/$branch/$1"
 728                 pname="$1"
 729
 730                 # get the patch header
 731                 do_get_full_header "$p" > "$TMP_DIFF"
 732
 733                 [ ! -z "$4" ] && diffopts="-C -M --find-copies-harder"
 734
 735                 if [ -n "$5" -o $diffstat = "true" ]; then
 736                         (
 737                                 echo "---"
 738                                 git diff --stat $diffopts "$2"
 739                                 echo ""
 740                         ) >> "$TMP_DIFF"
 741                 fi
 742
 743                 # get the new patch
 744                 git diff --binary $diffopts "$2" >> "$TMP_DIFF"
 745
 746                 # move the new patch in
 747                 mv "$p" "$p~"
 748                 mv "$TMP_DIFF" $p
 749
 750                 # commit
 751                 commit "$pname" "HEAD~$3"
 752
 753                 # drop folded patches
 754                 N=`expr "$3" - 1`
 755
 756                 # remove the patches refs
 757                 tail -n $N < "$applied" | remove_patch_refs
 758
 759                 n=`wc -l < "$applied"`
 760                 n=`expr $n - $N`
 761                 head_n "$n" < "$applied" > "$applied.tmp"
 762                 mv "$applied.tmp" "$applied"
 763         )
 764 }
 765
 766 # usage: munge_hash_range <hash range>
 767 #
 768 # this means:
 769 #       <hash>                  - one commit
 770 #       <hash>..                - hash until head (excludes hash, includes head)
 771 #       ..<hash>                - until hash (includes hash)
 772 #       <hash1>..<hash2>        - from hash to hash (inclusive)
 773 #
 774 # The output of this function is suitable to be passed to "git rev-list"
 775 munge_hash_range()
 776 {
 777         case "$1" in
 778                 *..*..*|*\ *)
 779                         # double .. or space is illegal
 780                         return 1;;
 781                 ..*)
 782                         # e.g., "..v0.10"
 783                         echo ${1#..};;
 784                 *..)
 785                         # e.g., "v0.19.."
 786                         echo ${1%..}..HEAD;;
 787                 *..*)
 788                         # e.g., "v0.19-rc1..v0.19"
 789                         echo ${1%%..*}..${1#*..};;
 790                 ?*)
 791                         # e.g., "v0.19"
 792                         echo $1^..$1;;
 793                 *)  # empty
 794                         return 1;;
 795         esac
 796         return 0
 797 }
 798
 799 # usage: get_tmp_file <prefix> [<opts>]
 800 #
 801 # Get a unique filename and create the file in a non-racy way
 802 get_tmp_file()
 803 {
 804         while true; do
 805                 mktemp $2 "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
 806         done
 807 }
 808
 809 # usage: guilt_hook <hook name> <args....>
 810 guilt_hook()
 811 {
 812         __hookname="$1"
 813         [ ! -x "$GIT_DIR/hooks/guilt/$__hookname" ] && return 0
 814
 815         shift
 816
 817         "$GIT_DIR/hooks/guilt/$__hookname" "$@"
 818         return $?
 819 }
 820
 821 #
 822 # source the command
 823 #
 824 . "$cmd"
 825
 826 #
 827 # Some constants
 828 #
 829
 830 # used for: git apply -C <val>
 831 guilt_push_diff_context=1
 832
 833 # default diffstat value: true or false
 834 DIFFSTAT_DEFAULT="false"
 835
 836 #
 837 # Parse any part of .git/config that belongs to us
 838 #
 839
 840 # generate diffstat?
 841 diffstat=`git config --bool guilt.diffstat`
 842 [ -z "$diffstat" ] && diffstat=$DIFFSTAT_DEFAULT
 843
 844 #
 845 # The following gets run every time this file is source'd
 846 #
 847
 848 GUILT_DIR="$GIT_DIR/patches"
 849
 850 branch=`get_branch`
 851
 852 # most of the time we want to verify that the repo's branch has been
 853 # initialized, but every once in a blue moon (e.g., we want to run guilt init),
 854 # we must avoid the checks
 855 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 856         verify_branch
 857
 858         # do not check the status file format (guilt repair needs this,
 859         # otherwise nothing can do what's necessary to bring the repo into a
 860         # useable state)
 861         if [ -z "$DO_NOT_CHECK_STATUS_FILE_FORMAT" ]; then
 862                 [ -s "$GIT_DIR/patches/$branch/status" ] &&
 863                         grep "^[0-9a-f]\{40\}:" "$GIT_DIR/patches/$branch/status" > /dev/null &&
 864                         die "Status file appears to use old format, try guilt repair --status"
 865         fi
 866 fi
 867
 868 # very useful files
 869 series="$GUILT_DIR/$branch/series"
 870 applied="$GUILT_DIR/$branch/status"
 871 guards_file="$GUILT_DIR/$branch/guards"
 872
 873 # determine a pager to use for anything interactive (fall back to more)
 874 pager="more"
 875 [ ! -z "$PAGER" ] && pager="$PAGER"
 876
 877 UNAME_S=`uname -s`
 878
 879 if [ -r "`dirname $0`/os.$UNAME_S" ]; then
 880         . "`dirname $0`/os.$UNAME_S"
 881 elif [ -r "`dirname $0`/../lib/guilt/os.$UNAME_S" ]; then
 882         . "`dirname $0`/../lib/guilt/os.$UNAME_S"
 883 else
 884         die "Unsupported operating system: $UNAME_S"
 885 fi
 886
 887 _main "$@"