Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

No problem :) It's been deployed. Mariatta Wijaya On Fri, Jan 26, 2018 at 9:48 AM, Eric V. Smith wrote: > > > It works for me: I think this is very helpful. Thanks for coding it up so > quickly! > > Eric > ___ Python-Dev mailing list Python-Dev@python.

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/26/2018 12:22 PM, Mariatta Wijaya wrote: I believe https://github.com/python/bedevere/pull/82  will add a comment, which will get emailed to everyone nosy on the PR. Yes, and I've just updated my PR description: If a PR was merged and

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

> > I believe https://github.com/python/bedevere/pull/82 will add a comment, > which will get emailed to everyone nosy on the PR. Yes, and I've just updated my PR description: If a PR was merged and the commit message was not changed from # to GH-, bedevere-bot will leave a comment to rem

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 10:38 PM, Brett Cannon wrote: On Thu, 25 Jan 2018 at 17:33 Eric V. Smith > wrote: On 1/25/2018 8:13 PM, Terry Reedy wrote: > On 1/25/2018 7:47 PM, Mariatta Wijaya wrote: >> I think we're starting to deviate from the original topic here whi

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, 25 Jan 2018 at 17:33 Eric V. Smith wrote: > On 1/25/2018 8:13 PM, Terry Reedy wrote: > > On 1/25/2018 7:47 PM, Mariatta Wijaya wrote: > >> I think we're starting to deviate from the original topic here which > >> is: please replace # with GH- when you click Squash & Merge button. > > > >

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 8:13 PM, Terry Reedy wrote: On 1/25/2018 7:47 PM, Mariatta Wijaya wrote: I think we're starting to deviate from the original topic here which is: please replace # with GH- when you click Squash & Merge button. I will try to remember to do this, although it seems pointless if most

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 7:47 PM, Mariatta Wijaya wrote: I think we're starting to deviate from the original topic here which is: please replace # with GH- when you click Squash & Merge button. I will try to remember to do this, although it seems pointless if most people do not. The idea of the mergebot

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 4:34 PM, Berker Peksağ wrote: On Fri, Jan 26, 2018 at 12:09 AM, Terry Reedy wrote: On 1/25/2018 1:53 PM, Brett Cannon wrote: I would assume it would just go into miss-islington, but before we get ahead of ourselves and design this we need to get consensus that people like the ove

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

I think we're starting to deviate from the original topic here which is: please replace # with GH- when you click Squash & Merge button. The idea of the mergebot (by issuing a command) was brought up for a different purpose: to automate the merging of a PR after all CI passes (which can take time)

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 4:22 PM, Berker Peksağ wrote: On Thu, Jan 25, 2018 at 11:50 PM, Terry Reedy wrote: On 1/25/2018 1:03 PM, Mariatta Wijaya wrote: One idea is maybe have a bot to do the squash commit, for example by commenting on GitHub: @merge-bot merge So core devs can do the above instead o

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 1:46 PM, Barry Warsaw wrote: > On Jan 25, 2018, at 13:38, Mariatta Wijaya wrote: >> >> +1 for the mergebot! :) > > Yes, +1 from me too. As you know, GitLab has the option to “merge when CI > completes successfully” and it’s a great workflow. Once I’ve reviewed and > ap

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

2018-01-25 22:55 GMT+01:00 Mariatta Wijaya : > My problem has been that I almost always still need to rewrite the commit > message. > Especially when someone wrote "fix a typo" or "fix several typos". That's the main drawback of GitHub compared to Gerrit. On Gerrit, the commit message is at the sa

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

2018-01-25 22:46 GMT+01:00 Barry Warsaw : > Why not just auto merge if the PR is approved, CI is all green, and no > additional commits have been pushed? Merging a PR and approving it should be two different actions. Sometimes, you prefer to wait for 2 approvals before merging. Sometimes, you wan

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Jan 25, 2018, at 16:55, Mariatta Wijaya wrote: > My problem has been that I almost always still need to rewrite the commit > message. > Especially when someone wrote "fix a typo" or "fix several typos". > > If it automatically merges, then there's no opportunity to adjust the commit > mess

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

