From f00011aff4e5b0986a0f0d36ba324c0ca8b983d1 Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Wed, 22 Feb 2012 11:40:09 +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/ACKS                   |  1 +
 Misc/NEWS                   |  3 +++
 Tools/scripts/patchcheck.py | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/Misc/ACKS b/Misc/ACKS
index a732965d5bf..624b6164bec 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -108,6 +108,7 @@ Jean Brouwers
 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
index 825c3a7ccda..f0b004486ab 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -531,6 +531,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 2834fefb23e..438e44eeff8 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -36,6 +36,20 @@ 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'
+    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 @@ 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'