Mercurial > hg
comparison hgext/eol.py @ 13625:8aec2516602b
merge with stable
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Sun, 13 Mar 2011 10:09:30 -0500 |
| parents | 9cb1a42cd4b3 78cc35e75ecc |
| children | 328ce8a405ac |
comparison
equal
deleted
inserted
replaced
| 13623:0e217d479c16 | 13625:8aec2516602b |
|---|---|
| 241 ui.setconfig('hooks', 'preupdate.eol', preupdate) | 241 ui.setconfig('hooks', 'preupdate.eol', preupdate) |
| 242 | 242 |
| 243 def extsetup(ui): | 243 def extsetup(ui): |
| 244 try: | 244 try: |
| 245 extensions.find('win32text') | 245 extensions.find('win32text') |
| 246 raise util.Abort(_("the eol extension is incompatible with the " | 246 ui.warn(_("the eol extension is incompatible with the " |
| 247 "win32text extension")) | 247 "win32text extension\n")) |
| 248 except KeyError: | 248 except KeyError: |
| 249 pass | 249 pass |
| 250 | 250 |
| 251 | 251 |
| 252 def reposetup(ui, repo): | 252 def reposetup(ui, repo): |