Mercurial > hg
comparison hgext/eol.py @ 13624:78cc35e75ecc stable
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 |
comparison
equal
deleted
inserted
replaced
13622:0a8ba9124623 | 13624:78cc35e75ecc |
---|---|
163 ui.setconfig('hooks', 'preupdate.eol', preupdate) | 163 ui.setconfig('hooks', 'preupdate.eol', preupdate) |
164 | 164 |
165 def extsetup(ui): | 165 def extsetup(ui): |
166 try: | 166 try: |
167 extensions.find('win32text') | 167 extensions.find('win32text') |
168 raise util.Abort(_("the eol extension is incompatible with the " | 168 ui.warn(_("the eol extension is incompatible with the " |
169 "win32text extension")) | 169 "win32text extension\n")) |
170 except KeyError: | 170 except KeyError: |
171 pass | 171 pass |
172 | 172 |
173 | 173 |
174 def reposetup(ui, repo): | 174 def reposetup(ui, repo): |