Mercurial > hg

changeset 7497:f598df061fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Tue, 09 Dec 2008 17:02:52 -0800
parents 90487273f59c (current diff) 0a27d0db256d (diff)
children 732c54abd592
files mercurial/ui.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py	Wed Dec 10 00:29:10 2008 +0100
+++ b/mercurial/ui.py	Tue Dec 09 17:02:52 2008 -0800
@@ -407,7 +407,8 @@
                 import readline
                 # force demandimport to really load the module
                 readline.read_history_file
-            except ImportError:
+                # windows sometimes raises something other than ImportError
+            except Exception:
                 pass
         line = raw_input(prompt)
         # When stdin is in binary mode on Windows, it can cause