* [RFC PATCH v2 01/15] create-pull-request: alphabetize arguments
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 02/15] create-pull-request: whitespace cleanup Darren Hart
` (16 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Some initial cleanup prior to a significant overhaul.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 784b48c..658b9c2 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -10,14 +10,14 @@ usage() {
CMD=$(basename $0)
cat <<EOM
Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -b contrib_branch
+ -b contrib_branch Branch-name in the $PULL_URL
-h Display this help message
- -o output_dir Specify the output directory for the messages (default: pull-PID)
+ -i commit_id Ending commit (default: HEAD)
-m msg_body_file The file containing a blurb to be inserted into the summary email
+ -o output_dir Specify the output directory for the messages (default: pull-PID)
+ -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix
-r relative_to Starting commit (default: master)
- -i commit_id Ending commit (default: HEAD)
- -b contrib_branch Branch-name in the $PULL_URL
-s subject The subject to be inserted into the summary email
- -p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix
Examples:
$CMD -b nitin/basic
@@ -28,7 +28,7 @@ EOM
}
# Parse and validate arguments
-while getopts "b:hi:m:o:r:s:p:" OPT; do
+while getopts "b:hi:m:o:p:r:s:" OPT; do
case $OPT in
b)
CONTRIB_BRANCH="$OPTARG"
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 02/15] create-pull-request: whitespace cleanup
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 01/15] create-pull-request: alphabetize arguments Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 03/15] create-pull-request: use git request-pull and arbitrary remotes Darren Hart
` (15 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Indent with tabs, not spaces, to be consistent with other bash scripts.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 78 +++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 658b9c2..b911a64 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -29,42 +29,42 @@ EOM
# Parse and validate arguments
while getopts "b:hi:m:o:p:r:s:" OPT; do
- case $OPT in
- b)
- CONTRIB_BRANCH="$OPTARG"
- ;;
- h)
- usage
- exit 0
- ;;
- i)
- COMMIT_ID="$OPTARG"
- ;;
- m)
- BODY="$OPTARG"
- if [ ! -e "$BODY" ]; then
- echo "ERROR: Body file does not exist"
- exit 1
- fi
- ;;
- o)
- ODIR="$OPTARG"
- ;;
- p)
- PREFIX="$OPTARG"
- ;;
- r)
- RELATIVE_TO="$OPTARG"
- ;;
- s)
- SUBJECT="$OPTARG"
- ;;
- esac
+ case $OPT in
+ b)
+ CONTRIB_BRANCH="$OPTARG"
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
+ i)
+ COMMIT_ID="$OPTARG"
+ ;;
+ m)
+ BODY="$OPTARG"
+ if [ ! -e "$BODY" ]; then
+ echo "ERROR: Body file does not exist"
+ exit 1
+ fi
+ ;;
+ o)
+ ODIR="$OPTARG"
+ ;;
+ p)
+ PREFIX="$OPTARG"
+ ;;
+ r)
+ RELATIVE_TO="$OPTARG"
+ ;;
+ s)
+ SUBJECT="$OPTARG"
+ ;;
+ esac
done
if [ -z "$CONTRIB_BRANCH" ]; then
- usage
- exit 1
+ usage
+ exit 1
fi
@@ -73,9 +73,9 @@ fi
WEB_URL="$WEB_URL_PREFIX$CONTRIB_BRANCH"
wget -q $WEB_URL -O /dev/null
if [ $? -ne 0 ]; then
- echo "WARNING: Branch '$CONTRIB_BRANCH' was not found on the contrib git tree."
- echo " Please check your contrib-branch parameter before sending."
- echo ""
+ echo "WARNING: Branch '$CONTRIB_BRANCH' was not found on the contrib git tree."
+ echo " Please check your contrib-branch parameter before sending."
+ echo ""
fi
if [ -e $ODIR ]; then
@@ -107,13 +107,13 @@ EOM
# If the user specified a message body, insert it into the cover letter and
# remove the BLURB token.
if [ -n "$BODY" ]; then
- sed -i "/BLURB HERE/ r $BODY" "$CL"
- sed -i "/BLURB HERE/ d" "$CL"
+ sed -i "/BLURB HERE/ r $BODY" "$CL"
+ sed -i "/BLURB HERE/ d" "$CL"
fi
# If the user specified a subject, replace the SUBJECT token with it.
if [ -n "$SUBJECT" ]; then
- sed -i -e "s/\*\*\* SUBJECT HERE \*\*\*/$SUBJECT/" "$CL"
+ sed -i -e "s/\*\*\* SUBJECT HERE \*\*\*/$SUBJECT/" "$CL"
fi
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 03/15] create-pull-request: use git request-pull and arbitrary remotes
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 01/15] create-pull-request: alphabetize arguments Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 02/15] create-pull-request: whitespace cleanup Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs Darren Hart
` (14 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Martin Jansa
Allow for arbitrary remotes via a new -u argument. Remove the hard coded
references to the pokylinux repositories. Create the WEB_URL from known
remotes. Future patches can add additional WEB_URL mappings for remotes
like Git Hub, Gitorious, and kernel.org.
Rather than duplicating the git request-pull command ourselves, just use
the existing one.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Joshua Lock <josh@linux.intel.com>
Cc: Tom Rini <tom_rini@mentor.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Joshua Lock <josh@linux.intel.com>
---
scripts/create-pull-request | 78 ++++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index b911a64..8f7f767 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -2,15 +2,13 @@
ODIR=pull-$$
RELATIVE_TO="master"
COMMIT_ID="HEAD"
-PULL_URL="git://git.openembedded.org/openembedded-core-contrib"
-WEB_URL_PREFIX="http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h="
PREFIX="PATCH"
usage() {
CMD=$(basename $0)
cat <<EOM
-Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -b contrib_branch
- -b contrib_branch Branch-name in the $PULL_URL
+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
-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
@@ -18,20 +16,21 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to
-p prefix Use [prefix N/M] instead of [PATCH N/M] as the subject prefix
-r relative_to Starting commit (default: master)
-s subject The subject to be inserted into the summary email
+ -u remote The git remote where the branch is located
Examples:
- $CMD -b nitin/basic
- $CMD -r distro/master -i nitin/distro -b nitin/distro
- $CMD -r master -i misc -b nitin/misc -o pull-misc
- $CMD -p "RFC PATCH" -b nitin/experimental
+ $CMD -u contrib -b nitin/basic
+ $CMD -u contrib -r distro/master -i nitin/distro -b nitin/distro
+ $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc
+ $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
EOM
}
# Parse and validate arguments
-while getopts "b:hi:m:o:p:r:s:" OPT; do
+while getopts "b:hi:m:o:p:r:s:u:" OPT; do
case $OPT in
b)
- CONTRIB_BRANCH="$OPTARG"
+ BRANCH="$OPTARG"
;;
h)
usage
@@ -59,23 +58,45 @@ while getopts "b:hi:m:o:p:r:s:" OPT; do
s)
SUBJECT="$OPTARG"
;;
+ u)
+ REMOTE="$OPTARG"
+ REMOTE_URL=$(git config remote.$REMOTE.url)
+ if [ $? -ne 0 ]; then
+ echo "ERROR: git config failed to find a url for '$REMOTE'"
+ exit 1
+ fi
+ REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
+ # The .git suffix is optional in the URL, drop in for the REPO
+ REMOTE_REPO=${REMOTE_REPO%.git}
+ ;;
esac
done
-if [ -z "$CONTRIB_BRANCH" ]; then
+if [ -z "$BRANCH" ] || [ -z "$REMOTE_URL" ]; then
usage
exit 1
fi
+# Set WEB_URL from known remotes
+case "$REMOTE_URL" in
+ *git.yoctoproject.org*)
+ WEB_URL="http://git.yoctoproject.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
+ ;;
+ *git.pokylinux.org*)
+ WEB_URL="http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
+ ;;
+esac
+
# Perform a sanity test on the web URL. Issue a warning if it is not
# accessible, but do not abort as users may want to run offline.
-WEB_URL="$WEB_URL_PREFIX$CONTRIB_BRANCH"
-wget -q $WEB_URL -O /dev/null
-if [ $? -ne 0 ]; then
- echo "WARNING: Branch '$CONTRIB_BRANCH' was not found on the contrib git tree."
- echo " Please check your contrib-branch parameter before sending."
- echo ""
+if [ -n "$WEB_URL" ]; then
+ wget -q $WEB_URL -O /dev/null
+ if [ $? -ne 0 ]; then
+ echo "WARNING: Branch '$BRANCH' was not found on the contrib git tree."
+ echo " Please check your remote and branch parameter before sending."
+ echo ""
+ fi
fi
if [ -e $ODIR ]; then
@@ -91,18 +112,23 @@ git format-patch -M --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --co
# Customize the cover letter
CL="$ODIR/0000-cover-letter.patch"
-(cat <<EOM
+PM="$ODIR/pull-msg"
+git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID > "$PM"
+if [ $? -ne 0 ]; then
+ echo "ERROR: git request-pull reported an error"
+ exit 1
+fi
-Pull URL: $PULL_URL
- Branch: $CONTRIB_BRANCH
- Browse: $WEB_URL
+# The cover letter already has a diffstat, remove it from the pull-msg
+# before inserting it.
+sed -n "0,\#$REMOTE_URL# p" "$PM" | sed -i "/BLURB HERE/ r /dev/stdin" "$CL"
+rm "$PM"
-Thanks,
- $(git config user.name) <$(git config user.email)>
----
+# Insert the WEB_URL if there is one
+if [ -n "$WEB_URL" ]; then
+ echo " $WEB_URL" | sed -i "\#$REMOTE_URL# r /dev/stdin" "$CL"
+fi
-EOM
-) | sed -i "/BLURB HERE/ r /dev/stdin" "$CL"
# If the user specified a message body, insert it into the cover letter and
# remove the BLURB token.
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (2 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 03/15] create-pull-request: use git request-pull and arbitrary remotes Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 23:40 ` Joshua Lock
2011-05-16 22:26 ` [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument Darren Hart
` (13 subsequent siblings)
17 siblings, 1 reply; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Martin Jansa
Rather than requiring users to have public remotes and private remotes when
their development remotes are ssh based (and therefor unsuitable for a pull
request URL), rewrite the ones we know about from ssh://git@ to git://.
As the remote url vary from remote to remote, do the REMOTE_REPO regex per
remote.
With this infrastructure in place, future patches can augment the list of
known remotes for things like Git Hub, Gitorious, kernel.org, etc.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Tom Rini <tom_rini@mentor.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
---
scripts/create-pull-request | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 8f7f767..429421b 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -65,7 +65,19 @@ while getopts "b:hi:m:o:p:r:s:u:" OPT; do
echo "ERROR: git config failed to find a url for '$REMOTE'"
exit 1
fi
- REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
+
+ # Rewrite known private URLs to public URLs
+ # Determine the repository name for use in the WEB_URL later
+ case "$REMOTE_URL" in
+ ssh://git@git.pokylinux.org*)
+ REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
+ REMOTE_URL=${REMOTE_URL/'ssh://git@'/'git://'}
+ ;;
+ ssh://git@git.yoctoproject.org*)
+ REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
+ REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
+ ;;
+ esac
# The .git suffix is optional in the URL, drop in for the REPO
REMOTE_REPO=${REMOTE_REPO%.git}
;;
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs
2011-05-16 22:26 ` [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs Darren Hart
@ 2011-05-16 23:40 ` Joshua Lock
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Lock @ 2011-05-16 23:40 UTC (permalink / raw)
To: openembedded-core
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote:
> Rather than requiring users to have public remotes and private remotes when
> their development remotes are ssh based (and therefor unsuitable for a pull
> request URL), rewrite the ones we know about from ssh://git@ to git://.
>
> As the remote url vary from remote to remote, do the REMOTE_REPO regex per
> remote.
>
> With this infrastructure in place, future patches can augment the list of
> known remotes for things like Git Hub, Gitorious, kernel.org, etc.
>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Joshua Lock <josh@linux.intel.com>
> Cc: Tom Rini <tom_rini@mentor.com>
> Cc: Martin Jansa <martin.jansa@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> scripts/create-pull-request | 14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
> index 8f7f767..429421b 100755
> --- a/scripts/create-pull-request
> +++ b/scripts/create-pull-request
> @@ -65,7 +65,19 @@ while getopts "b:hi:m:o:p:r:s:u:" OPT; do
> echo "ERROR: git config failed to find a url for '$REMOTE'"
> exit 1
> fi
> - REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
> +
> + # Rewrite known private URLs to public URLs
> + # Determine the repository name for use in the WEB_URL later
> + case "$REMOTE_URL" in
> + ssh://git@git.pokylinux.org*)
> + REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
> + REMOTE_URL=${REMOTE_URL/'ssh://git@'/'git://'}
> + ;;
> + ssh://git@git.yoctoproject.org*)
> + REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
> + REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
> + ;;
> + esac
> # The .git suffix is optional in the URL, drop in for the REPO
> REMOTE_REPO=${REMOTE_REPO%.git}
> ;;
--
Joshua Lock
Yocto Project Build Monkey
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 24+ messages in thread
* [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (3 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 04/15] create-pull-request: rewrite known private URLs to public URLs Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 23:40 ` Joshua Lock
2011-05-16 22:26 ` [RFC PATCH v2 06/15] send-pull-request: whitespace cleanup Darren Hart
` (12 subsequent siblings)
17 siblings, 1 reply; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton
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.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
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>
---
scripts/create-pull-request | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 429421b..202d99d 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -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"
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument
2011-05-16 22:26 ` [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument Darren Hart
@ 2011-05-16 23:40 ` Joshua Lock
0 siblings, 0 replies; 24+ messages in thread
From: Joshua Lock @ 2011-05-16 23:40 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote:
> 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.
>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Joshua Lock <josh@linux.intel.com>
> 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>
> ---
> scripts/create-pull-request | 24 ++++++++++++++++++++++--
> 1 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
> index 429421b..202d99d 100755
> --- a/scripts/create-pull-request
> +++ b/scripts/create-pull-request
> @@ -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"
--
Joshua Lock
Yocto Project Build Monkey
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 24+ messages in thread
* [RFC PATCH v2 06/15] send-pull-request: whitespace cleanup
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (4 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 05/15] create-pull-request: provide an RFC mode via -c argument Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 07/15] send-pull-request: remove local mta support Darren Hart
` (11 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Indent with tabs, not spaces, for consistency with other bash scripts.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/send-pull-request | 250 ++++++++++++++++++++++----------------------
1 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 3af2a9f..76dd7a2 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -31,72 +31,72 @@ EOM
# $2: The regex to match and strip from the line with email addresses
harvest_recipients()
{
- TO_CC=$1
- REGX=$2
- export IFS=$',\n'
- for PATCH in $PDIR/*.patch; do
- # Grab To addresses
- for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed "s/$REGX//"); do
- if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ -n "$EMAIL" ]; then
- if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi
- elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && [ -n "$EMAIL" ]; then
- if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi
- fi
- done
- done
- unset IFS
+ TO_CC=$1
+ REGX=$2
+ export IFS=$',\n'
+ for PATCH in $PDIR/*.patch; do
+ # Grab To addresses
+ for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed "s/$REGX//"); do
+ if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ -n "$EMAIL" ]; then
+ if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi
+ elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && [ -n "$EMAIL" ]; then
+ if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi
+ fi
+ done
+ done
+ unset IFS
}
# Parse and verify arguments
while getopts "af:ghp:t:" OPT; do
- case $OPT in
- a)
- AUTO=1
- ;;
- f)
- FROM="$OPTARG"
- ;;
- g)
- PULL_MTA="git"
- ;;
- h)
- usage
- exit 0
- ;;
- p)
- PDIR=${OPTARG%/}
- if [ ! -d $PDIR ]; then
- echo "ERROR: pull-dir \"$PDIR\" does not exist."
- usage
- exit 1
- fi
- ;;
- t)
- if [ -n "$TO" ]; then
- TO="$TO,$OPTARG"
- else
- TO="$OPTARG"
- fi
- ;;
- esac
+ case $OPT in
+ a)
+ AUTO=1
+ ;;
+ f)
+ FROM="$OPTARG"
+ ;;
+ g)
+ PULL_MTA="git"
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
+ p)
+ PDIR=${OPTARG%/}
+ if [ ! -d $PDIR ]; then
+ echo "ERROR: pull-dir \"$PDIR\" does not exist."
+ usage
+ exit 1
+ fi
+ ;;
+ t)
+ if [ -n "$TO" ]; then
+ TO="$TO,$OPTARG"
+ else
+ TO="$OPTARG"
+ fi
+ ;;
+ esac
done
if [ -z "$PDIR" ]; then
- echo "ERROR: you must specify a pull-dir."
- usage
- exit 1
+ echo "ERROR: you must specify a pull-dir."
+ usage
+ exit 1
fi
# Verify the cover letter is complete and free of tokens
CL="$PDIR/0000-cover-letter.patch"
for TOKEN in SUBJECT BLURB; do
- grep -q "*** $TOKEN HERE ***" "$CL"
- if [ $? -eq 0 ]; then
- echo "ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***')."
- exit 1
- fi
+ grep -q "*** $TOKEN HERE ***" "$CL"
+ if [ $? -eq 0 ]; then
+ echo "ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***')."
+ exit 1
+ fi
done
@@ -104,39 +104,39 @@ done
# In addition to To and CC headers/lines, the common Signed-off-by, Tested-by,
# etc. (*-by) will be added to CC.
if [ $AUTO -eq 1 ]; then
- harvest_recipients TO "^[Tt][Oo]: *"
- harvest_recipients CC "^[Cc][Cc]: *"
- harvest_recipients CC "^.*-[Bb][Yy]: *"
+ harvest_recipients TO "^[Tt][Oo]: *"
+ harvest_recipients CC "^[Cc][Cc]: *"
+ harvest_recipients CC "^.*-[Bb][Yy]: *"
fi
case "$PULL_MTA" in
- git)
- FROM="$(git config sendemail.from)"
+git)
+ FROM="$(git config sendemail.from)"
AUTO_TO="$(git config sendemail.to)"
if [ -n "$AUTO_TO" ]; then
- if [ -n "$TO" ]; then
- TO="$TO,$AUTO_TO"
- else
- TO="$AUTO_TO"
- fi
+ if [ -n "$TO" ]; then
+ TO="$TO,$AUTO_TO"
+ else
+ TO="$AUTO_TO"
+ fi
+ fi
+ ;;
+sendmail)
+ if [ -z "$FROM" ]; then
+ FROM="$(git config user.name) <$(git config user.email)>"
+ if [ -z "$FROM" ]; then
+ echo "ERROR: unable to determine a FROM address"
+ usage
+ exit 1
+ fi
fi
- ;;
- sendmail)
- if [ -z "$FROM" ]; then
- FROM="$(git config user.name) <$(git config user.email)>"
- if [ -z "$FROM" ]; then
- echo "ERROR: unable to determine a FROM address"
- usage
- exit 1
- fi
- fi
- ;;
+ ;;
esac
if [ -z "$TO" ] && [ -z "$CC" ]; then
- echo "ERROR: you have not specified any recipients."
- usage
- exit 1
+ echo "ERROR: you have not specified any recipients."
+ usage
+ exit 1
fi
@@ -155,55 +155,55 @@ echo "Continue? [y/N] "
read cont
if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
- ERROR=0
- case "$PULL_MTA" in
- git)
- export IFS=$','
- GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
- GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
- unset IFS
- for PATCH in $PDIR/*patch; do
- # We harvest the emails manually, so force git not to.
- eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- sendmail)
- for PATCH in $PDIR/*patch; do
- # Insert To and CC headers via formail to keep them separate and
- # appending them to the sendmail command as -- $TO $CC has
- # proven to be an exercise in futility.
- #
- # Clear the From header, leaving it up to sendmail to insert an
- # appropriate one. Insert the original sender (per git) into the
- # body of the message.
- #
- # Use tail to remove the email envelope from git or formail as
- # msmtp (sendmail) would choke on them.
- #
- # Modify the patch date for sequential delivery, but retain the
- # original date as "Old-Date".
- DATE=$(date +"%a, %d %b %Y %k:%M:%S %z")
- GIT_FROM=$(cat $PATCH | formail -X "From:")
- cat $PATCH | formail -I "To: $TO" -I "CC: $CC" -I "From: $FROM" -i "Date: $DATE" | sed "0,/^$/s/^$/\n$GIT_FROM\n/" | tail -n +2 | sendmail -t
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- *)
- echo "ERROR: unknown MTA: $PULL_MTA"
- usage
- exit 1
- ;;
- esac
-
- if [ $ERROR -eq 1 ]; then
- echo "ERROR: Failed to send one or more messages. Check your MTA log for details."
- fi
+ ERROR=0
+ case "$PULL_MTA" in
+ git)
+ export IFS=$','
+ GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
+ GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
+ unset IFS
+ for PATCH in $PDIR/*patch; do
+ # We harvest the emails manually, so force git not to.
+ eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
+ if [ $? -eq 1 ]; then
+ ERROR=1
+ fi
+ done
+ ;;
+ sendmail)
+ for PATCH in $PDIR/*patch; do
+ # Insert To and CC headers via formail to keep them separate and
+ # appending them to the sendmail command as -- $TO $CC has
+ # proven to be an exercise in futility.
+ #
+ # Clear the From header, leaving it up to sendmail to insert an
+ # appropriate one. Insert the original sender (per git) into the
+ # body of the message.
+ #
+ # Use tail to remove the email envelope from git or formail as
+ # msmtp (sendmail) would choke on them.
+ #
+ # Modify the patch date for sequential delivery, but retain the
+ # original date as "Old-Date".
+ DATE=$(date +"%a, %d %b %Y %k:%M:%S %z")
+ GIT_FROM=$(cat $PATCH | formail -X "From:")
+ cat $PATCH | formail -I "To: $TO" -I "CC: $CC" -I "From: $FROM" -i "Date: $DATE" | sed "0,/^$/s/^$/\n$GIT_FROM\n/" | tail -n +2 | sendmail -t
+ if [ $? -eq 1 ]; then
+ ERROR=1
+ fi
+ done
+ ;;
+ *)
+ echo "ERROR: unknown MTA: $PULL_MTA"
+ usage
+ exit 1
+ ;;
+ esac
+
+ if [ $ERROR -eq 1 ]; then
+ echo "ERROR: Failed to send one or more messages. Check your MTA log for details."
+ fi
else
- echo "Send aborted."
+ echo "Send aborted."
fi
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 07/15] send-pull-request: remove local mta support
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (5 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 06/15] send-pull-request: whitespace cleanup Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 08/15] send-pull-request: fix greedy auto-cc regex Darren Hart
` (10 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
There is no real value in supporting sendmail directly when git
can be configured to use it. The script used to generate the
pull request mails relies heavily on git, so doing so here does
not impose any additional dependencies and it greatly reduces the
complexity of this script.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/send-pull-request | 108 +++++++++------------------------------------
1 files changed, 21 insertions(+), 87 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 76dd7a2..d265c47 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -1,15 +1,9 @@
#!/bin/bash
AUTO=0
-# Check env for any default settings, command line options will override these.
-if [ -z "$PULL_MTA" ]; then
- PULL_MTA="sendmail"
-fi
-
# Prevent environment leakage to these vars.
unset TO
unset CC
-# allow the user to set FROM in the environment
usage()
{
@@ -18,10 +12,6 @@ Usage: $(basename $0) [-h] [-a] [[-t email]...] -p pull-dir
-t email Explicitly add email to the recipients
-a Automatically harvest recipients from "*-by: email" lines
in the patches in the pull-dir
- -f Specify a FROM address, you can also use the FROM environment
- variable. If you do not specify one, it will try to use the one
- from your git config. This is ignored if -g is used.
- -g Use git-send-email to send mail instead of sendmail
-p pull-dir Directory containing summary and patch files
EOM
}
@@ -49,17 +39,11 @@ harvest_recipients()
# Parse and verify arguments
-while getopts "af:ghp:t:" OPT; do
+while getopts "ahp:t:" OPT; do
case $OPT in
a)
AUTO=1
;;
- f)
- FROM="$OPTARG"
- ;;
- g)
- PULL_MTA="git"
- ;;
h)
usage
exit 0
@@ -109,29 +93,14 @@ if [ $AUTO -eq 1 ]; then
harvest_recipients CC "^.*-[Bb][Yy]: *"
fi
-case "$PULL_MTA" in
-git)
- FROM="$(git config sendemail.from)"
- AUTO_TO="$(git config sendemail.to)"
- if [ -n "$AUTO_TO" ]; then
- if [ -n "$TO" ]; then
- TO="$TO,$AUTO_TO"
- else
- TO="$AUTO_TO"
- fi
+AUTO_TO="$(git config sendemail.to)"
+if [ -n "$AUTO_TO" ]; then
+ if [ -n "$TO" ]; then
+ TO="$TO,$AUTO_TO"
+ else
+ TO="$AUTO_TO"
fi
- ;;
-sendmail)
- if [ -z "$FROM" ]; then
- FROM="$(git config user.name) <$(git config user.email)>"
- if [ -z "$FROM" ]; then
- echo "ERROR: unable to determine a FROM address"
- usage
- exit 1
- fi
- fi
- ;;
-esac
+fi
if [ -z "$TO" ] && [ -z "$CC" ]; then
echo "ERROR: you have not specified any recipients."
@@ -145,10 +114,7 @@ cat <<EOM
The following patches:
$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
-will be sent with the following headers:
- From: $FROM
- To: $TO
- CC: $CC
+will now be sent via the git send-email command.
EOM
echo "Continue? [y/N] "
@@ -156,52 +122,20 @@ read cont
if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
ERROR=0
- case "$PULL_MTA" in
- git)
- export IFS=$','
- GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
- GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
- unset IFS
- for PATCH in $PDIR/*patch; do
- # We harvest the emails manually, so force git not to.
- eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- sendmail)
- for PATCH in $PDIR/*patch; do
- # Insert To and CC headers via formail to keep them separate and
- # appending them to the sendmail command as -- $TO $CC has
- # proven to be an exercise in futility.
- #
- # Clear the From header, leaving it up to sendmail to insert an
- # appropriate one. Insert the original sender (per git) into the
- # body of the message.
- #
- # Use tail to remove the email envelope from git or formail as
- # msmtp (sendmail) would choke on them.
- #
- # Modify the patch date for sequential delivery, but retain the
- # original date as "Old-Date".
- DATE=$(date +"%a, %d %b %Y %k:%M:%S %z")
- GIT_FROM=$(cat $PATCH | formail -X "From:")
- cat $PATCH | formail -I "To: $TO" -I "CC: $CC" -I "From: $FROM" -i "Date: $DATE" | sed "0,/^$/s/^$/\n$GIT_FROM\n/" | tail -n +2 | sendmail -t
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- *)
- echo "ERROR: unknown MTA: $PULL_MTA"
- usage
- exit 1
- ;;
- esac
+ export IFS=$','
+ GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
+ GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
+ unset IFS
+ for PATCH in $PDIR/*patch; do
+ # We harvest the emails manually, so force git not to.
+ eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
+ if [ $? -eq 1 ]; then
+ ERROR=1
+ fi
+ done
if [ $ERROR -eq 1 ]; then
- echo "ERROR: Failed to send one or more messages. Check your MTA log for details."
+ echo "ERROR: Failed to send one or more messages."
fi
else
echo "Send aborted."
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 08/15] send-pull-request: fix greedy auto-cc regex
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (6 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 07/15] send-pull-request: remove local mta support Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 09/15] send-pull-request: don't send all patches to everyone even with -a Darren Hart
` (9 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
A greedy regular expression caused emails to be harvested from patches
that were quoted in the commit message. Ensure only tags that start at the
beginning of the line are considered for harvesting.
NOTE: users are still responsible for verifying the recipients list and to
ensure they do not spam people!
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Saul Wold <sgw@linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
---
scripts/send-pull-request | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index d265c47..b294d35 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -90,7 +90,7 @@ done
if [ $AUTO -eq 1 ]; then
harvest_recipients TO "^[Tt][Oo]: *"
harvest_recipients CC "^[Cc][Cc]: *"
- harvest_recipients CC "^.*-[Bb][Yy]: *"
+ harvest_recipients CC "^[A-Z][A-Za-z-]*-[Bb][Yy]: *"
fi
AUTO_TO="$(git config sendemail.to)"
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 09/15] send-pull-request: don't send all patches to everyone even with -a
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (7 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 08/15] send-pull-request: fix greedy auto-cc regex Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 10/15] send-pull-request: verify git sendemail config Darren Hart
` (8 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Rather than sending every patch to every recipient of the entire series when
-a is used, only send the cover letter to everyone and use git's
--signed-off-by-cc feature to generate an auto cc list for the individual
patches.
Add a -c option to use --signed-off-by-cc to auto cc recipeients at the
individual patch level. This is implied by -a.
Using git to harvest the Cc list means only collecting Signed-off-by and Cc
lines, rather than the more generic *-by lines previously. This is a fair
trade-off for significantly reduced complexity. If users want to add Acked-by
and Tested-by lines and want to use the -a feature, they should include those
recipients as Cc lines as well.
Now that we rely on git for auto-cc for the individual patches,
make sure the user is prompted before sending each patch by forcing
--confirm=always.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Khem Raj <raj.khem@gmail.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
---
scripts/send-pull-request | 75 ++++++++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index b294d35..5a11d1f 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -1,36 +1,40 @@
#!/bin/bash
AUTO=0
+AUTO_CL=0
# Prevent environment leakage to these vars.
unset TO
unset CC
+unset AUTO_CC
usage()
{
cat <<EOM
-Usage: $(basename $0) [-h] [-a] [[-t email]...] -p pull-dir
- -t email Explicitly add email to the recipients
- -a Automatically harvest recipients from "*-by: email" lines
- in the patches in the pull-dir
+Usage: $(basename $0) [-h] [-a] [-c] [[-t email]...] -p pull-dir
+ -a Send the cover letter to every recipient listed in Cc and
+ Signed-off-by lines found in the cover letter and the patches.
+ This option implies -c.
+ -c Expand the Cc list for the individual patches using the Cc and
+ Signed-off-by lines from the same patch.
-p pull-dir Directory containing summary and patch files
+ -t email Explicitly add email to the recipients
EOM
}
-# Collect To and CC addresses from the patch files if they exist
-# $1: Which header to add the recipients to, "TO" or "CC"
-# $2: The regex to match and strip from the line with email addresses
+# Collect addresses from a patch into AUTO_CC
+# $1: a patch file
harvest_recipients()
{
- TO_CC=$1
- REGX=$2
+ PATCH=$1
export IFS=$',\n'
- for PATCH in $PDIR/*.patch; do
- # Grab To addresses
+ for REGX in "^[Cc][Cc]: *" "^[Ss]igned-[Oo]ff-[Bb]y: *"; do
for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed "s/$REGX//"); do
- if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ -n "$EMAIL" ]; then
- if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi
- elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && [ -n "$EMAIL" ]; then
- if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi
+ if [ "${AUTO_CC/$EMAIL/}" == "$AUTO_CC" ] && [ -n "$EMAIL" ]; then
+ if [ -z "$AUTO_CC" ]; then
+ AUTO_CC=$EMAIL;
+ else
+ AUTO_CC="$AUTO_CC,$EMAIL";
+ fi
fi
done
done
@@ -39,9 +43,13 @@ harvest_recipients()
# Parse and verify arguments
-while getopts "ahp:t:" OPT; do
+while getopts "achp:t:" OPT; do
case $OPT in
a)
+ AUTO_CL=1
+ AUTO=1
+ ;;
+ c)
AUTO=1
;;
h)
@@ -84,13 +92,11 @@ for TOKEN in SUBJECT BLURB; do
done
-# Harvest emails from the generated patches and populate the TO and CC variables
-# In addition to To and CC headers/lines, the common Signed-off-by, Tested-by,
-# etc. (*-by) will be added to CC.
-if [ $AUTO -eq 1 ]; then
- harvest_recipients TO "^[Tt][Oo]: *"
- harvest_recipients CC "^[Cc][Cc]: *"
- harvest_recipients CC "^[A-Z][A-Za-z-]*-[Bb][Yy]: *"
+# Harvest emails from the generated patches and populate AUTO_CC.
+if [ $AUTO_CL -eq 1 ]; then
+ for PATCH in $PDIR/*.patch; do
+ harvest_recipients $PATCH
+ done
fi
AUTO_TO="$(git config sendemail.to)"
@@ -102,7 +108,7 @@ if [ -n "$AUTO_TO" ]; then
fi
fi
-if [ -z "$TO" ] && [ -z "$CC" ]; then
+if [ -z "$TO" ] && [ -z "$AUTO_CC" ]; then
echo "ERROR: you have not specified any recipients."
usage
exit 1
@@ -114,7 +120,8 @@ cat <<EOM
The following patches:
$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
-will now be sent via the git send-email command.
+will now be sent via the git send-email command. Git will prompt you before
+sending any email.
EOM
echo "Continue? [y/N] "
@@ -124,11 +131,23 @@ if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
ERROR=0
export IFS=$','
GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
- GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
+ GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
unset IFS
for PATCH in $PDIR/*patch; do
- # We harvest the emails manually, so force git not to.
- eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
+ if [ $AUTO -eq 1 ]; then
+ if [ $PATCH == "$CL" ] && [ $AUTO_CL -eq 1 ]; then
+ # Send the cover letter to every recipient, both
+ # specified as well as harvested.
+ eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
+ else
+ # Send the patch to the specified recipients and
+ # those git finds in this specific patch.
+ eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH"
+ fi
+ else
+ # Only send to the explicitly specified recipients
+ eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
+ fi
if [ $? -eq 1 ]; then
ERROR=1
fi
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 10/15] send-pull-request: verify git sendemail config
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (8 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 09/15] send-pull-request: don't send all patches to everyone even with -a Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 11/15] create-pull-request: do not check certificate Darren Hart
` (7 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Perform a quick sanity check to be able to direct users to configure
git.sendemail if they haven't yet.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/send-pull-request | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 5a11d1f..21eb302 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -41,6 +41,18 @@ harvest_recipients()
unset IFS
}
+check_git_sendemail_config()
+{
+ GIT_SMTP=$(git config sendemail.smtpserver)
+ GIT_FROM=$(git config sendemail.from)
+ if [ -z "$GIT_SMTP" ] || [ -z "$GIT_FROM" ]; then
+ echo "ERROR: git sendemail is not configured."
+ echo "Please read GIT-SEND-EMAIL(1) and configure:"
+ echo " sendemail.smtpserver"
+ echo " sendemail.from"
+ exit 1
+ fi
+}
# Parse and verify arguments
while getopts "achp:t:" OPT; do
@@ -74,6 +86,9 @@ while getopts "achp:t:" OPT; do
esac
done
+# Abort early if git-send-email is not properly configured
+check_git_sendemail_config
+
if [ -z "$PDIR" ]; then
echo "ERROR: you must specify a pull-dir."
usage
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 11/15] create-pull-request: do not check certificate
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (9 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 10/15] send-pull-request: verify git sendemail config Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 12/15] create-pull-request: add GitHub remote support Darren Hart
` (6 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Some remotes can use HTTPS and we don't need to check the certificate
of the host so wget call is changed to avoid it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 202d99d..9dbd55a 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -112,7 +112,7 @@ esac
# Perform a sanity test on the web URL. Issue a warning if it is not
# accessible, but do not abort as users may want to run offline.
if [ -n "$WEB_URL" ]; then
- wget -q $WEB_URL -O /dev/null
+ wget --no-check-certificate -q $WEB_URL -O /dev/null
if [ $? -ne 0 ]; then
echo "WARNING: Branch '$BRANCH' was not found on the contrib git tree."
echo " Please check your remote and branch parameter before sending."
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 12/15] create-pull-request: add GitHub remote support
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (10 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 11/15] create-pull-request: do not check certificate Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 13/15] create-pull-request: add untested oe repository support Darren Hart
` (5 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 9dbd55a..a9cf6f9 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -82,6 +82,10 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
;;
+ git@github.com:*)
+ REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#')
+ REMOTE_URL=${REMOTE_URL/"git@github.com:"/"git://github.com/"}
+ ;;
esac
# The .git suffix is optional in the URL, drop in for the REPO
REMOTE_REPO=${REMOTE_REPO%.git}
@@ -107,6 +111,9 @@ case "$REMOTE_URL" in
*git.pokylinux.org*)
WEB_URL="http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
;;
+ *github.com*)
+ WEB_URL="https://github.com/$REMOTE_REPO/tree/$BRANCH"
+ ;;
esac
# Perform a sanity test on the web URL. Issue a warning if it is not
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 13/15] create-pull-request: add untested oe repository support
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (11 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 12/15] create-pull-request: add GitHub remote support Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 22:26 ` [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage Darren Hart
` (4 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index a9cf6f9..634a289 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -82,6 +82,10 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
;;
+ *ssh://git@git.openembedded.org*)
+ REMOTE_REPO=$(echo $REMOTE_URL | sed "s#.*/\(.*\)#\1#")
+ REMOTE_URL=${REMOTE_URL/"ssh://git@"/"git://"}
+ ;;
git@github.com:*)
REMOTE_REPO=$(echo $REMOTE_URL | sed 's#.*:\(.*\)\(\.git\)$#\1#')
REMOTE_URL=${REMOTE_URL/"git@github.com:"/"git://github.com/"}
@@ -111,6 +115,9 @@ case "$REMOTE_URL" in
*git.pokylinux.org*)
WEB_URL="http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
;;
+ *git.openembedded.org*)
+ WEB_URL="http://cgit.openembedded.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH"
+ ;;
*github.com*)
WEB_URL="https://github.com/$REMOTE_REPO/tree/$BRANCH"
;;
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (12 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 13/15] create-pull-request: add untested oe repository support Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-16 23:40 ` Joshua Lock
2011-05-17 17:05 ` Khem Raj
2011-05-16 22:26 ` [RFC PATCH v2 15/15] *pull-request: add copyright, license, and descriptions Darren Hart
` (3 subsequent siblings)
17 siblings, 2 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
The script was sending one patch at a time, which defeats the internal
confirmation mechanism of git-send-email (which would otherwise allow
the user to send all patches or abort immediately).
Rework the sending logic to use no more than two commands. Use two
commands when the cover letter is to be sent to all recipients with
the -a argument. Otherwise, send all patches via the same command.
The script duplicates git's send confirmation, eliminate that.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Reported-by: Khem Raj <raj.khem@gmail.com>
Cc: Khem Raj <raj.khem@gmail.com>
Cc: Joshua Lock <josh@linux.intel.com>
---
scripts/send-pull-request | 68 +++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 21eb302..8d0bd34 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -1,6 +1,7 @@
#!/bin/bash
AUTO=0
AUTO_CL=0
+GITSOBCC=""
# Prevent environment leakage to these vars.
unset TO
@@ -59,10 +60,11 @@ while getopts "achp:t:" OPT; do
case $OPT in
a)
AUTO_CL=1
- AUTO=1
- ;;
+ # Fall through to include -c
+ ;&
c)
AUTO=1
+ GITSOBCC="--signed-off-by-cc"
;;
h)
usage
@@ -130,48 +132,30 @@ if [ -z "$TO" ] && [ -z "$AUTO_CC" ]; then
fi
-# Generate report for the user and require confirmation before sending
-cat <<EOM
-The following patches:
-$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
+# Convert the collected addresses into git-send-email argument strings
+export IFS=$','
+GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
+GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
+unset IFS
-will now be sent via the git send-email command. Git will prompt you before
-sending any email.
-EOM
-echo "Continue? [y/N] "
-read cont
-
-if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
- ERROR=0
- export IFS=$','
- GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
- GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
- unset IFS
- for PATCH in $PDIR/*patch; do
- if [ $AUTO -eq 1 ]; then
- if [ $PATCH == "$CL" ] && [ $AUTO_CL -eq 1 ]; then
- # Send the cover letter to every recipient, both
- # specified as well as harvested.
- eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
- else
- # Send the patch to the specified recipients and
- # those git finds in this specific patch.
- eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH"
- fi
- else
- # Only send to the explicitly specified recipients
- eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
- fi
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
-
- if [ $ERROR -eq 1 ]; then
- echo "ERROR: Failed to send one or more messages."
+# Handoff to git-send-email. It will perform the send confirmation.
+PATCHES=$(echo $PDIR/*.patch)
+if [ $AUTO_CL -eq 1 ]; then
+ # Send the cover letter to every recipient, both specified as well as
+ # harvested. Then remove it from the patches list.
+ eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL"
+ if [ $? -eq 1 ]; then
+ echo "ERROR: failed to send cover-letter with automatic recipients."
+ exit 1
fi
-else
- echo "Send aborted."
+ PATCHES=${PATCHES/"$CL"/}
fi
+# Send the patch to the specified recipients and, if -c was specified, those git
+# finds in this specific patch.
+eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES"
+if [ $? -eq 1 ]; then
+ echo "ERROR: failed to send patches."
+ exit 1
+fi
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
2011-05-16 22:26 ` [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage Darren Hart
@ 2011-05-16 23:40 ` Joshua Lock
2011-05-17 17:05 ` Khem Raj
1 sibling, 0 replies; 24+ messages in thread
From: Joshua Lock @ 2011-05-16 23:40 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On Mon, 2011-05-16 at 15:26 -0700, Darren Hart wrote:
> The script was sending one patch at a time, which defeats the internal
> confirmation mechanism of git-send-email (which would otherwise allow
> the user to send all patches or abort immediately).
>
> Rework the sending logic to use no more than two commands. Use two
> commands when the cover letter is to be sent to all recipients with
> the -a argument. Otherwise, send all patches via the same command.
>
> The script duplicates git's send confirmation, eliminate that.
>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> Reported-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Joshua Lock <josh@linux.intel.com>
> Cc: Khem Raj <raj.khem@gmail.com>
> Cc: Joshua Lock <josh@linux.intel.com>
> ---
> scripts/send-pull-request | 68 +++++++++++++++++---------------------------
> 1 files changed, 26 insertions(+), 42 deletions(-)
>
> diff --git a/scripts/send-pull-request b/scripts/send-pull-request
> index 21eb302..8d0bd34 100755
> --- a/scripts/send-pull-request
> +++ b/scripts/send-pull-request
> @@ -1,6 +1,7 @@
> #!/bin/bash
> AUTO=0
> AUTO_CL=0
> +GITSOBCC=""
>
> # Prevent environment leakage to these vars.
> unset TO
> @@ -59,10 +60,11 @@ while getopts "achp:t:" OPT; do
> case $OPT in
> a)
> AUTO_CL=1
> - AUTO=1
> - ;;
> + # Fall through to include -c
> + ;&
> c)
> AUTO=1
> + GITSOBCC="--signed-off-by-cc"
> ;;
> h)
> usage
> @@ -130,48 +132,30 @@ if [ -z "$TO" ] && [ -z "$AUTO_CC" ]; then
> fi
>
>
> -# Generate report for the user and require confirmation before sending
> -cat <<EOM
> -The following patches:
> -$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
> +# Convert the collected addresses into git-send-email argument strings
> +export IFS=$','
> +GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
> +GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
> +unset IFS
>
> -will now be sent via the git send-email command. Git will prompt you before
> -sending any email.
>
> -EOM
> -echo "Continue? [y/N] "
> -read cont
> -
> -if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
> - ERROR=0
> - export IFS=$','
> - GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
> - GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
> - unset IFS
> - for PATCH in $PDIR/*patch; do
> - if [ $AUTO -eq 1 ]; then
> - if [ $PATCH == "$CL" ] && [ $AUTO_CL -eq 1 ]; then
> - # Send the cover letter to every recipient, both
> - # specified as well as harvested.
> - eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
> - else
> - # Send the patch to the specified recipients and
> - # those git finds in this specific patch.
> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH"
> - fi
> - else
> - # Only send to the explicitly specified recipients
> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
> - fi
> - if [ $? -eq 1 ]; then
> - ERROR=1
> - fi
> - done
> -
> - if [ $ERROR -eq 1 ]; then
> - echo "ERROR: Failed to send one or more messages."
> +# Handoff to git-send-email. It will perform the send confirmation.
> +PATCHES=$(echo $PDIR/*.patch)
> +if [ $AUTO_CL -eq 1 ]; then
> + # Send the cover letter to every recipient, both specified as well as
> + # harvested. Then remove it from the patches list.
> + eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL"
> + if [ $? -eq 1 ]; then
> + echo "ERROR: failed to send cover-letter with automatic recipients."
> + exit 1
> fi
> -else
> - echo "Send aborted."
> + PATCHES=${PATCHES/"$CL"/}
> fi
>
> +# Send the patch to the specified recipients and, if -c was specified, those git
> +# finds in this specific patch.
> +eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES"
> +if [ $? -eq 1 ]; then
> + echo "ERROR: failed to send patches."
> + exit 1
> +fi
--
Joshua Lock
Yocto Project Build Monkey
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
2011-05-16 22:26 ` [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage Darren Hart
2011-05-16 23:40 ` Joshua Lock
@ 2011-05-17 17:05 ` Khem Raj
2011-05-17 17:38 ` Darren Hart
1 sibling, 1 reply; 24+ messages in thread
From: Khem Raj @ 2011-05-17 17:05 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On Mon, May 16, 2011 at 3:26 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> The script was sending one patch at a time, which defeats the internal
> confirmation mechanism of git-send-email (which would otherwise allow
> the user to send all patches or abort immediately).
>
> Rework the sending logic to use no more than two commands. Use two
> commands when the cover letter is to be sent to all recipients with
> the -a argument. Otherwise, send all patches via the same command.
>
> The script duplicates git's send confirmation, eliminate that.
>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> Reported-by: Khem Raj <raj.khem@gmail.com>
> Cc: Khem Raj <raj.khem@gmail.com>
> Cc: Joshua Lock <josh@linux.intel.com>
> ---
> scripts/send-pull-request | 68 +++++++++++++++++---------------------------
> 1 files changed, 26 insertions(+), 42 deletions(-)
>
> diff --git a/scripts/send-pull-request b/scripts/send-pull-request
> index 21eb302..8d0bd34 100755
> --- a/scripts/send-pull-request
> +++ b/scripts/send-pull-request
> @@ -1,6 +1,7 @@
> #!/bin/bash
> AUTO=0
> AUTO_CL=0
> +GITSOBCC=""
>
> # Prevent environment leakage to these vars.
> unset TO
> @@ -59,10 +60,11 @@ while getopts "achp:t:" OPT; do
> case $OPT in
> a)
> AUTO_CL=1
> - AUTO=1
> - ;;
> + # Fall through to include -c
> + ;&
> c)
> AUTO=1
> + GITSOBCC="--signed-off-by-cc"
> ;;
> h)
> usage
> @@ -130,48 +132,30 @@ if [ -z "$TO" ] && [ -z "$AUTO_CC" ]; then
> fi
>
>
> -# Generate report for the user and require confirmation before sending
> -cat <<EOM
> -The following patches:
> -$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
> +# Convert the collected addresses into git-send-email argument strings
> +export IFS=$','
> +GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
> +GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
> +unset IFS
>
> -will now be sent via the git send-email command. Git will prompt you before
> -sending any email.
>
> -EOM
> -echo "Continue? [y/N] "
> -read cont
> -
> -if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
> - ERROR=0
> - export IFS=$','
> - GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
> - GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
> - unset IFS
> - for PATCH in $PDIR/*patch; do
> - if [ $AUTO -eq 1 ]; then
> - if [ $PATCH == "$CL" ] && [ $AUTO_CL -eq 1 ]; then
> - # Send the cover letter to every recipient, both
> - # specified as well as harvested.
> - eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
> - else
> - # Send the patch to the specified recipients and
> - # those git finds in this specific patch.
> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH"
> - fi
> - else
> - # Only send to the explicitly specified recipients
> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
> - fi
> - if [ $? -eq 1 ]; then
> - ERROR=1
> - fi
> - done
> -
> - if [ $ERROR -eq 1 ]; then
> - echo "ERROR: Failed to send one or more messages."
> +# Handoff to git-send-email. It will perform the send confirmation.
> +PATCHES=$(echo $PDIR/*.patch)
> +if [ $AUTO_CL -eq 1 ]; then
> + # Send the cover letter to every recipient, both specified as well as
> + # harvested. Then remove it from the patches list.
> + eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL"
> + if [ $? -eq 1 ]; then
> + echo "ERROR: failed to send cover-letter with automatic recipients."
> + exit 1
> fi
> -else
> - echo "Send aborted."
> + PATCHES=${PATCHES/"$CL"/}
> fi
>
> +# Send the patch to the specified recipients and, if -c was specified, those git
> +# finds in this specific patch.
> +eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES"
> +if [ $? -eq 1 ]; then
> + echo "ERROR: failed to send patches."
> + exit 1
> +fi
now it will ask the usual git confirmation once for all the patches
are now mentioned on the commandline instead of a loop.
So I can say 'a' all in the confirmation and then it will take that
to send all patches. Is my understanding right ?
If so then it seems ok to me
> --
> 1.7.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage
2011-05-17 17:05 ` Khem Raj
@ 2011-05-17 17:38 ` Darren Hart
0 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-17 17:38 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On 05/17/2011 10:05 AM, Khem Raj wrote:
> On Mon, May 16, 2011 at 3:26 PM, Darren Hart <dvhart@linux.intel.com> wrote:
>> The script was sending one patch at a time, which defeats the internal
>> confirmation mechanism of git-send-email (which would otherwise allow
>> the user to send all patches or abort immediately).
>>
>> Rework the sending logic to use no more than two commands. Use two
>> commands when the cover letter is to be sent to all recipients with
>> the -a argument. Otherwise, send all patches via the same command.
>>
>> The script duplicates git's send confirmation, eliminate that.
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> Reported-by: Khem Raj <raj.khem@gmail.com>
>> Cc: Khem Raj <raj.khem@gmail.com>
>> Cc: Joshua Lock <josh@linux.intel.com>
>> ---
>> scripts/send-pull-request | 68 +++++++++++++++++---------------------------
>> 1 files changed, 26 insertions(+), 42 deletions(-)
>>
>> diff --git a/scripts/send-pull-request b/scripts/send-pull-request
>> index 21eb302..8d0bd34 100755
>> --- a/scripts/send-pull-request
>> +++ b/scripts/send-pull-request
>> @@ -1,6 +1,7 @@
>> #!/bin/bash
>> AUTO=0
>> AUTO_CL=0
>> +GITSOBCC=""
>>
>> # Prevent environment leakage to these vars.
>> unset TO
>> @@ -59,10 +60,11 @@ while getopts "achp:t:" OPT; do
>> case $OPT in
>> a)
>> AUTO_CL=1
>> - AUTO=1
>> - ;;
>> + # Fall through to include -c
>> + ;&
>> c)
>> AUTO=1
>> + GITSOBCC="--signed-off-by-cc"
>> ;;
>> h)
>> usage
>> @@ -130,48 +132,30 @@ if [ -z "$TO" ] && [ -z "$AUTO_CC" ]; then
>> fi
>>
>>
>> -# Generate report for the user and require confirmation before sending
>> -cat <<EOM
>> -The following patches:
>> -$(for PATCH in $PDIR/*.patch; do echo " $PATCH"; done)
>> +# Convert the collected addresses into git-send-email argument strings
>> +export IFS=$','
>> +GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
>> +GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
>> +unset IFS
>>
>> -will now be sent via the git send-email command. Git will prompt you before
>> -sending any email.
>>
>> -EOM
>> -echo "Continue? [y/N] "
>> -read cont
>> -
>> -if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
>> - ERROR=0
>> - export IFS=$','
>> - GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
>> - GIT_CC=$(for R in $AUTO_CC; do echo -n "--cc='$R' "; done)
>> - unset IFS
>> - for PATCH in $PDIR/*patch; do
>> - if [ $AUTO -eq 1 ]; then
>> - if [ $PATCH == "$CL" ] && [ $AUTO_CL -eq 1 ]; then
>> - # Send the cover letter to every recipient, both
>> - # specified as well as harvested.
>> - eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
>> - else
>> - # Send the patch to the specified recipients and
>> - # those git finds in this specific patch.
>> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --signed-off-by-cc $PATCH"
>> - fi
>> - else
>> - # Only send to the explicitly specified recipients
>> - eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to --suppress-cc=all $PATCH"
>> - fi
>> - if [ $? -eq 1 ]; then
>> - ERROR=1
>> - fi
>> - done
>> -
>> - if [ $ERROR -eq 1 ]; then
>> - echo "ERROR: Failed to send one or more messages."
>> +# Handoff to git-send-email. It will perform the send confirmation.
>> +PATCHES=$(echo $PDIR/*.patch)
>> +if [ $AUTO_CL -eq 1 ]; then
>> + # Send the cover letter to every recipient, both specified as well as
>> + # harvested. Then remove it from the patches list.
>> + eval "git send-email $GIT_TO $GIT_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL"
>> + if [ $? -eq 1 ]; then
>> + echo "ERROR: failed to send cover-letter with automatic recipients."
>> + exit 1
>> fi
>> -else
>> - echo "Send aborted."
>> + PATCHES=${PATCHES/"$CL"/}
>> fi
>>
>> +# Send the patch to the specified recipients and, if -c was specified, those git
>> +# finds in this specific patch.
>> +eval "git send-email $GIT_TO --confirm=always --no-chain-reply-to $GITSOBCC $PATCHES"
>> +if [ $? -eq 1 ]; then
>> + echo "ERROR: failed to send patches."
>> + exit 1
>> +fi
>
>
> now it will ask the usual git confirmation once for all the patches
> are now mentioned on the commandline instead of a loop.
> So I can say 'a' all in the confirmation and then it will take that
> to send all patches. Is my understanding right ?
>
> If so then it seems ok to me
That is the case if -a is not used. If -a is used, then you will get a
git confirmation for the cover letter and another for the rest of the
series, which you can say 'a' to and send all of them. This is because
-a uses a different recipients list for the cover-letter than the rest
of the patches.
This also allows for a dry-run by:
yes "n" | send-pull-request ...
>
>> --
>> 1.7.1
>>
>>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 24+ messages in thread
* [RFC PATCH v2 15/15] *pull-request: add copyright, license, and descriptions
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (13 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 14/15] send-pull-request: streamline git-send-email usage Darren Hart
@ 2011-05-16 22:26 ` Darren Hart
2011-05-17 14:02 ` [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Otavio Salvador
` (2 subsequent siblings)
17 siblings, 0 replies; 24+ messages in thread
From: Darren Hart @ 2011-05-16 22:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
scripts/create-pull-request | 26 ++++++++++++++++++++++++++
scripts/send-pull-request | 25 +++++++++++++++++++++++++
2 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 634a289..b808146 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -1,4 +1,30 @@
#!/bin/bash
+#
+# Copyright (c) 2010-2011, Intel Corporation.
+# All Rights Reserved
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+#
+# This script is intended to be used to prepare a series of patches
+# and a cover letter in an appropriate and consistent format for
+# submission to Open Embedded and The Yocto Project, as well as to
+# related projects and layers.
+#
+
ODIR=pull-$$
RELATIVE_TO="master"
COMMIT_ID="HEAD"
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 8d0bd34..cee9253 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -1,4 +1,29 @@
#!/bin/bash
+#
+# Copyright (c) 2010-2011, Intel Corporation.
+# All Rights Reserved
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+#
+# This script is intended to be used to send a patch series prepared by the
+# create-pull-request script to Open Embedded and The Yocto Project, as well
+# as to related projects and layers.
+#
+
AUTO=0
AUTO_CL=0
GITSOBCC=""
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (14 preceding siblings ...)
2011-05-16 22:26 ` [RFC PATCH v2 15/15] *pull-request: add copyright, license, and descriptions Darren Hart
@ 2011-05-17 14:02 ` Otavio Salvador
2011-05-17 19:02 ` Tom Rini
2011-05-20 0:46 ` Saul Wold
17 siblings, 0 replies; 24+ messages in thread
From: Otavio Salvador @ 2011-05-17 14:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, May 16, 2011 at 19:25, Darren Hart <dvhart@linux.intel.com> wrote:
...
> Darren Hart (13):
> create-pull-request: alphabetize arguments
> create-pull-request: whitespace cleanup
> create-pull-request: use git request-pull and arbitrary remotes
> create-pull-request: rewrite known private URLs to public URLs
> create-pull-request: provide an RFC mode via -c argument
> send-pull-request: whitespace cleanup
> send-pull-request: remove local mta support
> send-pull-request: fix greedy auto-cc regex
> send-pull-request: don't send all patches to everyone even with -a
> send-pull-request: verify git sendemail config
> create-pull-request: add untested oe repository support
> send-pull-request: streamline git-send-email usage
> *pull-request: add copyright, license, and descriptions
>
> Otavio Salvador (2):
> create-pull-request: do not check certificate
> create-pull-request: add GitHub remote support
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (15 preceding siblings ...)
2011-05-17 14:02 ` [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Otavio Salvador
@ 2011-05-17 19:02 ` Tom Rini
2011-05-20 0:46 ` Saul Wold
17 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2011-05-17 19:02 UTC (permalink / raw)
To: Darren Hart; +Cc: openembedded-core
On 05/16/2011 03:25 PM, Darren Hart wrote:
...
> Darren Hart (13):
> create-pull-request: alphabetize arguments
> create-pull-request: whitespace cleanup
> create-pull-request: use git request-pull and arbitrary remotes
> create-pull-request: rewrite known private URLs to public URLs
> create-pull-request: provide an RFC mode via -c argument
> send-pull-request: whitespace cleanup
> send-pull-request: remove local mta support
> send-pull-request: fix greedy auto-cc regex
> send-pull-request: don't send all patches to everyone even with -a
> send-pull-request: verify git sendemail config
> create-pull-request: add untested oe repository support
> send-pull-request: streamline git-send-email usage
> *pull-request: add copyright, license, and descriptions
>
> Otavio Salvador (2):
> create-pull-request: do not check certificate
> create-pull-request: add GitHub remote support
For the bits I'm cc'd on:
Acked-by: Tom Rini <tom_rini@mentor.com>
and thanks again for picking this up and running with it!
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul
2011-05-16 22:25 [RFC PATCH v2 00/15] *-pull-request: cleanup and overhaul Darren Hart
` (16 preceding siblings ...)
2011-05-17 19:02 ` Tom Rini
@ 2011-05-20 0:46 ` Saul Wold
17 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-20 0:46 UTC (permalink / raw)
To: Darren Hart; +Cc: Koen Kooi, openembedded-core, Paul Eggleton, Martin Jansa
On 05/16/2011 03:25 PM, Darren Hart wrote:
> After some discussion on the oe-core list regarding the *-pull-request scripts
> I provided a proposal, received some feedback, and these patches are the result
> of that discussion. The Cc list varies from patch to patch a bit more wildly
> than is typical as a final sanity test, although it does reflect who commented
> and expressed interest in which parts of the overhaul.
>
> V2: do REMOTE_REPO regex per remote
> fix various regex issues
> fix wget ssl issues
> add github and oe (untested) REMOTE support
> simplify git-send-email usage logic, avoid duplicating git confirmation
> add -c, auto-cc per patch option
>
> 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.
>
> The following changes since commit c12126ebf07604f998cb35546aa51d806d97af22:
>
> create-pull-request: switch URL from git.pokylinux.org/poky-contrib to git.openembedded.org/openembedded-core-contrib (2011-05-13 20:38:20 -0700)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dvhart/git-pull-v2-oe
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/git-pull-v2-oe
>
> Darren Hart (13):
> create-pull-request: alphabetize arguments
> create-pull-request: whitespace cleanup
> create-pull-request: use git request-pull and arbitrary remotes
> create-pull-request: rewrite known private URLs to public URLs
> create-pull-request: provide an RFC mode via -c argument
> send-pull-request: whitespace cleanup
> send-pull-request: remove local mta support
> send-pull-request: fix greedy auto-cc regex
> send-pull-request: don't send all patches to everyone even with -a
> send-pull-request: verify git sendemail config
> create-pull-request: add untested oe repository support
> send-pull-request: streamline git-send-email usage
> *pull-request: add copyright, license, and descriptions
>
> Otavio Salvador (2):
> create-pull-request: do not check certificate
> create-pull-request: add GitHub remote support
>
> scripts/create-pull-request | 222 ++++++++++++++++++++++---------
> scripts/send-pull-request | 307 ++++++++++++++++++++-----------------------
> 2 files changed, 302 insertions(+), 227 deletions(-)
>
Pulled into oe-core
Thanks
Sau!
^ permalink raw reply [flat|nested] 24+ messages in thread