guilt

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006-2011
   4 #
   5
   6 GUILT_VERSION="0.34"
   7 GUILT_NAME="Runaway"
   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
 352         # but the Subject line of the header, and any empty lines after it,
 353         # if these exist, and inject only the Subject line as the first
 354         # line of the commit message.
 355
 356         # 1st line prints first encountered Subject line plus empty line.
 357         # 2nd line skips standard email/git patch header lines.
 358         # 3rd line skips tip's additional header lines.
 359         # 4th line skips any empty lines thereafter.
 360         # 5th line turns off empty line skip upon seeing a non-empty line.
 361         # 6th line terminates execution when we encounter the diff
 362         cat "$1" | awk '
 363 BEGIN{body=0; subj=0}
 364 /^Subject:/ && (body == 0 && subj == 0){subj=1; print substr($0, 10) "\n"; next}
 365 /^(Subject:|From:|Author:|Date:|commit)/ && (body == 0){next}
 366 /^(Commit-ID:|Gitweb:|AuthorDate:|Committer:CommitDate:)/ && (body == 0){next}
 367 /^[ \t\f\n\r\v]*$/ && (body==0){next}
 368 /^.*$/ && (body==0){body=1}
 369 /^(diff |---$|--- )/{exit}
 370 {print $0}
 371 END{}
 372 '
 373 }
 374
 375 # usage: do_get_full_header patchfile
 376 do_get_full_header()
 377 {
 378         # 2nd line checks for the begining of a patch
 379         # 3rd line outputs the line if it didn't get pruned by the above rules
 380         cat "$1" | awk '
 381 BEGIN{}
 382 /^(diff |---$|--- )/{exit}
 383 {print $0}
 384 END{}
 385 '
 386 }
 387
 388 # usage: assert_head_check
 389 assert_head_check()
 390 {
 391         if ! head_check refs/patches/$branch/`get_top`; then
 392                 die "aborting..."
 393         fi
 394 }
 395
 396 # usage: head_check <expected hash>
 397 head_check()
 398 {
 399         # make sure we're not doing funky things to commits that don't
 400         # belong to us
 401
 402         case "$1" in
 403                 '')
 404                         # the expected hash is empty
 405                         return 0 ;;
 406                 refs/patches/$branch/)
 407                         # the expected hash is an invalid rev
 408                         return 0 ;;
 409         esac
 410
 411         if [ "`git rev-parse refs/heads/$branch`" != "`git rev-parse $1`" ]; then
 412                 disp "Expected HEAD commit $1" >&2
 413                 disp "                 got `git rev-parse refs/heads/$branch`" >&2
 414                 return 1
 415         fi
 416         return 0
 417 }
 418
 419 # usage: series_insert_patch <patchname>
 420 series_insert_patch()
 421 {
 422         awk -v top="`get_top`" -v new="$1" \
 423                 'BEGIN{if (top == "") print new;}
 424                 {
 425                         print $0;
 426                         if (top != "" && top == $0) print new;
 427                 }' "$series" > "$series.tmp"
 428         mv "$series.tmp" "$series"
 429 }
 430
 431 # usage: series_remove_patch <patchname>
 432 series_remove_patch()
 433 {
 434         grep -v "^$1\([[:space:]].*\)\?$" < "$series" > "$series.tmp"
 435         mv "$series.tmp" "$series"
 436 }
 437
 438 # usage: series_rename_patch <oldname> <newname>
 439 series_rename_patch()
 440 {
 441         # Rename the patch, but preserve comments on the line
 442         awk -v old="$1" -v new="$2" '
 443 {
 444         if (index($0, old) == 1)
 445                 print new substr($0, length(old) + 1);
 446         else
 447                 print $0;
 448 }' "$series" > "$series.tmp"
 449
 450         mv "$series.tmp" "$series"
 451 }
 452
 453 # usage: series_rename_patch <oldpatchname> <newpatchname>
 454 ref_rename_patch()
 455 {
 456         git update-ref "refs/patches/$branch/$2" `git rev-parse "refs/patches/$branch/$1"`
 457         remove_ref "refs/patches/$branch/$1"
 458 }
 459
 460 # Beware! This is one of the few (only?) places where we modify the applied
 461 # file directly
 462 #
 463 # usage: applied_rename_patch <oldname> <newname>
 464 applied_rename_patch()
 465 {
 466         awk -v old="$1" -v new="$2" \
 467                         'BEGIN{FS=":"}
 468                         { if ($0 == old)
 469                                 print new;
 470                         else
 471                                 print;
 472                         }' "$applied" > "$applied.tmp"
 473
 474         mv "$applied.tmp" "$applied"
 475 }
 476
 477 # usage: remove_patch_refs
 478 # reads patch names from stdin
 479 remove_patch_refs()
 480 {
 481         while read pname; do
 482                 remove_ref "refs/patches/$branch/$pname"
 483         done
 484 }
 485
 486 # usage: pop_many_patches <commitish> <number of patches>
 487 pop_many_patches()
 488 {
 489         assert_head_check
 490
 491         (
 492                 cd_to_toplevel
 493
 494                 # remove the patches refs
 495                 tail -n $2 < "$applied" | remove_patch_refs
 496
 497                 git reset --hard "$1" > /dev/null
 498
 499                 n=`wc -l < "$applied"`
 500                 n=`expr $n - $2`
 501                 head_n "$n" < "$applied" > "$applied.tmp"
 502                 mv "$applied.tmp" "$applied"
 503         )
 504 }
 505
 506 # usage: pop_all_patches
 507 pop_all_patches()
 508 {
 509         pop_many_patches \
 510                 `git rev-parse refs/patches/$branch/$(head_n 1 "$applied")^` \
 511                 `wc -l < "$applied"`
 512 }
 513
 514 # usage: remove_ref <refname>
 515 remove_ref()
 516 {
 517         (
 518                 # does the ref exist?
 519                 r=`git show-ref --verify -s "$1" 2> /dev/null`
 520                 [ $? -ne 0 ] && exit 0
 521
 522                 # remove it
 523                 git update-ref -d "$1" "$r"
 524         )
 525 }
 526
 527 # usage: commit patchname parent
 528 commit()
 529 {
 530         (
 531                 TMP_MSG=`get_tmp_file msg`
 532
 533                 p="$GUILT_DIR/$branch/$1"
 534                 pname="$1"
 535                 cd_to_toplevel
 536
 537                 git diff-files --name-only | (while read n; do git update-index "$n" ; done)
 538
 539                 # grab a commit message out of the patch
 540                 do_get_header "$p" > "$TMP_MSG"
 541
 542                 # make a default commit message if patch doesn't contain one
 543                 [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG"
 544
 545                 # extract author and date lines from the patch header, and set
 546                 # GIT_AUTHOR_{NAME,EMAIL,DATE}
 547                 # prefering Author/AuthorDate lines if available.
 548                 author_str=`sed -n -e '/^Author:/ { s/^Author: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 549                 if [ -z "$author_str" ]; then
 550                         author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 551                 fi
 552
 553                 if [ ! -z "$author_str" ]; then
 554                         GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
 555                         export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
 556                         export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
 557
 558                         author_date_str=`sed -n -e '/^AuthorDate:/ { s/^AuthorDate: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 559                         if [ -z "$author_date_str" ]; then
 560                                 author_date_str=`sed -n -e '/^Date:/ { s/^Date: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 561                         fi
 562                         if [ ! -z "$author_date_str" ]; then
 563                                 export GIT_AUTHOR_DATE=`echo $author_date_str`
 564                         fi
 565                 fi
 566
 567                 # `git log -1 --pretty=%ct` doesn't work on Git 1.5.x
 568                 ct=`git cat-file commit HEAD | awk '/^committer /{ print $(NF-1); exit; }'`
 569                 if [ $ct -gt `last_modified "$p"` ]; then
 570                         ct=`expr $ct + 60`
 571                         if [ $ct -gt `date +%s` ]; then
 572                                 touch "$p"
 573                         else
 574                                 touch_date $ct "$p"
 575                         fi
 576                 fi
 577
 578                 export GIT_COMMITTER_DATE="`format_last_modified "$p"`"
 579
 580                 # export GIT_AUTHOR_DATE only if a Date line was unavailable
 581                 if [ -z "$author_date_str" ]; then
 582                         export GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
 583                 fi
 584
 585                 # commit
 586                 treeish=`git write-tree`
 587                 commitish=`git commit-tree $treeish -p $2 < "$TMP_MSG"`
 588                 git update-ref HEAD $commitish
 589
 590                 # mark patch as applied
 591                 git update-ref "refs/patches/$branch/$pname" HEAD
 592
 593                 rm -f "$TMP_MSG"
 594         )
 595 }
 596
 597 # usage: push_patch patchname [bail_action]
 598 push_patch()
 599 {
 600         __push_patch_bail=0
 601
 602         (
 603                 TMP_LOG=`get_tmp_file log`
 604
 605                 p="$GUILT_DIR/$branch/$1"
 606                 pname="$1"
 607                 bail_action="$2"
 608                 reject="--reject"
 609
 610                 assert_head_check
 611                 cd_to_toplevel
 612
 613                 # apply the patch if and only if there is something to apply
 614                 if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
 615                         if [ "$bail_action" = abort ]; then
 616                                 reject=""
 617                         fi
 618                         git apply -C$guilt_push_diff_context --index \
 619                                 $reject "$p" > /dev/null 2> "$TMP_LOG"
 620                         __push_patch_bail=$?
 621
 622                         if [ $__push_patch_bail -ne 0 ]; then
 623                                 cat "$TMP_LOG" >&2
 624                                 if [ "$bail_action" = "abort" ]; then
 625                                         rm -f "$TMP_LOG" "$TMP_MSG"
 626                                         return $__push_patch_bail
 627                                 fi
 628                         fi
 629                 fi
 630
 631                 commit "$pname" HEAD
 632
 633                 echo "$pname" >> $applied
 634
 635                 rm -f "$TMP_LOG"
 636         )
 637
 638         # sub-shell funky-ness
 639         __push_patch_bail=$?
 640
 641         return $__push_patch_bail
 642 }
 643
 644 # usage: must_commit_first
 645 must_commit_first()
 646 {
 647         git update-index --refresh --unmerged -q > /dev/null
 648         [ `git diff-files | wc -l` -eq 0 ] || return $?
 649         [ `git diff-index HEAD | wc -l` -eq 0 ]
 650         return $?
 651 }
 652
 653 # usage: fold_patch patchname
 654 fold_patch()
 655 {
 656         set -- "$1" "`get_top`"
 657
 658         assert_head_check
 659
 660         push_patch "$1"
 661
 662         # merge the patch headers
 663         (
 664                 pcur="$GUILT_DIR/$branch/$2"
 665                 pnext="$GUILT_DIR/$branch/$1"
 666                 TMP_CUR=`get_tmp_file diff-cur`
 667                 TMP_NEXT=`get_tmp_file diff-next`
 668                 TMP_DIFF=`get_tmp_file diff`
 669                 do_get_full_header "$pcur" > "$TMP_CUR"
 670                 do_get_full_header "$pnext" > "$TMP_NEXT"
 671                 do_get_patch "$pcur" > "$TMP_DIFF"
 672
 673                 case "`stat -c %s \"$TMP_CUR\"`,`stat -c %s \"$TMP_NEXT\"`" in
 674                         *,0)
 675                                 # since the new patch header is empty, we
 676                                 # don't have to do anything
 677                                 ;;
 678                         0,*)
 679                                 # current is empty; new is not
 680                                 mv "$pcur" "$pcur~"
 681                                 cat "$TMP_NEXT" > "$pcur"
 682                                 cat "$TMP_DIFF" >> "$pcur"
 683                                 ;;
 684                         *,*)
 685                                 mv "$pcur" "$pcur~"
 686                                 cat "$TMP_CUR" > "$pcur"
 687                                 echo >> "$pcur"
 688                                 echo "Header from folded patch '$1':" >> "$pcur"
 689                                 echo >> "$pcur"
 690                                 cat "$TMP_NEXT" >> "$pcur"
 691                                 cat "$TMP_DIFF" >> "$pcur"
 692                                 ;;
 693                 esac
 694
 695                 rm -f "$TMP_CUR" "$TMP_NEXT" "$TMP_DIFF"
 696         )
 697
 698         __refresh_patch "$2" HEAD^^ 2 "" ""
 699
 700         series_remove_patch "$1"
 701 }
 702
 703 # usage: refresh_patch patchname gengitdiff incldiffstat
 704 refresh_patch()
 705 {
 706         __refresh_patch "$1" HEAD^ 1 "$2" "$3"
 707 }
 708
 709 # usage: __refresh_patch patchname commitish number_of_commits gengitdiff
 710 #                        incldiffstat
 711 __refresh_patch()
 712 {
 713         assert_head_check
 714
 715         (
 716                 TMP_DIFF=`get_tmp_file diff`
 717
 718                 cd_to_toplevel
 719                 p="$GUILT_DIR/$branch/$1"
 720                 pname="$1"
 721
 722                 # get the patch header
 723                 do_get_full_header "$p" > "$TMP_DIFF"
 724
 725                 [ ! -z "$4" ] && diffopts="-C -M --find-copies-harder"
 726
 727                 if [ -n "$5" -o $diffstat = "true" ]; then
 728                         (
 729                                 echo "---"
 730                                 git diff --stat $diffopts "$2"
 731                                 echo ""
 732                         ) >> "$TMP_DIFF"
 733                 fi
 734
 735                 # get the new patch
 736                 git diff --binary $diffopts "$2" >> "$TMP_DIFF"
 737
 738                 # move the new patch in
 739                 mv "$p" "$p~"
 740                 mv "$TMP_DIFF" $p
 741
 742                 # commit
 743                 commit "$pname" "HEAD~$3"
 744
 745                 # drop folded patches
 746                 N=`expr "$3" - 1`
 747
 748                 # remove the patches refs
 749                 tail -n $N < "$applied" | remove_patch_refs
 750
 751                 n=`wc -l < "$applied"`
 752                 n=`expr $n - $N`
 753                 head_n "$n" < "$applied" > "$applied.tmp"
 754                 mv "$applied.tmp" "$applied"
 755         )
 756 }
 757
 758 # usage: munge_hash_range <hash range>
 759 #
 760 # this means:
 761 #       <hash>                  - one commit
 762 #       <hash>..                - hash until head (excludes hash, includes head)
 763 #       ..<hash>                - until hash (includes hash)
 764 #       <hash1>..<hash2>        - from hash to hash (inclusive)
 765 #
 766 # The output of this function is suitable to be passed to "git rev-list"
 767 munge_hash_range()
 768 {
 769         case "$1" in
 770                 *..*..*|*\ *)
 771                         # double .. or space is illegal
 772                         return 1;;
 773                 ..*)
 774                         # e.g., "..v0.10"
 775                         echo ${1#..};;
 776                 *..)
 777                         # e.g., "v0.19.."
 778                         echo ${1%..}..HEAD;;
 779                 *..*)
 780                         # e.g., "v0.19-rc1..v0.19"
 781                         echo ${1%%..*}..${1#*..};;
 782                 ?*)
 783                         # e.g., "v0.19"
 784                         echo $1^..$1;;
 785                 *)  # empty
 786                         return 1;;
 787         esac
 788         return 0
 789 }
 790
 791 # usage: get_tmp_file <prefix> [<opts>]
 792 #
 793 # Get a unique filename and create the file in a non-racy way
 794 get_tmp_file()
 795 {
 796         while true; do
 797                 mktemp $2 "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
 798         done
 799 }
 800
 801 # usage: guilt_hook <hook name> <args....>
 802 guilt_hook()
 803 {
 804         __hookname="$1"
 805         [ ! -x "$GIT_DIR/hooks/guilt/$__hookname" ] && return 0
 806
 807         shift
 808
 809         "$GIT_DIR/hooks/guilt/$__hookname" "$@"
 810         return $?
 811 }
 812
 813 #
 814 # source the command
 815 #
 816 . "$cmd"
 817
 818 #
 819 # Some constants
 820 #
 821
 822 # used for: git apply -C <val>
 823 guilt_push_diff_context=1
 824
 825 # default diffstat value: true or false
 826 DIFFSTAT_DEFAULT="false"
 827
 828 #
 829 # Parse any part of .git/config that belongs to us
 830 #
 831
 832 # generate diffstat?
 833 diffstat=`git config --bool guilt.diffstat`
 834 [ -z "$diffstat" ] && diffstat=$DIFFSTAT_DEFAULT
 835
 836 #
 837 # The following gets run every time this file is source'd
 838 #
 839
 840 GUILT_DIR="$GIT_DIR/patches"
 841
 842 branch=`get_branch`
 843
 844 # most of the time we want to verify that the repo's branch has been
 845 # initialized, but every once in a blue moon (e.g., we want to run guilt init),
 846 # we must avoid the checks
 847 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 848         verify_branch
 849
 850         # do not check the status file format (guilt repair needs this,
 851         # otherwise nothing can do what's necessary to bring the repo into a
 852         # useable state)
 853         if [ -z "$DO_NOT_CHECK_STATUS_FILE_FORMAT" ]; then
 854                 [ -s "$GIT_DIR/patches/$branch/status" ] &&
 855                         grep "^[0-9a-f]\{40\}:" "$GIT_DIR/patches/$branch/status" > /dev/null &&
 856                         die "Status file appears to use old format, try guilt repair --status"
 857         fi
 858 fi
 859
 860 # very useful files
 861 series="$GUILT_DIR/$branch/series"
 862 applied="$GUILT_DIR/$branch/status"
 863 guards_file="$GUILT_DIR/$branch/guards"
 864
 865 # determine a pager to use for anything interactive (fall back to more)
 866 pager="more"
 867 [ ! -z "$PAGER" ] && pager="$PAGER"
 868
 869 UNAME_S=`uname -s`
 870
 871 if [ -r "`dirname $0`/os.$UNAME_S" ]; then
 872         . "`dirname $0`/os.$UNAME_S"
 873 elif [ -r "`dirname $0`/../lib/guilt/os.$UNAME_S" ]; then
 874         . "`dirname $0`/../lib/guilt/os.$UNAME_S"
 875 else
 876         die "Unsupported operating system: $UNAME_S"
 877 fi
 878
 879 _main "$@"