Re: MergeBot is here!

2017-07-15 Thread Robert Bradshaw
SGTM. On Fri, Jul 14, 2017 at 3:37 PM, Kenneth Knowles wrote: > I think 1 & 3 can be squashed :-) > > If someone has fixup! commits you definitely don't want to merge exactly > as-is so it shouldn't be possible. (and if they messed up their fixup! so > it doesn't vanish, you also don't want to m

Re: MergeBot is here!

2017-07-14 Thread Kenneth Knowles
I think 1 & 3 can be squashed :-) If someone has fixup! commits you definitely don't want to merge exactly as-is so it shouldn't be possible. (and if they messed up their fixup! so it doesn't vanish, you also don't want to merge that) And then, yes, that covers my wants. On Fri, Jul 14, 2017 at

Re: MergeBot is here!

2017-07-14 Thread Jason Kuster
Hey folks, thanks for your thoughts! I have some responses for you. :) Regarding squashing, it looks like there are three things at play -- forgive me if I've misunderstood. 1. Merge commits exactly as they are in the PR. 2. Squash all commits down to the first commit 3. Automatically squash fix

Re: MergeBot is here!

2017-07-12 Thread Kenneth Knowles
On Wed, Jul 12, 2017 at 12:08 PM, Robert Bradshaw < rober...@google.com.invalid> wrote: > On Tue, Jul 11, 2017 at 7:14 PM, Kenneth Knowles > wrote: > > > The thing is that "fixup! " indicates that this fixup > > should be reordered and applied to the referenced commit. Squashing in > > order is n

Re: MergeBot is here!

2017-07-12 Thread Robert Bradshaw
On Tue, Jul 11, 2017 at 7:14 PM, Kenneth Knowles wrote: > > On Tue, Jul 11, 2017 at 4:25 PM, Robert Bradshaw < > rober...@google.com.invalid> wrote: > > > On Tue, Jul 11, 2017 at 8:51 AM, Kenneth Knowles > > wrote: > > > I like the idea of controlling squashing or not explicitly in the > > merge

Re: MergeBot is here!

2017-07-11 Thread Kenneth Knowles
On Tue, Jul 11, 2017 at 4:25 PM, Robert Bradshaw < rober...@google.com.invalid> wrote: > On Tue, Jul 11, 2017 at 8:51 AM, Kenneth Knowles > wrote: > > I like the idea of controlling squashing or not explicitly in the > mergebot > > invocation. I don't think it needs to be made interactive, but ju

Re: MergeBot is here!

2017-07-11 Thread Robert Bradshaw
On Tue, Jul 11, 2017 at 8:51 AM, Kenneth Knowles wrote: > I like the idea of controlling squashing or not explicitly in the mergebot > invocation. I don't think it needs to be made interactive, but just based > on preparing the PR appropriately. > > I propose this for the default `@asfgit merge`:

Re: MergeBot is here!

2017-07-11 Thread Kenneth Knowles
I like the idea of controlling squashing or not explicitly in the mergebot invocation. I don't think it needs to be made interactive, but just based on preparing the PR appropriately. I propose this for the default `@asfgit merge`: Don't squash, but reject merges that have commits that are obvious

Re: MergeBot is here!

2017-07-11 Thread Ismaël Mejía
Thanks a lot Jason, Great that Infra solved (2) so fast. About (3), maybe the extra pause/validation is not needed, because the bot will in principle make its work appropriately, maybe what we could just have is a way to see the git branch with the commits that mergebot will do as part of the rev

Re: MergeBot is here!

