guilt-import-commit

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2007
   4 #
   5
   6 USAGE="[<hash> | <since>..[<until>] | ..<until>]"
   7 . `dirname $0`/guilt
   8
   9 if [ $# -ne 1 ] || [ -z "$1" ]; then
  10         die "You must specify a range of commits"
  11 fi
  12
  13 rhash=`munge_hash_range $1`
  14
  15 # make sure that there are no unapplied changes
  16 if ! must_commit_first; then
  17         die "Uncommited changes detected. Refresh first."
  18 fi
  19
  20 disp "About to begin conversion..." >&2
  21 disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2
  22
  23 for rev in `git rev-list $rhash`; do
  24         s=`git log --pretty=oneline -1 $rev | cut -c 42-`
  25
  26         fname=`echo $s | sed -e "s/&/and/g" -e "s/[ :]/_/g" -e "s,[/\\],-,g" \
  27                         -e "s/['\\[{}]//g" -e 's/]//g' | tr A-Z a-z`
  28
  29         disp "Converting `echo $rev | cut -c 1-8` as $fname"
  30
  31         mangle_prefix=1
  32         fname_base=$fname
  33         while [ -f "$GUILT_DIR/$branch/$fname" ]; do
  34                 fname="$fname_base-$mangle_prefix"
  35                 mangle_prefix=`expr $mangle_prefix + 1`
  36                 disp "Patch under that name exists...trying '$fname'"
  37         done
  38
  39         (
  40                 do_make_header $rev
  41                 echo ""
  42                 git diff $rev^..$rev
  43         ) > $GUILT_DIR/$branch/$fname
  44
  45         # FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the
  46         # timestamp on the patch
  47
  48         # insert the patch name into the series file
  49         series_insert_patch $fname
  50
  51         # Only reset if the commit was on this branch
  52         if head_check $rev 2> /dev/null; then
  53                 # BEWARE: "git reset" ahead! Is there a way to verify that
  54                 # we really created a patch? - We don't want to lose any
  55                 # history.
  56                 git reset --hard $rev^ > /dev/null
  57         elif [ -z "$warned" ]; then
  58                 disp "Warning: commit $rev is not the HEAD...preserving commit" >&2
  59                 disp "Warning: (this message is displayed only once)" >&2
  60                 warned=t
  61         fi
  62 done
  63
  64 disp "Done." >&2
  65 disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2
  66