You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by neykov <gi...@git.apache.org> on 2017/01/05 10:45:33 UTC
[GitHub] brooklyn-dist pull request #74: PR merge automation
GitHub user neykov opened a pull request:
https://github.com/apache/brooklyn-dist/pull/74
PR merge automation
Makes merging Github PRs in the Apache repos easier and less error-prone. Adds more context to the merge commit message - PR title and body.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/neykov/brooklyn-dist apache-merge
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-dist/pull/74.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #74
----
commit bc16cbcf5be089a902766308f9faac2b54d884f0
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Date: 2016-12-26T09:56:24Z
PR merge automation
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-dist/pull/74#discussion_r94921861
--- Diff: scripts/am ---
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Always use on a separate merge-only repo!
+
+# Best used with a wrapper script in your PATH
+# #!/bin/bash
+# export USERNAME=<github username>
+# export PERSONAL_TOKEN=<github personal token from https://github.com/settings/tokens>
+# <absolute path to brooklyn-dist>/scripts/am $@
+
+set -e
+
+PR=$1
+: ${PR_REMOTE:=upstream}
+: ${APACHE_REMOTE:=apache}
+: ${CLOSES_MESSAGE:="Closes #"}
+
+REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
+MODULE=${REMOTE_URL##*/}
+
+if [ -z "$PR" ]; then
+ echo "Usage: am <PR number>"
+ exit 1
+fi
+
+if ! git branch | grep -q "* master"; then
+ echo "Must be on master branch"
+ exit 1
+fi
--- End diff --
or, better, `git fetch ${PR_REMOTE}`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-dist/pull/74#discussion_r94919688
--- Diff: scripts/am ---
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Always use on a separate merge-only repo!
+
+# Best used with a wrapper script in your PATH
+# #!/bin/bash
+# export USERNAME=<github username>
+# export PERSONAL_TOKEN=<github personal token from https://github.com/settings/tokens>
+# <absolute path to brooklyn-dist>/scripts/am $@
+
+set -e
+
+PR=$1
+: ${PR_REMOTE:=upstream}
+: ${APACHE_REMOTE:=apache}
+: ${CLOSES_MESSAGE:="Closes #"}
+
+REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
+MODULE=${REMOTE_URL##*/}
+
+if [ -z "$PR" ]; then
+ echo "Usage: am <PR number>"
+ exit 1
+fi
+
+if ! git branch | grep -q "* master"; then
+ echo "Must be on master branch"
+ exit 1
+fi
--- End diff --
Maybe worth adding an `else` with
```
git fetch --all
git pull --rebase
```
so as to automate that step too.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist issue #74: PR merge automation
Posted by richardcloudsoft <gi...@git.apache.org>.
Github user richardcloudsoft commented on the issue:
https://github.com/apache/brooklyn-dist/pull/74
Nice!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-dist/pull/74
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by geomacy <gi...@git.apache.org>.
Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-dist/pull/74#discussion_r94921205
--- Diff: scripts/am ---
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Always use on a separate merge-only repo!
+
+# Best used with a wrapper script in your PATH
+# #!/bin/bash
+# export USERNAME=<github username>
+# export PERSONAL_TOKEN=<github personal token from https://github.com/settings/tokens>
+# <absolute path to brooklyn-dist>/scripts/am $@
+
+set -e
+
+PR=$1
+: ${PR_REMOTE:=upstream}
+: ${APACHE_REMOTE:=apache}
+: ${CLOSES_MESSAGE:="Closes #"}
+
+REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
--- End diff --
Perhaps worth a comment above, requires git 2.7 or more?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-dist/pull/74#discussion_r94949151
--- Diff: scripts/am ---
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Always use on a separate merge-only repo!
+
+# Best used with a wrapper script in your PATH
+# #!/bin/bash
+# export USERNAME=<github username>
+# export PERSONAL_TOKEN=<github personal token from https://github.com/settings/tokens>
+# <absolute path to brooklyn-dist>/scripts/am $@
+
+set -e
+
+PR=$1
+: ${PR_REMOTE:=upstream}
+: ${APACHE_REMOTE:=apache}
+: ${CLOSES_MESSAGE:="Closes #"}
+
+REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
+MODULE=${REMOTE_URL##*/}
+
+if [ -z "$PR" ]; then
+ echo "Usage: am <PR number>"
+ exit 1
+fi
+
+if ! git branch | grep -q "* master"; then
+ echo "Must be on master branch"
+ exit 1
+fi
--- End diff --
This just makes sure we are on `master` (vs say `0.10.0`). Updating to remote master happens here https://github.com/apache/brooklyn-dist/pull/74/files#diff-7c4ab39c149b092f17e43d7f46616063R85.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] brooklyn-dist pull request #74: PR merge automation
Posted by neykov <gi...@git.apache.org>.
Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-dist/pull/74#discussion_r94949096
--- Diff: scripts/am ---
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Always use on a separate merge-only repo!
+
+# Best used with a wrapper script in your PATH
+# #!/bin/bash
+# export USERNAME=<github username>
+# export PERSONAL_TOKEN=<github personal token from https://github.com/settings/tokens>
+# <absolute path to brooklyn-dist>/scripts/am $@
+
+set -e
+
+PR=$1
+: ${PR_REMOTE:=upstream}
+: ${APACHE_REMOTE:=apache}
+: ${CLOSES_MESSAGE:="Closes #"}
+
+REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
--- End diff --
Haven't realized this is a recent addition - have added a fall back.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---