Skip to content

Conversation

@andrewseguin
Copy link
Contributor

Example output:

^_^ node scripts/caretaking/cherrypick-patch.js 2019-07-20
Loading 11 pull requests
Loading PR #16604
Loading PR #16593
Loading PR #16587
Loading PR #16574
Loading PR #16571
Loading PR #16561
Loading PR #16556
Loading PR #16545
Loading PR #16466
Loading PR #16091
Loading PR #16057

16561	2019-07-22T18:41:02Z	701302dc482d7e4b77990b24e3b5ab330bbf1aa5	https://github.com/angular/components/pull/16561	style(mdc chips) Fix clashing input and remove classes
16604	2019-07-24T23:52:23Z	b5b9ff726e984b1ba31febea30b5afa3153ebbeb	https://github.com/angular/components/pull/16604	fix(popover-edit): blending in with background in high contrast mode
16593	2019-07-24T23:54:28Z	583af19e9cc6fb37e1e4d32fe2abcf9700d12fff	https://github.com/angular/components/pull/16593	feat(material-experimental): add test harness for radio-button
16571	2019-07-24T23:54:59Z	b0991de9284f5f24f708dcd92dca034623cf7595	https://github.com/angular/components/pull/16571	docs(expansion): fix docs for togglePosition input
16057	2019-07-24T23:58:40Z	13becdab50b6b9cf979ef9b3745f4fa29ff750c7	https://github.com/angular/components/pull/16057	fix(popover-edit): incorrectly caching values for more than one control
16091	2019-07-24T23:59:18Z	174bf4076a5c0a97d922741230c5e8143c0dc84f	https://github.com/angular/components/pull/16091	fix(popover-edit): focus trap not being destroyed and potential leaks with takeUntil
16587	2019-07-25T00:03:46Z	bd24369d3883cee834662800b0a5b043ffdc1c6c	https://github.com/angular/components/pull/16587	fix(button-toggle): error when checked value is set via static attribute in Ivy
16574	2019-07-25T00:04:38Z	67532dbbb8a14dfdca2134b506b6269d76700516	https://github.com/angular/components/pull/16574	fix(mdc chips) Fix matChipRemove Expression has changed error
16466	2019-07-25T18:39:31Z	615070acbdb2962eca3bebadb19720c614848981	https://github.com/angular/components/pull/16466	fix(popover-edit): unable to close by pressing enter on some screen readers
16545	2019-07-25T20:14:19Z	2a04ccfd46c154cc5a23993cda8dff3474f2248c	https://github.com/angular/components/pull/16545	feat(material-experimental): add test harnesses for slide-toggle
16556	2019-07-26T15:56:47Z	88631b936d371b6157cb686a88b2fef35c30dc0b	https://github.com/angular/components/pull/16556	feat(material-experimental): add test harness for button
---------------
--Cherry-pick--
---------------

git cherry-pick 701302dc482d7e4b77990b24e3b5ab330bbf1aa5;
git cherry-pick b5b9ff726e984b1ba31febea30b5afa3153ebbeb;
git cherry-pick 583af19e9cc6fb37e1e4d32fe2abcf9700d12fff;
git cherry-pick b0991de9284f5f24f708dcd92dca034623cf7595;
git cherry-pick 13becdab50b6b9cf979ef9b3745f4fa29ff750c7;

git cherry-pick 174bf4076a5c0a97d922741230c5e8143c0dc84f;
git cherry-pick bd24369d3883cee834662800b0a5b043ffdc1c6c;
git cherry-pick 67532dbbb8a14dfdca2134b506b6269d76700516;
git cherry-pick 615070acbdb2962eca3bebadb19720c614848981;
git cherry-pick 2a04ccfd46c154cc5a23993cda8dff3474f2248c;

git cherry-pick 88631b936d371b6157cb686a88b2fef35c30dc0b;

@andrewseguin andrewseguin requested a review from devversion as a code owner July 29, 2019 21:59
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jul 29, 2019
Copy link
Contributor

@mmalerba mmalerba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool stuff!

@andrewseguin andrewseguin force-pushed the cherry-pick branch 2 times, most recently from fcf57db to 8863797 Compare August 1, 2019 22:40
@andrewseguin
Copy link
Contributor Author

  • Moved the script to tools and changed it to be Typescript
  • Added command from package.json: yarn cherry-pick-patch
  • Attempts to automatically default to the latest patch branch, prompts user to confirm
  • Uses the patch branch's commit messages to find the latest SHA to cherry-pick
  • Confirms with user if the commit is correct

TODO's left for another PR:

  • Handle pagination for cases were there are over 100 commits to cherry-pick (thanks Paul)
  • Use a local environment variable for authentication token (thanks Miles)

@andrewseguin andrewseguin force-pushed the cherry-pick branch 3 times, most recently from bb22e44 to c3b49a1 Compare August 1, 2019 22:49
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn
Copy link
Member

jelbourn commented Aug 1, 2019

Lint error

@andrewseguin andrewseguin added the action: merge The PR is ready for merge by the caretaker label Aug 8, 2019
@mmalerba mmalerba merged commit 917871b into angular:master Aug 8, 2019
mmalerba pushed a commit that referenced this pull request Aug 14, 2019
* chore: add script to pull commits to cherrypick

* lint

(cherry picked from commit 917871b)
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants