Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5ef312c

Browse filesBrowse files
committed
cherry_picker: Update version info
Add changelog to readme. Fix several typos.
1 parent c51eb14 commit 5ef312c
Copy full SHA for 5ef312c

File tree

Expand file treeCollapse file tree

2 files changed

+24
-15
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+24
-15
lines changed
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
"""Backport CPython changes from master to maintenance branches."""
2-
__version__ = '0.2.9.dev1'
2+
__version__ = '1.0.0.dev1'

‎cherry_picker/readme.rst

Copy file name to clipboardExpand all lines: cherry_picker/readme.rst
+23-14Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Usage (from a cloned CPython directory) ::
22

3-
cherry_picker [--pr-remote REMOTE] [--dry-run] [--status] [--abort/--continue] [--push/--no-push] <commit_sha1> <branches>
3+
cherry_picker [--pr-remote REMOTE] [--dry-run] [--config-path CONFIG-PATH] [--status] [--abort/--continue] [--push/--no-push] <commit_sha1> <branches>
44

55
|pyversion status|
66
|pypi status|
@@ -117,22 +117,22 @@ Available config options::
117117
e.g. a sha1 hash from the very first initial commit
118118
("7f777ed95a19224294949e1b4ce56bbffcb1fe9f" by default)
119119

120-
To setup the tool for using by custom project:
120+
To customize the tool for used by other project:
121121

122-
1. Create a file called `.cherry_picker.toml` in the project's root
123-
folder (alongside with `.git` forlder).
122+
1. Create a file called ``.cherry_picker.toml`` in the project's root
123+
folder (alongside with ``.git`` folder).
124124

125-
2. Add `team`, `repo` and `check_sha` config values as described above.
125+
2. Add ``team``, ``repo`` and ``check_sha`` config values as described above.
126126

127-
3. Use `git add .cherry_picker.toml` / `git commit` to add the config
128-
into git.
127+
3. Use ``git add .cherry_picker.toml`` / ``git commit`` to add the config
128+
into ``git``.
129129

130-
4. Add `cherry_picker` to development dependencies or just install it
131-
by `pip install cherry_picker`
130+
4. Add ``cherry_picker`` to development dependencies or install it
131+
by ``pip install cherry_picker``
132132

133-
5. Now everything is ready, use `cherry_picker <commit_sha> <branch1>
134-
<branch2>` for cherry-picking changes from `<commit_sha` into
135-
maintainance branches.
133+
5. Now everything is ready, use ``cherry_picker <commit_sha> <branch1>
134+
<branch2>`` for cherry-picking changes from ``<commit_sha`` into
135+
maintenance branches.
136136

137137
Demo
138138
----
@@ -243,10 +243,11 @@ cherry-pick additional commits, by::
243243
$ git cherry-pick -x <commit_sha1>
244244

245245
`--config-path` option
246-
-------------------
246+
----------------------
247247

248248
Allows to override default config file path
249-
(`<PROJ-ROOT>/.cherry_picker.toml`) with a custom one.
249+
(`<PROJ-ROOT>/.cherry_picker.toml`) with a custom one. This allows cherry_picker
250+
to backport projects other than CPython.
250251

251252

252253
Creating Pull Requests
@@ -308,3 +309,11 @@ in the directory where ``pyproject.toml`` exists::
308309
.. |travis status| image:: https://travis-ci.org/python/core-workflow.svg?branch=master
309310
:target: https://travis-ci.org/python/core-workflow
310311

312+
Changelog
313+
=========
314+
315+
1.0.0
316+
-----
317+
318+
- Support configuration file by using `--config-path` option, or by adding
319+
`.cherry-picker.toml` file to the root of the project.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.