diff --git a/tools/mercurial/hgsetup/config.py b/tools/mercurial/hgsetup/config.py
index e78e3a887135..14a981d54e18 100644
--- a/tools/mercurial/hgsetup/config.py
+++ b/tools/mercurial/hgsetup/config.py
@@ -133,7 +133,6 @@ class MercurialConfig(object):
             except KeyError:
                 pass
 
-
     def have_qnew_currentuser_default(self):
         if 'defaults' not in self._c:
             return False
@@ -154,8 +153,6 @@ class MercurialConfig(object):
 
         d = self._c['defaults']
         if 'qnew' not in d:
-          d['qnew'] = '-U'
+            d['qnew'] = '-U'
         else:
-          d['qnew'] = '-U ' + d['qnew']
-
-
+            d['qnew'] = '-U ' + d['qnew']
diff --git a/tools/mercurial/hgsetup/wizard.py b/tools/mercurial/hgsetup/wizard.py
index 23bef23cef54..36a69498e596 100644
--- a/tools/mercurial/hgsetup/wizard.py
+++ b/tools/mercurial/hgsetup/wizard.py
@@ -156,19 +156,17 @@ class MercurialSetupWizard(object):
 
         self.prompt_external_extension(c, 'bzexport', BZEXPORT_INFO)
 
-        active = c.extensions
-
-        if 'mq' in active:
+        if 'mq' in c.extensions:
             self.prompt_external_extension(c, 'mqext', MQEXT_INFO,
                                            os.path.join(self.ext_dir, 'mqext'))
 
             if 'mqext' in c.extensions:
                 self.update_mercurial_repo(
-                hg,
-                'https://bitbucket.org/sfink/mqext',
-                os.path.join(self.ext_dir, 'mqext'),
-                'default',
-                'Ensuring mqext extension is up to date...')
+                    hg,
+                    'https://bitbucket.org/sfink/mqext',
+                    os.path.join(self.ext_dir, 'mqext'),
+                    'default',
+                    'Ensuring mqext extension is up to date...')
                 if self._prompt_yn('Would you like to configure mqext to '
                     'automatically commit changes as you modify patches'):
                     c.autocommit_mq(True)
@@ -305,4 +303,4 @@ class MercurialSetupWizard(object):
             if choice in ('n', 'no'):
                 return False
 
-            print('Must reply with one of {yes, no, y, no}.')
+            print('Must reply with one of {yes, no, y, n}.')