> > Why not just auto merge if the PR is approved, CI is all green, and no > additional commits have been pushed? My problem has been that I almost always still need to rewrite the commit message. Especially when someone wrote "fix a typo" or "fix several typos". If it automatically merges, then

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Jan 25, 2018, at 13:38, Mariatta Wijaya wrote: > > +1 for the mergebot! :) Yes, +1 from me too. As you know, GitLab has the option to “merge when CI completes successfully” and it’s a great workflow. Once I’ve reviewed and approved the branch, I can hit this button and… we’re done! Assum

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Fri, Jan 26, 2018 at 12:09 AM, Terry Reedy wrote: > On 1/25/2018 1:53 PM, Brett Cannon wrote: > >> I would assume it would just go into miss-islington, but before we get >> ahead of ourselves and design this we need to get consensus that people like >> the overall idea of using a bot to do a ma

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 01/25/2018 10:53 AM, Brett Cannon wrote: [...] before we get ahead of ourselves and design this we need to get consensus that people like the overall idea of using a bot to do a main > commits as well. -1 on using comments for the main commit. -- ~Ethan~ ___

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 11:50 PM, Terry Reedy wrote: > On 1/25/2018 1:03 PM, Mariatta Wijaya wrote: > >> One idea is maybe have a bot to do the squash commit, for example by >> commenting on GitHub: >> @merge-bot merge > > >> So core devs can do the above instead of pressing the commit button. A

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 1:53 PM, Brett Cannon wrote: I would assume it would just go into miss-islington, but before we get ahead of ourselves and design this we need to get consensus that people like the overall idea of using a bot to do a main commits as well. I strongly dislike any idea of making me

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On 1/25/2018 1:03 PM, Mariatta Wijaya wrote: One idea is maybe have a bot to do the squash commit, for example by commenting on GitHub: @merge-bot merge So core devs can do the above instead of pressing the commit button. Any thoughts on this? I can hardly believe that you are seriously

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

: Re: [Python-Dev] GH- vs # in merge commit On Thu, 25 Jan 2018 at 10:51 Berker Peksağ wrote: On Thu, Jan 25, 2018 at 9:38 PM, Mariatta Wijaya wrote: >> That would be best solution (I think it would solve >> https://github.com/python/miss-islington/issues/16 too) b

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, 25 Jan 2018 at 10:51 Berker Peksağ wrote: > On Thu, Jan 25, 2018 at 9:38 PM, Mariatta Wijaya > wrote: > >> That would be best solution (I think it would solve > >> https://github.com/python/miss-islington/issues/16 too) but it's more > >> complicated than the extension idea :) I have som

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 9:38 PM, Mariatta Wijaya wrote: >> That would be best solution (I think it would solve >> https://github.com/python/miss-islington/issues/16 too) but it's more >> complicated than the extension idea :) I have some time work on it if >> you'd like to implement the mergebot i

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, 25 Jan 2018 at 10:14 Zachary Ware wrote: > On Thu, Jan 25, 2018 at 12:03 PM, Mariatta Wijaya > wrote: > >> Of course, we would still need to convince people to install it :) > > > > > > Right, that's the challenge :) > > I personally use Chrome (!) and I've been using your Chrome extensi

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

> > That would be best solution (I think it would solve > https://github.com/python/miss-islington/issues/16 too) but it's more > complicated than the extension idea :) I have some time work on it if > you'd like to implement the mergebot idea. +1 for the mergebot! :) New bot or miss-islington's

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 9:03 PM, Mariatta Wijaya wrote: >> Of course, we would still need to convince people to install it :) > > > Right, that's the challenge :) > I personally use Chrome (!) and I've been using your Chrome extension, so > thank you! > However, I don't feel comfortable making thi

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 12:03 PM, Mariatta Wijaya wrote: >> Of course, we would still need to convince people to install it :) > > > Right, that's the challenge :) > I personally use Chrome (!) and I've been using your Chrome extension, so > thank you! > However, I don't feel comfortable making th

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

> > Of course, we would still need to convince people to install it :) Right, that's the challenge :) I personally use Chrome (!) and I've been using your Chrome extension, so thank you! However, I don't feel comfortable making this available only for a specific browser user, feels exclusionary t

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 4:58 PM, Mariatta Wijaya wrote: > It has to be manually edited right before you commit/merge on GitHub. > I don't think it can be automatically changed? Unless we have some kind of > post commit hook to amend the commit message. Perhaps it's possible to edit both title and

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

It has to be manually edited right before you commit/merge on GitHub. I don't think it can be automatically changed? Unless we have some kind of post commit hook to amend the commit message. I've been changing it to GH- , so does miss-islington when she backports. If you see the mixed GH- and # i

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

On Thu, Jan 25, 2018 at 1:42 PM, INADA Naoki wrote: > Hi. > > Devguide says: > > """ > Replace the reference to GitHub pull request # with GH-. If > the title is too long, the pull request number can be added to the > message body. > """ > > https://devguide.python.org/gitbootcamp/#accepti

Re: [Python-Dev] GH-NNNN vs #NNNN in merge commit

GH prefix avoids confusion between bugs.python.org and GitHub, but GitHub generates #xxx in the generated commit message on Merge... Each commit message has to be manually edited. It would be better to get GH automatically. Victor Le 25 janv. 2018 11:44, "INADA Naoki" a écrit : > Hi. > > Devgui

[Python-Dev] GH-NNNN vs #NNNN in merge commit

Hi. Devguide says: """ Replace the reference to GitHub pull request # with GH-. If the title is too long, the pull request number can be added to the message body. """ https://devguide.python.org/gitbootcamp/#accepting-and-merging-a-pull-request But there are more # than GH- in