mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
create-pull-request: provide an RFC mode via -c argument
Currently it is difficult to know if a pull request is being sent for review or just to be pulled. Add a -c argument to add RFC to the subject prefix and a blurb requesting review to the cover letter. (From OE-Core rev: e4f66ec2a8af56fb4d0a85df46bfaa3bb1409d31) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Acked-by: Joshua Lock <josh@linux.intel.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Saul Wold <sgw@linux.intel.com> Cc: Paul Eggleton <paul.eggleton@intel.com> Cc: Joshua Lock <josh@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5ad2ebadfb
commit
dca0c48465
|
@ -3,12 +3,14 @@ ODIR=pull-$$
|
|||
RELATIVE_TO="master"
|
||||
COMMIT_ID="HEAD"
|
||||
PREFIX="PATCH"
|
||||
RFC=0
|
||||
|
||||
usage() {
|
||||
CMD=$(basename $0)
|
||||
cat <<EOM
|
||||
Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -u remote -b branch
|
||||
-b branch Branch name in the specified remote
|
||||
-c Create an RFC (Request for Comment) patch series
|
||||
-h Display this help message
|
||||
-i commit_id Ending commit (default: HEAD)
|
||||
-m msg_body_file The file containing a blurb to be inserted into the summary email
|
||||
|
@ -27,11 +29,14 @@ EOM
|
|||
}
|
||||
|
||||
# Parse and validate arguments
|
||||
while getopts "b:hi:m:o:p:r:s:u:" OPT; do
|
||||
while getopts "b:chi:m:o:p:r:s:u:" OPT; do
|
||||
case $OPT in
|
||||
b)
|
||||
BRANCH="$OPTARG"
|
||||
;;
|
||||
c)
|
||||
RFC=1
|
||||
;;
|
||||
h)
|
||||
usage
|
||||
exit 0
|
||||
|
@ -89,6 +94,10 @@ if [ -z "$BRANCH" ] || [ -z "$REMOTE_URL" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ $RFC -eq 1 ]; then
|
||||
PREFIX="RFC $PREFIX"
|
||||
fi
|
||||
|
||||
|
||||
# Set WEB_URL from known remotes
|
||||
case "$REMOTE_URL" in
|
||||
|
@ -125,7 +134,7 @@ git format-patch -M --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --co
|
|||
# Customize the cover letter
|
||||
CL="$ODIR/0000-cover-letter.patch"
|
||||
PM="$ODIR/pull-msg"
|
||||
git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID > "$PM"
|
||||
git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: git request-pull reported an error"
|
||||
exit 1
|
||||
|
@ -136,6 +145,17 @@ fi
|
|||
sed -n "0,\#$REMOTE_URL# p" "$PM" | sed -i "/BLURB HERE/ r /dev/stdin" "$CL"
|
||||
rm "$PM"
|
||||
|
||||
# If this is an RFC, make that clear in the cover letter
|
||||
if [ $RFC -eq 1 ]; then
|
||||
(cat <<EOM
|
||||
Please review the following changes for suitability for inclusion. If you have
|
||||
any objections or suggestions for improvement, please respond to the patches. If
|
||||
you agree with the changes, please provide your Acked-by.
|
||||
|
||||
EOM
|
||||
) | sed -i "/BLURB HERE/ r /dev/stdin" "$CL"
|
||||
fi
|
||||
|
||||
# Insert the WEB_URL if there is one
|
||||
if [ -n "$WEB_URL" ]; then
|
||||
echo " $WEB_URL" | sed -i "\#$REMOTE_URL# r /dev/stdin" "$CL"
|
||||
|
|
Loading…
Reference in New Issue
Block a user