[OE-core] [PATCH 1/3] create-pull-request: create branch on remote if not found
Robert Yang
liezhi.yang at windriver.com
Wed Apr 20 00:48:22 UTC 2016
Updated in the repo: (add option -a to auto push or set CONTRIB_AUTO_PUSH in env).
git://git.openembedded.org/openembedded-core-contrib rbt/cpr
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/cpr
Robert Yang (3):
create-pull-request: create branch on remote if not found
create-pull-request: read remote from env var CONTRIB_REMOTE
create-pull-request: set subject automatically for cover latter
commit 973264bfbe57f0d56ba58caf7924710f76bafca8
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Tue Apr 19 17:30:03 2016 -0700
create-pull-request: add option -a to auto push
Before this patch, we need two steps to create PULL:
* Step 1, create branch:
$ git push <contrib> <local_branch>:<remote_branch>
* Step 2, create PULL:
$ create-pull-request -u <contrib> -l <local_branch> -b <remote_branch>
-r <local_branch>~<n>
We can see that the args used in step 1 are in step 2, so we can use
"create-pull-request -a" or set CONTRIB_AUTO_PUSH in to create the
branch to simplify the steps.
[YOCTO #9408]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 479ad6e..595fda0 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -39,6 +39,8 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s
subject] [-r relative_to
-l local branch Local branch name (default: HEAD)
-c Create an RFC (Request for Comment) patch series
-h Display this help message
+ -a Automatically push local branch (-l) to remote branch (-b),
+ or set CONTRIB_AUTO_PUSH in env
-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)
@@ -59,7 +61,7 @@ EOM
}
# Parse and validate arguments
-while getopts "b:cd:hi:m:o:p:r:s:u:l:" OPT; do
+while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
case $OPT in
b)
BRANCH="$OPTARG"
@@ -127,6 +129,9 @@ while getopts "b:cd:hi:m:o:p:r:s:u:l:" OPT; do
;;
esac
;;
+ a)
+ CONTRIB_AUTO_PUSH="1"
+ ;;
esac
done
@@ -171,6 +176,11 @@ 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
+ if [ "$CONTRIB_AUTO_PUSH" = "1" ]; then
+ echo "Pushing '$BRANCH' on '$REMOTE' as requested..."
+ git push $REMOTE $L_BRANCH:$BRANCH
+ echo ""
+ fi
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."
// Robert
On 04/19/2016 08:18 PM, Bruce Ashfield wrote:
>
>
> On Mon, Apr 18, 2016 at 11:13 PM, Robert Yang <liezhi.yang at windriver.com
> <mailto:liezhi.yang at windriver.com>> wrote:
>
>
>
> On 04/19/2016 11:00 AM, Bruce Ashfield wrote:
>
>
>
> On Mon, Apr 18, 2016 at 10:45 PM, Robert Yang <liezhi.yang at windriver.com
> <mailto:liezhi.yang at windriver.com>
> <mailto:liezhi.yang at windriver.com <mailto:liezhi.yang at windriver.com>>>
> wrote:
>
> Before this patch, we need two steps to create PULL:
> * Step 1, create branch:
> $ git push <contrib> <local_branch>:<remote_branch>
> * Step 2, create PULL:
> $ create-pull-request -u <contrib> -l <local_branch> -b
> <remote_branch>
> -r <local_branch>~<n>
>
> We can see that the args used in step 1 are in step 2, so we can use
> create-pull-request to create the branch if not found to simplify the
> steps.
>
>
> I think this needs to be optional. When I'm running this script, I'm just
> looking to have something
> I've already pushed locally dumped. If I mess up, and don't have the
> branch that
> I've used
> pushed to my remote already (or for whatever reason want/need different
> branches .. which
> was broken in previous updates to the script .. grrr), I don't want
> something
> pushing a branch
> without be explicitly giving permission for that to happen.
>
>
> Thanks, how about add an option:
>
> "-a automatically push/update local branch (-l) to remote branch (-b)"
>
> Then it will always create/update the remote branch when -a is used.
>
>
> That would meet my requirement. So looks fine to me. Others of course have the
> right to object :)
>
> Cheers,
>
> Bruce
>
>
> // Robert
>
>
> Bruce
>
>
> [YOCTO #9408]
>
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com
> <mailto:liezhi.yang at windriver.com>
> <mailto:liezhi.yang at windriver.com <mailto:liezhi.yang at windriver.com>>>
>
> ---
> scripts/create-pull-request | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
> index 479ad6e..7dc9836 100755
> --- a/scripts/create-pull-request
> +++ b/scripts/create-pull-request
> @@ -173,8 +173,8 @@ esac
> if [ -n "$WEB_URL" ]; then
> 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."
> + echo "Branch '$BRANCH' not found on '$REMOTE',
> creating it..."
> + git push $REMOTE $L_BRANCH:$BRANCH
> echo ""
> fi
> fi
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> <mailto:Openembedded-core at lists.openembedded.org>
> <mailto:Openembedded-core at lists.openembedded.org
> <mailto:Openembedded-core at lists.openembedded.org>>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its
> end"
>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its
> end"
More information about the Openembedded-core
mailing list