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

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

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

61 62 63 64 65 66 67
# Quilt series file
: ${QUILT_SERIES:=$QUILT_PATCHES/series}
if ! [ -e "$QUILT_SERIES" ] ; then
	echo "The \"$QUILT_SERIES\" file does not exist."
	exit 1
fi

Pavel Roskin's avatar
Pavel Roskin committed
68
# Temporary directories
69
tmp_dir="$GIT_DIR"/rebase-apply
70 71 72 73 74
tmp_msg="$tmp_dir/msg"
tmp_patch="$tmp_dir/patch"
tmp_info="$tmp_dir/info"


75
# Find the initial commit
76
commit=$(git rev-parse HEAD)
77 78

mkdir $tmp_dir || exit 2
79
while read patch_name level garbage <&3
80 81 82
do
	case "$patch_name" in ''|'#'*) continue;; esac
	case "$level" in
83
	-p*)	;;
84 85 86 87 88 89 90 91 92 93 94 95
	''|'#'*)
		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
96 97 98 99
	if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
		echo "$patch_name doesn't exist. Skipping."
		continue
	fi
100
	echo $patch_name
101 102 103
	git mailinfo "$tmp_msg" "$tmp_patch" \
		<"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
	test -s "$tmp_patch" || {
104
		echo "Patch is empty.  Was it split wrong?"
105
		exit 1
106
	}
107 108

	# Parse the author information
109 110 111
	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
112 113 114 115
	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";
116 117 118 119
		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";
120
		else
121
			echo "No author found in $patch_name" >&2;
122 123
			echo "---"
			cat $tmp_msg
124
			printf "Author: ";
125 126 127 128 129 130 131 132 133 134 135 136
			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
137 138 139
	GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
	SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
	export GIT_AUTHOR_DATE SUBJECT
140 141 142 143
	if [ -z "$SUBJECT" ] ; then
		SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
	fi

144
	if [ -z "$dry_run" ] ; then
145
		git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
146 147 148
		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
149
	fi
150
done 3<"$QUILT_SERIES"
151
rm -rf $tmp_dir || exit 5