feat(cli): prompt user when landing PR with several commits #572

aduh95 · 2021-10-14T13:47:18Z

The idea would be to run CQ with this flag by default, potentially we could add additional labels such as commit-queue-fixupAll and commit-queue-more-than-one-commit to let the CQ handle more complex PRs.

Refs: nodejs/node#40436

codecov · 2021-10-14T13:49:54Z

Codecov Report

Merging #572 (6b173fb) into main (35d281b) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #572   +/-   ##
=======================================
  Coverage   82.57%   82.57%           
=======================================
  Files          35       35           
  Lines        1750     1750           
=======================================
  Hits         1445     1445           
  Misses        305      305

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 35d281b...6b173fb. Read the comment docs.

richardlau · 2021-10-14T14:28:01Z

The current commit-queue passes in --yes so will automatically answer "yes" to the prompt.
https://github.com/nodejs/node/blob/b80b85e130a2a04a69c8fc846e27236a86107a80/tools/actions/commit-queue.sh#L73

aduh95 · 2021-10-14T14:30:52Z

The current commit-queue passes in --yes so will automatically answer "yes" to the prompt. https://github.com/nodejs/node/blob/b80b85e130a2a04a69c8fc846e27236a86107a80/tools/actions/commit-queue.sh#L73

Not sure that's true, I think --yes means "answer whatever is the default answer"

node-core-utils/lib/cli.js

Lines 71 to 73 in 3e8b07d

    
           if (this.assumeYes) { 
        
             return defaultAnswer; 
        
           }

richardlau · 2021-10-14T14:37:36Z

Not sure that's true, I think --yes means "answer whatever is the default answer"

node-core-utils/lib/cli.js

Lines 71 to 73 in 3e8b07d

if (this.assumeYes) {

return defaultAnswer;

}

In which case this is very misleading

node-core-utils/components/git/land.js

Lines 53 to 58 in 62b3fef

    
           yes: { 
        
             type: 'boolean', 
        
             default: false, 
        
             describe: 'Assume "yes" as answer to all prompts and run ' + 
        
             'non-interactively. If an undesirable situation occurs, such as a pull ' + 
        
             'request or commit check fails, then git node land will abort.'

And add an option to abort the session if trying to land more than one commit. Refs: nodejs/node#40436

aduh95 · 2021-10-23T15:46:33Z

Just tried with:

git node land 39392 --yes --autorebase --oneCommitMax (failing as expected)¹
git node land 39392 --yes --autorebase (passing as expected)¹
git node land 40475 --yes --autorebase --oneCommitMax (passing as expected) ²
git node land 40475 --yes --autorebase (passing as expected)²
git node land 40570 --yes --autorebase --oneCommitMax (passing as expected) ³
git node land 40570 --yes --autorebase (passing as expected) ³

https://github.com/nodejs/node/pull/39392 is a PR containing several commits. ↩ ↩²
https://github.com/nodejs/node/pull/40475 is a PR containing only one commit. ↩ ↩²
https://github.com/nodejs/node/pull/40570 is a PR containing only fixup! commits (I had to make it fast-tracked to work around the 48-hour rule). ↩ ↩²

Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commit, the CQ will land the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: nodejs#40436 Refs: nodejs/node-core-utils#572

Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commits, the CQ lands the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: nodejs#40436 Refs: nodejs/node-core-utils#572

mhdawson

LGTM

lib/landing_session.js

Co-authored-by: Michaël Zasso <targos@protonmail.com>

Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commits, the CQ lands the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: nodejs/node#40436 Refs: nodejs/node-core-utils#572 PR-URL: nodejs/node#40577

Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commits, the CQ lands the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: nodejs#40436 Refs: nodejs/node-core-utils#572 PR-URL: nodejs#40577

Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commits, the CQ lands the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: #40436 Refs: nodejs/node-core-utils#572 PR-URL: #40577 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

aduh95 force-pushed the one-commit-max branch from a54cebd to e419f7b Compare October 14, 2021 13:54

aduh95 changed the title ~~enh(cli): add --oneCommitMax option~~ feat(cli): add --oneCommitMax option Oct 14, 2021

aduh95 force-pushed the one-commit-max branch from e419f7b to 4c55189 Compare October 14, 2021 14:15

aduh95 changed the title ~~feat(cli): add --oneCommitMax option~~ feat(cli): prompt user when landing PR with several commits Oct 14, 2021

feat(cli): prompt user when landing PR with several commits

cbcf4b0

And add an option to abort the session if trying to land more than one commit. Refs: nodejs/node#40436

aduh95 force-pushed the one-commit-max branch from aafb60d to cbcf4b0 Compare October 23, 2021 15:31

aduh95 mentioned this pull request Oct 23, 2021

Commit queue and unsquashed commits nodejs/node#40436

Closed

aduh95 mentioned this pull request Oct 23, 2021

tools: abort CQ session when landing several commits nodejs/node#40577

Merged

mhdawson approved these changes Oct 25, 2021

View reviewed changes

codebytere approved these changes Oct 26, 2021

View reviewed changes

targos approved these changes Oct 26, 2021

View reviewed changes

lib/landing_session.js Outdated Show resolved Hide resolved

fixup! feat(cli): prompt user when landing PR with several commits

6b173fb

Co-authored-by: Michaël Zasso <targos@protonmail.com>

targos merged commit 89925c3 into nodejs:main Oct 28, 2021

aduh95 deleted the one-commit-max branch October 29, 2021 07:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cli): prompt user when landing PR with several commits #572

feat(cli): prompt user when landing PR with several commits #572

aduh95 commented Oct 14, 2021

codecov bot commented Oct 14, 2021 •

edited

richardlau commented Oct 14, 2021 •

edited

aduh95 commented Oct 14, 2021

richardlau commented Oct 14, 2021

aduh95 commented Oct 23, 2021

mhdawson left a comment

feat(cli): prompt user when landing PR with several commits #572

feat(cli): prompt user when landing PR with several commits #572

Conversation

aduh95 commented Oct 14, 2021

codecov bot commented Oct 14, 2021 • edited

Codecov Report

richardlau commented Oct 14, 2021 • edited

aduh95 commented Oct 14, 2021

richardlau commented Oct 14, 2021

aduh95 commented Oct 23, 2021

Footnotes

mhdawson left a comment

Choose a reason for hiding this comment

codecov bot commented Oct 14, 2021 •

edited

richardlau commented Oct 14, 2021 •

edited