https://github.com/mariatta/chic_a_cherry_picker
:snake: :cherries: :pick: has moved to python/core-workflow
https://github.com/mariatta/chic_a_cherry_picker
Last synced: 17 days ago
JSON representation
:snake: :cherries: :pick: has moved to python/core-workflow
- Host: GitHub
- URL: https://github.com/mariatta/chic_a_cherry_picker
- Owner: Mariatta
- License: mit
- Created: 2017-02-15T04:52:21.000Z (over 8 years ago)
- Default Branch: master
- Last Pushed: 2017-06-01T17:10:48.000Z (almost 8 years ago)
- Last Synced: 2025-02-17T08:16:37.949Z (3 months ago)
- Language: Python
- Homepage: https://github.com/python/core-workflow
- Size: 12.7 KB
- Stars: 2
- Watchers: 2
- Forks: 2
- Open Issues: 0
-
Metadata Files:
- Readme: readme.rst
- License: LICENSE.txt
Awesome Lists containing this project
README
Usage::
python -m cherry_picker
.. contents::
About
=====
Use this to backport cpython changes from ``master`` into one or more of the maintenance
branches (``3.6``, ``3.5``, ``2.7``).
This script will become obsolete once the cherry-picking bot is implemented.
There is no unit tests :sob: .... I tested this in production :sweat_smile:
Setup Info
==========
Requires Python 3.6 and virtualenv.
::
$ git clone https://github.com/Mariatta/chic_a_cherry_picker.git
$ cd chic_a_cherry_picker
$ virtualenv venv
$ source venv/bin/activate
(venv) $ pip install -r requirements.txt
(venv) $ git clone https://github.com/Mariatta/cpython.git #or your own cpython fork
(venv) $ cd cpython
(venv) $ git remote add upstream https://github.com/python/cpython.git
(venv) $ cd ../
Cherry-picking :snake: :cherries: :pick:
==============
(Setup first! See prev section)
::
(venv) $ python -m cherry_picker
The commit sha1 is obtained from the merged pull request on ``master``.
For example, to cherry-pick ``6de2b7817f-some-commit-sha1-d064`` into
``3.5`` and ``3.6``:
::
(venv) $ python -m cherry_picker 6de2b7817f-some-commit-sha1-d064 3.5 3.6
What this will do:
::
(venv) $ cd cpython
(venv) $ git fetch upstream
(venv) $ git checkout -b 6de2b78-3.5 upstream/3.5
(venv) $ git cherry-pick -x 6de2b7817f-some-commit-sha1-d064
(venv) $ git push origin 6de2b78-3.5
(venv) $ git checkout master
(venv) $ git branch -D 6de2b78-3.5
(venv) $ git checkout -b 6de2b78-3.6 upstream/3.6
(venv) $ git cherry-pick -x 6de2b7817f-some-commit-sha1-d064
(venv) $ git push origin 6de2b78-3.6
(venv) $ git checkout master
(venv) $ git branch -D 6de2b78-3.6
In case of merge conflicts or errors, then... the script will fail :stuck_out_tongue:
Creating Pull Requests
======================
When a cherry-pick was applied successfully, this script will open up a browser
tab that points to the pull request creation page.
The url of the pull request page looks similar to the following::
https://github.com/python/cpython/compare/3.5...Mariatta:6de2b78-3.5?expand=1
1. Prefix the pull request description with the branch ``[X.Y]``, e.g.::
[3.6] bpo-xxxxx: Fix this and that
2. Apply the appropriate ``cherry-pick for ...`` label
3. Press the ``Create Pull Request`` button.
4. Remove the ``needs backport to ...`` label from the original pull request
against ``master``.