git-quiltimport.sh 3.04 KB
Newer Older
1
#!/bin/sh
2
USAGE='--dry-run --author <author> --patches </path/to/quilt/patch/directory>'
3 4 5
SUBDIRECTORY_ON=Yes
. git-sh-setup

6
dry_run=""
7 8 9 10 11
quilt_author=""
while case "$#" in 0) break;; esac
do
	case "$1" in
	--au=*|--aut=*|--auth=*|--autho=*|--author=*)
Dennis Stosberg's avatar
Dennis Stosberg committed
12
		quilt_author=$(expr "z$1" : 'z-[^=]*\(.*\)')
13 14 15 16 17 18 19 20 21 22
		shift
		;;

	--au|--aut|--auth|--autho|--author)
		case "$#" in 1) usage ;; esac
		shift
		quilt_author="$1"
		shift
		;;

23 24 25 26 27
	--dry-run)
		shift
		dry_run=1
		;;

28
	--pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
Dennis Stosberg's avatar
Dennis Stosberg committed
29
		QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
		shift
		;;

	--pa|--pat|--patc|--patch|--patche|--patches)
		case "$#" in 1) usage ;; esac
		shift
		QUILT_PATCHES="$1"
		shift
		;;

	*)
		break
		;;
	esac
done

# Quilt Author
if [ -n "$quilt_author" ] ; then
	quilt_author_name=$(expr "z$quilt_author" : 'z\(.*[^ ]\) *<.*') &&
	quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
	test '' != "$quilt_author_name" &&
	test '' != "$quilt_author_email" ||
52
	die "malformed --author parameter"
53 54 55 56 57 58 59 60 61
fi

# Quilt patch directory
: ${QUILT_PATCHES:=patches}
if ! [ -d "$QUILT_PATCHES" ] ; then
	echo "The \"$QUILT_PATCHES\" directory does not exist."
	exit 1
fi

Pavel Roskin's avatar
Pavel Roskin committed
62
# Temporary directories
63 64 65 66 67 68 69 70 71 72 73 74 75
tmp_dir=.dotest
tmp_msg="$tmp_dir/msg"
tmp_patch="$tmp_dir/patch"
tmp_info="$tmp_dir/info"


# Find the intial commit
commit=$(git-rev-parse HEAD)

mkdir $tmp_dir || exit 2
for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
	echo $patch_name
	(cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3
76
	test -s .dotest/patch || {
77
		echo "Patch is empty.  Was it split wrong?"
78
		exit 1
79
	}
80 81 82 83 84 85 86 87

	# Parse the author information
	export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
	export GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
	while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do
		if [ -n "$quilt_author" ] ; then
			GIT_AUTHOR_NAME="$quilt_author_name";
			GIT_AUTHOR_EMAIL="$quilt_author_email";
88 89 90 91
		elif [ -n "$dry_run" ]; then
			echo "No author found in $patch_name" >&2;
			GIT_AUTHOR_NAME="dry-run-not-found";
			GIT_AUTHOR_EMAIL="dry-run-not-found";
92
		else
93
			echo "No author found in $patch_name" >&2;
94 95
			echo "---"
			cat $tmp_msg
96
			printf "Author: ";
97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
			read patch_author

			echo "$patch_author"

			patch_author_name=$(expr "z$patch_author" : 'z\(.*[^ ]\) *<.*') &&
			patch_author_email=$(expr "z$patch_author" : '.*<\([^>]*\)') &&
			test '' != "$patch_author_name" &&
			test '' != "$patch_author_email" &&
			GIT_AUTHOR_NAME="$patch_author_name" &&
			GIT_AUTHOR_EMAIL="$patch_author_email"
		fi
	done
	export GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
	export SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
	if [ -z "$SUBJECT" ] ; then
		SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
	fi

115 116 117
	if [ -z "$dry_run" ] ; then
		git-apply --index -C1 "$tmp_patch" &&
		tree=$(git-write-tree) &&
118
		commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git-commit-tree $tree -p $commit) &&
119
		git-update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
120
	fi
121 122
done
rm -rf $tmp_dir || exit 5