2017-07-11 Thread Aljoscha Krettek
+1 This is excellent! > On 10. Jul 2017, at 21:42, Jason Kuster > wrote: > > (quick update re #2 above): ~4 minutes after I reopened the ticket, it's > fixed. > https://github.com/apache/infrastructure-puppet/commit/709944291da5e8aea711cb8578f0594deb45e222 > updates the website to the correct

Re: MergeBot is here!

2017-07-10 Thread Jason Kuster
(quick update re #2 above): ~4 minutes after I reopened the ticket, it's fixed. https://github.com/apache/infrastructure-puppet/commit/709944291da5e8aea711cb8578f0594deb45e222 updates the website to the correct address. Infra is once again the best. On Mon, Jul 10, 2017 at 12:38 PM, Jason Kuster

Re: MergeBot is here!

2017-07-10 Thread Jason Kuster
Glad to hear everyone's pretty happy about it! Have a couple answers for your questions. Ted: I believe the MFA stuff (two-factor auth on github) is necessary for getting the additional features on GitHub (reviewer, etc), but may not be necessary for MergeBot. I'll check in with Infra and get back

Re: MergeBot is here!

2017-07-10 Thread Mark Liu
+1 Awesome work! Thank you Jason!!! Mark On Mon, Jul 10, 2017 at 10:05 AM, Robert Bradshaw < rober...@google.com.invalid> wrote: > +1, this is great! I'll second Ismaël's list requests, especially 1 and 3. > > On Mon, Jul 10, 2017 at 2:09 AM, Ismaël Mejía wrote: > > Excellent!, Automation of s

Re: MergeBot is here!

2017-07-10 Thread Robert Bradshaw
+1, this is great! I'll second Ismaël's list requests, especially 1 and 3. On Mon, Jul 10, 2017 at 2:09 AM, Ismaël Mejía wrote: > Excellent!, Automation of such repetitive (and error-prone) tasks is > strongly welcomed. > > Thanks for making this happen Jason! > > Some comments: > > 1. I suppose

Re: MergeBot is here!

2017-07-10 Thread Ismaël Mejía
Excellent!, Automation of such repetitive (and error-prone) tasks is strongly welcomed. Thanks for making this happen Jason! Some comments: 1. I suppose the code of mergebot is now part of Apache Infra, no? Do you know exactly where the code is hosted? And what is the procedure in case somebody

Re: MergeBot is here!

2017-07-07 Thread tarush grover
This is really good!! Regards, Tarush On Sat, 8 Jul 2017 at 10:20 AM, Jean-Baptiste Onofré wrote: > That's awesome ! > > Thanks Jason ! > > Regards > JB > > On 07/07/2017 10:21 PM, Jason Kuster wrote: > > Hi Beam Community, > > > > Early on in the project, we had a number of discussions about c

Re: MergeBot is here!

2017-07-07 Thread Jean-Baptiste Onofré
That's awesome ! Thanks Jason ! Regards JB On 07/07/2017 10:21 PM, Jason Kuster wrote: Hi Beam Community, Early on in the project, we had a number of discussions about creating an automated tool for merging pull requests. I’m happy to announce that we’ve developed such a tool and it is ready

Re: MergeBot is here!

2017-07-07 Thread James
Cool!Looking forward to use it in beam core project. On Sat, 8 Jul 2017 at 5:34 AM Kenneth Knowles wrote: > This is awesome!! > > On Fri, Jul 7, 2017 at 1:46 PM, Thomas Groh > wrote: > > > Super duper cool. Very exciting. > > > > On Fri, Jul 7, 2017 at 1:40 PM, Ted Yu wrote: > > > > > For https

Re: MergeBot is here!

2017-07-07 Thread Kenneth Knowles
This is awesome!! On Fri, Jul 7, 2017 at 1:46 PM, Thomas Groh wrote: > Super duper cool. Very exciting. > > On Fri, Jul 7, 2017 at 1:40 PM, Ted Yu wrote: > > > For https://gitbox.apache.org/setup/ , after completing the first two > > steps, is there any action needed for "MFA Status" box ? > >

Re: MergeBot is here!

2017-07-07 Thread Thomas Groh
Super duper cool. Very exciting. On Fri, Jul 7, 2017 at 1:40 PM, Ted Yu wrote: > For https://gitbox.apache.org/setup/ , after completing the first two > steps, is there any action needed for "MFA Status" box ? > > Cheers > > On Fri, Jul 7, 2017 at 1:37 PM, Lukasz Cwik > wrote: > > > for i in ra

Re: MergeBot is here!

2017-07-07 Thread Ted Yu
For https://gitbox.apache.org/setup/ , after completing the first two steps, is there any action needed for "MFA Status" box ? Cheers On Fri, Jul 7, 2017 at 1:37 PM, Lukasz Cwik wrote: > for i in range(0, inf): +1 > > Note that the URL for gitbox linking is: > https://gitbox.apache.org/setup/ (

Re: MergeBot is here!

2017-07-07 Thread Lukasz Cwik
for i in range(0, inf): +1 Note that the URL for gitbox linking is: https://gitbox.apache.org/setup/ (above URL was missing '/' and was giving 404) On Fri, Jul 7, 2017 at 1:21 PM, Jason Kuster wrote: > Hi Beam Community, > > Early on in the project, we had a number of discussions about creatin

Re: MergeBot is here!

2017-07-07 Thread Davor Bonaci
This is fantastic! Thank you Jason, and special thanks to the Infrastructure team for supporting us every step of the way. On Fri, Jul 7, 2017 at 1:21 PM, Jason Kuster wrote: > Hi Beam Community, > > Early on in the project, we had a number of discussions about creating an > automated tool for

MergeBot is here!

2017-07-07 Thread Jason Kuster
Hi Beam Community, Early on in the project, we had a number of discussions about creating an automated tool for merging pull requests. I’m happy to announce that we’ve developed such a tool and it is ready for experimental usage in Beam! The tool, MergeBot, works in conjunction with ASF’s existin