summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2010-11-06 09:42:28 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-10 21:22:27 +0800
commit1f0e2cf16afdc7d8e895a28d45b0d956144c56d6 (patch)
treec15ef0b5559076b515529ebe4bb986405c01fef1 /scripts
parent09ee361d42634687e1dd130af8e343332320bf83 (diff)
downloadpoky-1f0e2cf16afdc7d8e895a28d45b0d956144c56d6.tar.gz
git-pull: add the new create-pull-request script
The previous create-pull-request only generated a cover letter. When used to send to the list, it did not include the patches, which made it difficult to perform peer review. A pull request without patches is typically only sent by a maintainer. As we are not all maintainers, we need a means to easily submit patches for review. As we are accustomed to making pull requests, this script retains a git-pull-style cover letter, while sending the relevant patches as responses to the pull. This will provide the necessary context for peer review, and still allow people to collapse threads and see no more mail than they were previously. This version retains the relative_to, commit_id, and contrib_branch arguments from the original, along with their default values. It adds several more, resulting in a highly flexible tool. The script creates a pull directory (pull-$$ by default, configurable via the -o option) and populates it with a git-format-patch generated patch series and cover letter. The cover letter is modified to include the git and http pull URLs and branch name, as well as a basic signature from the author pulled from git's user.name and user.email config. git-format-patch provides the shortlog and diffstat of the series. Breaking a bit from the original, this script maintains the [PATCH] subject prefix in the cover letter (as opposed to [GIT PULL]. This is better suited to the majority of developers (who are not maintainers). This prefix is configurable with the -p option, allowing you to create an [RFC PATCH] prefix, for example. By default, the generated cover letter with contain "*** SUBJECT HERE ***" and "*** BLURB HERE ***" tokens which you should replace with something appropriate prior to sending the messages. When developing multiple versions of a patch series, it can save time to maintain a message.txt file, rather than having to retype the message body of the cover letter every time. The -m option allows you to specify a message file and replace the "*** BLURB HERE ***" token of the cover letter with the contents of the message file. Finally, the -s option will replace the "*** SUBJECT HERE ***" token in the cover letter with the specified subject. The generated patches are suitable for sending via sendmail. Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Nitin A Kamble <nitin.a.kamble@intel.com> CC: Richard Purdie <rpurdie@linux.intel.com> CC: Saul Wold <saul.wold@intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/create-pull-request129
1 files changed, 129 insertions, 0 deletions
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
new file mode 100755
index 0000000000..5ad7666ab3
--- /dev/null
+++ b/scripts/create-pull-request
@@ -0,0 +1,129 @@
1#!/bin/bash
2ODIR=pull-$$
3RELATIVE_TO="master"
4COMMIT_ID="HEAD"
5PULL_URL="git://git.pokylinux.org/poky-contrib.git"
6PREFIX="PATCH"
7
8usage() {
9CMD=$(basename $0)
10cat <<EOM
11Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -b contrib_branch
12 -h Display this help message
13 -o output_dir Specify the output directory for the messages (default: pull-PID)
14 -m msg_body_file The file containing a blurb to be inserted into the summary email
15 -r relative_to Starting commit (default: master)
16 -i commit_id Ending commit (default: HEAD)
17 -b contrib_branch Branch-name in the git.pokylinux.org/poky-contrib tree
18 -s subject The subject to be inserted into the summary email
19 -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix
20
21 Examples:
22 $CMD -b nitin/basic
23 $CMD -r distro/master -i nitin/distro -b nitin/distro
24 $CMD -r master -i misc -b nitin/misc -o pull-misc
25 $CMD -p "RFC PATCH" -b nitin/experimental
26EOM
27}
28
29# Parse and validate arguments
30while getopts "b:hi:m:o:r:s:p:" OPT; do
31 case $OPT in
32 b)
33 CONTRIB_BRANCH="$OPTARG"
34 ;;
35 h)
36 usage
37 exit 0
38 ;;
39 i)
40 COMMIT_ID="$OPTARG"
41 ;;
42 m)
43 BODY="$OPTARG"
44 if [ ! -e "$BODY" ]; then
45 echo "ERROR: Body file does not exist"
46 exit 1
47 fi
48 ;;
49 o)
50 ODIR="$OPTARG"
51 ;;
52 p)
53 PREFIX="$OPTARG"
54 ;;
55 r)
56 RELATIVE_TO="$OPTARG"
57 ;;
58 s)
59 SUBJECT="$OPTARG"
60 ;;
61 esac
62done
63
64if [ -z "$CONTRIB_BRANCH" ]; then
65 usage
66 exit 1
67fi
68
69
70# Perform a sanity test on the web URL. Issue a warning if it is not
71# accessible, but do not abort as users may want to run offline.
72WEB_URL="http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=$CONTRIB_BRANCH"
73wget -q $WEB_URL -O /dev/null
74if [ $? -ne 0 ]; then
75 echo "WARNING: Branch '$CONTRIB_BRANCH' was not found on the contrib git tree."
76 echo " Please check your contrib-branch parameter before sending."
77 echo ""
78fi
79
80if [ -e $ODIR ]; then
81 echo "ERROR: output directory $ODIR exists."
82 exit 1
83fi
84mkdir $ODIR
85
86
87# Generate the patches and cover letter
88git format-patch -M --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
89
90
91# Customize the cover letter
92CL="$ODIR/0000-cover-letter.patch"
93(cat <<EOM
94
95Pull URL: $PULL_URL
96 Branch: $CONTRIB_BRANCH
97 Browse: $WEB_URL
98
99Thanks,
100 $(git config user.name) <$(git config user.email)>
101---
102
103EOM
104) | sed -i "/BLURB HERE/ r /dev/stdin" "$CL"
105
106# If the user specified a message body, insert it into the cover letter and
107# remove the BLURB token.
108if [ -n "$BODY" ]; then
109 sed -i "/BLURB HERE/ r $BODY" "$CL"
110 sed -i "/BLURB HERE/ d" "$CL"
111fi
112
113# If the user specified a subject, replace the SUBJECT token with it.
114if [ -n "$SUBJECT" ]; then
115 sed -i -e "s/\*\*\* SUBJECT HERE \*\*\*/$SUBJECT/" "$CL"
116fi
117
118
119# Generate report for user
120cat <<EOM
121The following patches have been prepared:
122$(for PATCH in $(ls $ODIR/*); do echo " $PATCH"; done)
123
124Review their content, especially the summary mail:
125 $CL
126
127When you are satisfied, you can send them with:
128 send-pull-request -a -p $ODIR
129EOM