Mercurial > hg

changeset 10244:c4c0502be198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 13 Jan 2010 12:00:06 +0100
parents 4b2a086bee31 (current diff) cd3e5c47d663 (diff)
children 207b94f6b65d
files mercurial/ui.py
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/demandimport.py	Tue Jan 12 22:20:21 2010 +0100
+++ b/mercurial/demandimport.py	Wed Jan 13 12:00:06 2010 +0100
@@ -120,6 +120,7 @@
     '_xmlplus',
     'fcntl',
     'win32com.gen_py',
+    '_winreg', # 2.7 mimetypes needs immediate ImportError
     'pythoncom',
     # imported by tarfile, not available under Windows
     'pwd',
--- a/mercurial/ui.py	Tue Jan 12 22:20:21 2010 +0100
+++ b/mercurial/ui.py	Wed Jan 13 12:00:06 2010 +0100
@@ -134,6 +134,8 @@
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
+        if isinstance(v, bool):
+            return v
         if v.lower() not in _booleans:
             raise error.ConfigError(_("%s.%s not a boolean ('%s')")
                                     % (section, name, v))