From 9f64f731933bfebf6767a42a0ae75503c1936454 Mon Sep 17 00:00:00 2001 From: Nadeem Vawda Date: Wed, 22 Feb 2012 11:46:41 +0200 Subject: [PATCH] Issue #14053: Fix "make patchcheck" to work with MQ. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Francisco Martín Brugué --- Misc/NEWS | 3 +++ Tools/scripts/patchcheck.py | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index f8081a9300b..ee4287bebc9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -483,6 +483,9 @@ Build 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 index dc6b932fa2d..0e18dd9356d 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -36,6 +36,16 @@ def status(message, modal=False, info=None): return decorated_fxn +def mq_patches_applied(): + """Check if there are any applied MQ patches.""" + cmd = 'hg qapplied' + with subprocess.Popen(cmd.split(), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) as st: + bstdout, _ = st.communicate() + return st.returncode == 0 and bstdout + + @status("Getting the list of files that have been added/changed", info=lambda x: n_files_str(len(x))) def changed_files(): @@ -43,6 +53,8 @@ def changed_files(): 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'