[Python-checkins] cpython (2.7): Issue #14053: Fix "make patchcheck" to work with MQ.
nadeem.vawda
python-checkins at python.org
Wed Feb 22 10:53:46 CET 2012
http://hg.python.org/cpython/rev/179bc7557484
changeset: 75167:179bc7557484
branch: 2.7
parent: 75161:48a91063890c
user: Nadeem Vawda <nadeem.vawda at gmail.com>
date: Wed Feb 22 11:40:09 2012 +0200
summary:
Issue #14053: Fix "make patchcheck" to work with MQ.
Patch by Francisco Martín Brugué
files:
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
Tools/scripts/patchcheck.py | 16 ++++++++++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -108,6 +108,7 @@
Gary S. Brown
Oleg Broytmann
Dave Brueck
+Francisco Martín Brugué
Stan Bubrouski
Erik de Bueger
Dick Bulterman
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -531,6 +531,9 @@
Tools/Demos
-----------
+- Issue #14053: patchcheck.py ("make patchcheck") now works with MQ patches.
+ Patch by Francisco Martín Brugué.
+
- Issue #13930: 2to3 is now able to write its converted output files to another
directory tree as well as copying unchanged files and altering the file
suffix. See its new -o, -W and --add-suffix options. This makes it more
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -36,6 +36,20 @@
return decorated_fxn
+def mq_patches_applied():
+ """Check if there are any applied MQ patches."""
+ cmd = 'hg qapplied'
+ st = subprocess.Popen(cmd.split(),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ try:
+ bstdout, _ = st.communicate()
+ return st.returncode == 0 and bstdout
+ finally:
+ st.stdout.close()
+ st.stderr.close()
+
+
@status("Getting the list of files that have been added/changed",
info=lambda x: n_files_str(len(x)))
def changed_files():
@@ -43,6 +57,8 @@
if os.path.isdir(os.path.join(SRCDIR, '.hg')):
vcs = 'hg'
cmd = 'hg status --added --modified --no-status'
+ if mq_patches_applied():
+ cmd += ' --rev qparent'
elif os.path.isdir('.svn'):
vcs = 'svn'
cmd = 'svn status --quiet --non-interactive --ignore-externals'
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list