guilt

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006-2008
   4 #
   5
   6 GUILT_VERSION="0.31.2"
   7 GUILT_NAME="Ciuleandra"
   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         *)      die "Unsupported version of git ($gitver)" ;;
  36 esac
  37
  38 #
  39 # Shell library
  40 #
  41
  42 # echo -n is a bashism, use printf instead
  43 _disp()
  44 {
  45         printf "%b" "$*"
  46 }
  47
  48 # echo -e is a bashism, use printf instead
  49 disp()
  50 {
  51         printf "%b\n" "$*"
  52 }
  53
  54 noerr()
  55 {
  56         "$@" 2>/dev/null
  57 }
  58
  59 silent()
  60 {
  61         "$@" >/dev/null 2>/dev/null
  62 }
  63
  64 ########
  65
  66 guilt_commands()
  67 {
  68         find "`dirname $0`" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/`basename $0`-//"
  69 }
  70
  71 if [ "`basename $0`" = "guilt" ]; then
  72         # being run as standalone
  73
  74         # by default, we shouldn't fail
  75         cmd=
  76
  77         if [ $# -ne 0 ]; then
  78                 # take first arg, and try to execute it
  79
  80                 arg="$1"
  81                 dir=`dirname $0`
  82
  83                 if [ -x "$dir/guilt-$arg" ]; then
  84                         cmd=$arg
  85                 else
  86                         # might be a short handed
  87                         for command in $(guilt_commands); do
  88                                 case $command in
  89                                 $arg*)
  90                                         if [ -x "$dir/guilt-$command" ]; then
  91                                                 cmd=$command
  92                                         fi
  93                                         ;;
  94                                 esac
  95                         done
  96                 fi
  97                 if [ -n "$cmd" ]; then
  98                         shift
  99                         exec "$dir/guilt-$cmd" "$@"
 100
 101                         # this is not reached because of the exec
 102                         die "Exec failed! Something is terribly wrong!"
 103                 else
 104                         disp "Command $arg not found" >&2
 105                         disp "" >&2
 106                 fi
 107         fi
 108
 109         # no args passed or invalid command entered, just output help summary
 110
 111         disp "Guilt v$GUILT_VERSION"
 112         disp ""
 113         disp "Pick a command:"
 114         guilt_commands | sort | column | column -t | sed -e 's/^/       /'
 115
 116         disp ""
 117         disp "Example:"
 118         disp "\tguilt-push"
 119         disp "or"
 120         disp "\tguilt push"
 121
 122         # now, let's exit
 123         exit 1
 124 fi
 125
 126 ########
 127
 128 #
 129 # Library goodies
 130 #
 131
 132 # usage: valid_patchname <patchname>
 133 valid_patchname()
 134 {
 135         case "$1" in
 136                 /*|./*|../*|*/./*|*/../*|*/.|*/..|*/|*\ *|*\    *)
 137                         return 1;;
 138                 *)
 139                         return 0;;
 140         esac
 141 }
 142
 143 get_branch()
 144 {
 145         silent git symbolic-ref HEAD || \
 146                 die "Working on a detached HEAD is unsupported."
 147
 148         git symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
 149 }
 150
 151 verify_branch()
 152 {
 153         [ ! -d "$GIT_DIR/patches" ] &&
 154                 die "Patches directory doesn't exist, try guilt-init"
 155         [ ! -d "$GIT_DIR/patches/$branch" ] &&
 156                 die "Branch $branch is not initialized, try guilt-init"
 157         [ ! -f "$GIT_DIR/patches/$branch/series" ] &&
 158                 die "Branch $branch does not have a series file"
 159         [ ! -f "$GIT_DIR/patches/$branch/status" ] &&
 160                 die "Branch $branch does not have a status file"
 161         [ -f "$GIT_DIR/patches/$branch/applied" ] &&
 162                 die "Warning: Branch $branch has 'applied' file - guilt is not compatible with stgit"
 163 }
 164
 165 get_top()
 166 {
 167         tail -1 "$GUILT_DIR/$branch/status"
 168 }
 169
 170 get_prev()
 171 {
 172         if [ `wc -l < "$GUILT_DIR/$branch/status"` -gt 1 ]; then
 173                 tail -n 2 "$GUILT_DIR/$branch/status" | head -n 1
 174         fi
 175 }
 176
 177 get_series()
 178 {
 179         # ignore all lines matching:
 180         #       - empty lines
 181         #       - whitespace only
 182         #       - optional whitespace followed by '#' followed by more
 183         #         optional whitespace
 184         grep -ve '^[[:space:]]*\(#.*\)*$' "$series"
 185 }
 186
 187 # usage: do_make_header <hash>
 188 do_make_header()
 189 {
 190         # we should try to work with commit objects only
 191         if [ `git cat-file -t "$1"` != "commit" ]; then
 192                 disp "Hash $1 is not a commit object" >&2
 193                 disp "Aborting..." >&2
 194                 exit 2
 195         fi
 196
 197         git cat-file -p "$1" | awk '
 198                 BEGIN{headers=1; firstline=1}
 199                 /^author / && headers {
 200                         sub(/^author +/, "");
 201                         sub(/ [0-9]* [+-]*[0-9][0-9]*$/, "");
 202                         author=$0
 203                 }
 204                 !headers {
 205                         print
 206                         if (firstline) {
 207                                 firstline = 0;
 208                                 print "\nFrom: " author;
 209                         }
 210                 }
 211                 /^$/ && headers { headers = 0 }
 212         '
 213 }
 214
 215 # usage: do_get_patch patchfile
 216 do_get_patch()
 217 {
 218         cat "$1" | awk '
 219 BEGIN{}
 220 /^(diff |---)/,/END{}/
 221 '
 222 }
 223
 224 # usage: do_get_header patchfile
 225 do_get_header()
 226 {
 227         # The complexity arises from the fact that we want to ignore the
 228         # From line and the empty line after it if it exists
 229
 230         # 2nd line skips the From line
 231         # 3rd line skips the empty line right after a From line
 232         # 4th line terminates execution when we encounter the diff
 233         cat "$1" | awk '
 234 BEGIN{skip=0}
 235 /^Subject:/ && (NR==1){print substr($0, 10); next}
 236 /^From:/{skip=1; next}
 237 /^[ \t\f\n\r\v]*$/ && (skip==1){skip=0; next}
 238 /^(diff |---)/{exit}
 239 {print $0}
 240 END{}
 241 '
 242 }
 243
 244 # usage: do_get_full_header patchfile
 245 do_get_full_header()
 246 {
 247         # 2nd line checks for the begining of a patch
 248         # 3rd line outputs the line if it didn't get pruned by the above rules
 249         cat "$1" | awk '
 250 BEGIN{}
 251 /^(diff |---)/{exit}
 252 {print $0}
 253 END{}
 254 '
 255 }
 256
 257 # usage: assert_head_check
 258 assert_head_check()
 259 {
 260         if ! head_check refs/patches/$branch/`get_top`; then
 261                 die "aborting..."
 262         fi
 263 }
 264
 265 # usage: head_check <expected hash>
 266 head_check()
 267 {
 268         # make sure we're not doing funky things to commits that don't
 269         # belong to us
 270
 271         case "$1" in
 272                 '')
 273                         # the expected hash is empty
 274                         return 0 ;;
 275                 refs/patches/$branch/)
 276                         # the expected hash is an invalid rev
 277                         return 0 ;;
 278         esac
 279
 280         if [ "`git rev-parse refs/heads/$branch`" != "`git rev-parse $1`" ]; then
 281                 disp "Expected HEAD commit $1" >&2
 282                 disp "                 got `git rev-parse refs/heads/$branch`" >&2
 283                 return 1
 284         fi
 285         return 0
 286 }
 287
 288 # usage: series_insert_patch <patchname>
 289 series_insert_patch()
 290 {
 291         awk -v top="`get_top`" -v new="$1" \
 292                 'BEGIN{if (top == "") print new;}
 293                 {
 294                         print $0;
 295                         if (top != "" && top == $0) print new;
 296                 }' "$series" > "$series.tmp"
 297         mv "$series.tmp" "$series"
 298 }
 299
 300 # usage: series_remove_patch <patchname>
 301 series_remove_patch()
 302 {
 303         grep -v "^$1\$" < "$series" > "$series.tmp"
 304         mv "$series.tmp" "$series"
 305 }
 306
 307 # usage: series_rename_patch <oldname> <newname>
 308 series_rename_patch()
 309 {
 310         awk -v old="$1" -v new="$2" \
 311                 '{ if ($0 == old) print new; else print $0 }' \
 312                 "$series" > "$series.tmp"
 313
 314         mv "$series.tmp" "$series"
 315 }
 316
 317 # usage: series_rename_patch <oldpatchname> <newpatchname>
 318 ref_rename_patch()
 319 {
 320         git update-ref "refs/patches/$branch/$2" `git rev-parse "refs/patches/$branch/$1"`
 321         remove_ref "refs/patches/$branch/$1"
 322 }
 323
 324 # Beware! This is one of the few (only?) places where we modify the applied
 325 # file directly
 326 #
 327 # usage: applied_rename_patch <oldname> <newname>
 328 applied_rename_patch()
 329 {
 330         awk -v old="$1" -v new="$2" \
 331                         'BEGIN{FS=":"}
 332                         { if ($0 == old)
 333                                 print new;
 334                         else
 335                                 print;
 336                         }' "$applied" > "$applied.tmp"
 337
 338         mv "$applied.tmp" "$applied"
 339 }
 340
 341 # usage: remove_patch_refs
 342 # reads patch names from stdin
 343 remove_patch_refs()
 344 {
 345         while read pname; do
 346                 remove_ref "refs/patches/$branch/$pname"
 347         done
 348 }
 349
 350 # usage: pop_many_patches <commitish> <number of patches>
 351 pop_many_patches()
 352 {
 353         assert_head_check
 354
 355         (
 356                 cd "$TOP_DIR"
 357
 358                 # remove the patches refs
 359                 tail -$2 < "$applied" | remove_patch_refs
 360
 361                 git reset --hard "$1" > /dev/null
 362                 head -n "-$2" < "$applied" > "$applied.tmp"
 363                 mv "$applied.tmp" "$applied"
 364         )
 365 }
 366
 367 # usage: pop_all_patches
 368 pop_all_patches()
 369 {
 370         pop_many_patches \
 371                 `git rev-parse refs/patches/$branch/$(head -1 "$applied")^` \
 372                 `wc -l < "$applied"`
 373 }
 374
 375 # usage: remove_ref <refname>
 376 remove_ref()
 377 {
 378         (
 379                 # does the ref exist?
 380                 r=`git show-ref --verify -s "$1" 2> /dev/null`
 381                 [ $? -ne 0 ] && exit 0
 382
 383                 # remove it
 384                 git update-ref -d "$1" "$r"
 385         )
 386 }
 387
 388 # usage: commit patchname parent
 389 commit()
 390 {
 391         (
 392                 TMP_MSG=`get_tmp_file msg`
 393
 394                 p="$GUILT_DIR/$branch/$1"
 395                 pname="$1"
 396                 cd_to_toplevel
 397
 398                 git diff-files --name-only | (while read n; do git update-index "$n" ; done)
 399
 400                 # grab a commit message out of the patch
 401                 do_get_header "$p" > "$TMP_MSG"
 402
 403                 # make a default commit message if patch doesn't contain one
 404                 [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG"
 405
 406                 # extract a From line from the patch header, and set
 407                 # GIT_AUTHOR_{NAME,EMAIL}
 408                 author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---)/ q' "$p"`
 409                 if [ ! -z "$author_str" ]; then
 410                         GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
 411                         export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
 412                         export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
 413                 fi
 414
 415                 # must strip nano-second part otherwise git gets very
 416                 # confused, and makes up strange timestamps from the past
 417                 # (chances are it decides to interpret it as a unix
 418                 # timestamp).
 419                 export GIT_AUTHOR_DATE="`stat -c %y "$p" | sed -e '
 420 s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/'`"
 421                 export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 422
 423                 # commit
 424                 treeish=`git write-tree`
 425                 commitish=`git commit-tree $treeish -p $2 < "$TMP_MSG"`
 426                 git update-ref HEAD $commitish
 427
 428                 # mark patch as applied
 429                 git update-ref "refs/patches/$branch/$pname" HEAD
 430
 431                 rm -f "$TMP_MSG"
 432         )
 433 }
 434
 435 # usage: push_patch patchname [bail_action]
 436 push_patch()
 437 {
 438         __push_patch_bail=0
 439
 440         (
 441                 TMP_LOG=`get_tmp_file log`
 442
 443                 p="$GUILT_DIR/$branch/$1"
 444                 pname="$1"
 445                 bail_action="$2"
 446                 reject="--reject"
 447
 448                 assert_head_check
 449                 cd_to_toplevel
 450
 451                 # apply the patch if and only if there is something to apply
 452                 if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
 453                         if [ "$bail_action" = abort ]; then
 454                                 reject=""
 455                         fi
 456                         git apply -C$guilt_push_diff_context --index \
 457                                 $reject "$p" > /dev/null 2> "$TMP_LOG"
 458                         __push_patch_bail=$?
 459
 460                         if [ $__push_patch_bail -ne 0 ]; then
 461                                 cat "$TMP_LOG" >&2
 462                                 if [ "$bail_action" = "abort" ]; then
 463                                         rm -f "$TMP_LOG" "$TMP_MSG"
 464                                         return $__push_patch_bail
 465                                 fi
 466                         fi
 467                 fi
 468
 469                 commit "$pname" HEAD
 470
 471                 echo "$pname" >> $applied
 472
 473                 rm -f "$TMP_LOG"
 474         )
 475
 476         # sub-shell funky-ness
 477         __push_patch_bail=$?
 478
 479         return $__push_patch_bail
 480 }
 481
 482 # usage: must_commit_first
 483 must_commit_first()
 484 {
 485         git update-index --refresh --unmerged -q > /dev/null
 486         [ `git diff-files | wc -l` -eq 0 ] || return $?
 487         [ `git diff-index HEAD | wc -l` -eq 0 ]
 488         return $?
 489 }
 490
 491 # usage: fold_patch patchname
 492 fold_patch()
 493 {
 494         set -- "$1" "`get_top`"
 495
 496         assert_head_check
 497
 498         push_patch "$1"
 499
 500         __refresh_patch "$2" HEAD^^ 2 "" ""
 501
 502         series_remove_patch "$1"
 503 }
 504
 505 # usage: refresh_patch patchname gengitdiff incldiffstat
 506 refresh_patch()
 507 {
 508         __refresh_patch "$1" HEAD^ 1 "$2" "$3"
 509 }
 510
 511 # usage: __refresh_patch patchname commitish number_of_commits gengitdiff
 512 #                        incldiffstat
 513 __refresh_patch()
 514 {
 515         assert_head_check
 516
 517         (
 518                 TMP_DIFF=`get_tmp_file diff`
 519
 520                 cd "$TOP_DIR"
 521                 p="$GUILT_DIR/$branch/$1"
 522                 pname="$1"
 523
 524                 # get the patch header
 525                 do_get_full_header "$p" > "$TMP_DIFF"
 526
 527                 [ ! -z "$4" ] && diffopts="-C -M --find-copies-harder"
 528
 529                 if [ ! -z "$5" ]; then
 530                         (
 531                                 echo "---"
 532                                 git diff --stat $diffopts "$2"
 533                                 echo ""
 534                         ) >> "$TMP_DIFF"
 535                 fi
 536
 537                 # get the new patch
 538                 git diff $diffopts "$2" >> "$TMP_DIFF"
 539
 540                 # move the new patch in
 541                 mv "$p" "$p~"
 542                 mv "$TMP_DIFF" $p
 543
 544                 # commit
 545                 commit "$pname" "HEAD~$3"
 546
 547                 # drop folded patches
 548                 N=`expr "$3" - 1`
 549
 550                 # remove the patches refs
 551                 tail -$N < "$applied" | remove_patch_refs
 552
 553                 head -n "-$N" < "$applied" > "$applied.tmp"
 554                 mv "$applied.tmp" "$applied"
 555         )
 556 }
 557
 558 # usage: munge_hash_range <hash range>
 559 #
 560 # this means:
 561 #       <hash>                  - one commit
 562 #       <hash>..                - hash until head (excludes hash, includes head)
 563 #       ..<hash>                - until hash (includes hash)
 564 #       <hash1>..<hash2>        - from hash to hash (inclusive)
 565 #
 566 # The output of this function is suitable to be passed to "git rev-list"
 567 munge_hash_range()
 568 {
 569         case "$1" in
 570                 *..*..*|*\ *)
 571                         # double .. or space is illegal
 572                         return 1;;
 573                 ..*)
 574                         # e.g., "..v0.10"
 575                         echo ${1#..};;
 576                 *..)
 577                         # e.g., "v0.19.."
 578                         echo ${1%..}..HEAD;;
 579                 *..*)
 580                         # e.g., "v0.19-rc1..v0.19"
 581                         echo ${1%%..*}..${1#*..};;
 582                 ?*)
 583                         # e.g., "v0.19"
 584                         echo $1^..$1;;
 585                 *)  # empty
 586                         return 1;;
 587         esac
 588         return 0
 589 }
 590
 591 # usage: get_tmp_file <prefix> [<opts>]
 592 #
 593 # Get a unique filename and create the file in a non-racy way
 594 get_tmp_file()
 595 {
 596         while true; do
 597                 mktemp $2 "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
 598         done
 599 }
 600
 601 # usage: guilt_hook <hook name> <args....>
 602 guilt_hook()
 603 {
 604         __hookname="$1"
 605         [ ! -x "$GIT_DIR/hooks/guilt/$__hookname" ] && return 0
 606
 607         shift
 608
 609         "$GIT_DIR/hooks/guilt/$__hookname" "$@"
 610         return $?
 611 }
 612
 613 #
 614 # Some constants
 615 #
 616
 617 # used for: git apply -C <val>
 618 guilt_push_diff_context=1
 619
 620 #
 621 # Parse any part of .git/config that belongs to us
 622 #
 623
 624 #
 625 # The following gets run every time this file is source'd
 626 #
 627
 628 GUILT_DIR="$GIT_DIR/patches"
 629
 630 branch=`get_branch`
 631
 632 # most of the time we want to verify that the repo's branch has been
 633 # initialized, but every once in a blue moon (e.g., we want to run guilt-init),
 634 # we must avoid the checks
 635 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 636         verify_branch
 637
 638         # do not check the status file format (guilt-repair needs this,
 639         # otherwise nothing can do what's necessary to bring the repo into a
 640         # useable state)
 641         if [ -z "$DO_NOT_CHECK_STATUS_FILE_FORMAT" ]; then
 642                 [ -s "$GIT_DIR/patches/$branch/status" ] &&
 643                         grep "^[0-9a-f]\{40\}:" "$GIT_DIR/patches/$branch/status" > /dev/null &&
 644                         die "Status file appears to use old format, try guilt-repair --status"
 645         fi
 646 fi
 647
 648 # very useful files
 649 series="$GUILT_DIR/$branch/series"
 650 applied="$GUILT_DIR/$branch/status"
 651
 652 # determine an editor to use for anything interactive (fall back to vi)
 653 editor="vi"
 654 [ ! -z "$EDITOR" ] && editor="$EDITOR"
 655
 656 # determine a pager to use for anything interactive (fall back to more)
 657 pager="more"
 658 [ ! -z "$PAGER" ] && pager="$PAGER"