Mercurial > hg

diff hgext/eol.py @ 13624:78cc35e75ecc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eol: do not abort when win32text is found, only warn The win32text extension does not break eol or vice-versa, so it is not a fatal error to have both of them enabled. It's just folly. So spewing warnings in this condition is preferrable to aborting. When both extensions are enabled, the user now sees: % hg st the eol extension is incompatible with the win32text extension win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension M hgext/eol.py
author Steve Borho <steve@borho.org>
date Sun, 13 Mar 2011 10:03:06 -0500
parents b30a488762e1
children 8aec2516602b
line wrap: on
line diff
--- a/hgext/eol.py	Sun Mar 13 15:59:24 2011 +0100
+++ b/hgext/eol.py	Sun Mar 13 10:03:06 2011 -0500
@@ -165,8 +165,8 @@
 def extsetup(ui):
     try:
         extensions.find('win32text')
-        raise util.Abort(_("the eol extension is incompatible with the "
-                           "win32text extension"))
+        ui.warn(_("the eol extension is incompatible with the "
+                  "win32text extension\n"))
     except KeyError:
         pass