git-quiltimport.sh 3.26 KB
Newer Older
1
#!/bin/sh
2 3
OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
Stephan Beyer's avatar
Stephan Beyer committed
4
git quiltimport [options]
5 6 7 8 9
--
n,dry-run     dry run
author=       author name and email address for patches without any
patches=      path to the quilt series and patches
"
10 11 12
SUBDIRECTORY_ON=Yes
. git-sh-setup

13
dry_run=""
14
quilt_author=""
15
while test $# != 0
16 17
do
	case "$1" in
18
	--author)
19 20 21
		shift
		quilt_author="$1"
		;;
22
	-n|--dry-run)
23 24
		dry_run=1
		;;
25
	--patches)
26
		shift
27
		QUILT_PATCHES="$1"
28
		;;
29 30 31
	--)
		shift
		break;;
32
	*)
33
		usage
34 35
		;;
	esac
36
	shift
37 38 39 40 41 42 43 44
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" ||
45
	die "malformed --author parameter"
46 47 48 49 50 51 52 53 54
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
55
# Temporary directories
56
tmp_dir="$GIT_DIR"/rebase-apply
57 58 59 60 61 62
tmp_msg="$tmp_dir/msg"
tmp_patch="$tmp_dir/patch"
tmp_info="$tmp_dir/info"


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

mkdir $tmp_dir || exit 2
66 67 68 69
while read patch_name level garbage
do
	case "$patch_name" in ''|'#'*) continue;; esac
	case "$level" in
70
	-p*)	;;
71 72 73 74 75 76 77 78 79 80 81 82
	''|'#'*)
		level=;;
	*)
		echo "unable to parse patch level, ignoring it."
		level=;;
	esac
	case "$garbage" in
	''|'#'*);;
	*)
		echo "trailing garbage found in series file: $garbage"
		exit 1;;
	esac
83 84 85 86
	if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
		echo "$patch_name doesn't exist. Skipping."
		continue
	fi
87
	echo $patch_name
88 89 90
	git mailinfo "$tmp_msg" "$tmp_patch" \
		<"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
	test -s "$tmp_patch" || {
91
		echo "Patch is empty.  Was it split wrong?"
92
		exit 1
93
	}
94 95

	# Parse the author information
96 97 98
	GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
	GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
99 100 101 102
	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";
103 104 105 106
		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";
107
		else
108
			echo "No author found in $patch_name" >&2;
109 110
			echo "---"
			cat $tmp_msg
111
			printf "Author: ";
112 113 114 115 116 117 118 119 120 121 122 123
			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
124 125 126
	GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
	SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
	export GIT_AUTHOR_DATE SUBJECT
127 128 129 130
	if [ -z "$SUBJECT" ] ; then
		SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
	fi

131
	if [ -z "$dry_run" ] ; then
132
		git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
133 134 135
		tree=$(git write-tree) &&
		commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
		git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
136
	fi
137
done <"$QUILT_PATCHES/series"
138
rm -rf $tmp_dir || exit 5