# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1334385575 18000
# Node ID 9b26d541e972428a21d44837650932b2f2f5aeb0
# Parent  d54d4de56aa7dbe5dc8d5a19a0db76ffab2b932b# Parent  c3aedd526d530506891caf690ff9688404bb5ea8
merge with stable

diff -r d54d4de56aa7 -r 9b26d541e972 contrib/check-code.py
--- a/contrib/check-code.py	Fri Apr 13 11:01:07 2012 -0700
+++ b/contrib/check-code.py	Sat Apr 14 01:39:35 2012 -0500
@@ -180,7 +180,7 @@
      "comparison with singleton, use 'is' or 'is not' instead"),
     (r'^\s*(while|if) [01]:',
      "use True/False for constant Boolean expression"),
-    (r'(?<!def)\s+hasattr',
+    (r'(?:(?<!def)\s+|\()hasattr',
      'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'),
     (r'opener\([^)]*\).read\(',
      "use opener.read() instead"),
diff -r d54d4de56aa7 -r 9b26d541e972 hgext/mq.py
--- a/hgext/mq.py	Fri Apr 13 11:01:07 2012 -0700
+++ b/hgext/mq.py	Sat Apr 14 01:39:35 2012 -0500
@@ -3315,7 +3315,7 @@
         repo._phasedefaults.append(mqphasedefaults)
 
 def mqimport(orig, ui, repo, *args, **kwargs):
-    if (hasattr(repo, 'abortifwdirpatched')
+    if (util.safehasattr(repo, 'abortifwdirpatched')
         and not kwargs.get('no_commit', False)):
         repo.abortifwdirpatched(_('cannot import over an applied patch'),
                                    kwargs.get('force'))