Hi folks,

I use "make patchcheck" a fair bit as a checklist for whether or not a
change needs any further adjustments before merging, but found it's
patch-based approach less then helpful with the new PR-centric workflow.

Accordingly, I just merged a few key updates to master and the 2.7/3.5/3.6
branches:

- it will automatically determine the current base branch, and check all
files changed relatively to that branch, rather than only checking
uncommitted changes
- it accepts any ".git" entry as indicating a checkout (nor just
directories), since "git worktree" defines ".git" as a configuration file

The automatic determination of the base branch is as follows:

- if an "upstream" remote is defined, it's used as the base branch remote,
otherwise "origin" is used
- if sys.version_info.releaselevel is "alpha", the base branch is
"<remote>/master"
- otherwise it is "<remote>/X.Y" (also based on sys.version_info)

Note that this works fine for "make patchcheck" (since it uses the just
built Python to run Tools/scripts/patchcheck.py), but anyone running the
tool directly rather than through the makefile may have to adjust how they
do things.

Cheers,
Nick.

-- 
Nick Coghlan   |   ncogh...@gmail.com   |   Brisbane, Australia
_______________________________________________
python-committers mailing list
python-committers@python.org
https://mail.python.org/mailman/listinfo/python-committers
Code of Conduct: https://www.python.org/psf/codeofconduct/

Reply via email to