Mercurial > public > mercurial-scm > hg
comparison mercurial/extensions.py @ 21229:54d7657d7d1e stable
setup.py, make: avoid problems with outdated, existing hgext/__index__.py*
"make clean" already removed __index__.py[cdo], but not the __index__.py
(automatically generated by "python setup.py build_hgextindex").
"setup.py build_hgextindex" did not generate a new index if file
__index__.py[cdo] already existed, because if __index__.py was removed,
the compiled file containing the old information was imported and used.
Generate an empty file (with a new timestamp to generate a new .py[cdo])
instead and make mercurial.extensions ignore the unset docs attribute.
One of the problems was a failed test-help.t, to reproduce:
$ rm hgext/__index__.py*
$ echo 'docs = {"mq": "dummy"}' > hgext/__index__.py
$ make test-help.t
With this a "make clean" or "python setup.py build_hgextindex" helps.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 05 May 2014 16:54:15 +0200 |
| parents | 7d83c3b6e8d9 |
| children | 711498bb4ff5 |
comparison
equal
deleted
inserted
replaced
| 21227:75aaae8ad660 | 21229:54d7657d7d1e |
|---|---|
| 279 try: | 279 try: |
| 280 from hgext import __index__ | 280 from hgext import __index__ |
| 281 return dict((name, gettext(desc)) | 281 return dict((name, gettext(desc)) |
| 282 for name, desc in __index__.docs.iteritems() | 282 for name, desc in __index__.docs.iteritems() |
| 283 if name not in _order) | 283 if name not in _order) |
| 284 except ImportError: | 284 except (ImportError, AttributeError): |
| 285 pass | 285 pass |
| 286 | 286 |
| 287 paths = _disabledpaths() | 287 paths = _disabledpaths() |
| 288 if not paths: | 288 if not paths: |
| 289 return {} | 289 return {} |
| 302 from hgext import __index__ | 302 from hgext import __index__ |
| 303 if name in _order: # enabled | 303 if name in _order: # enabled |
| 304 return | 304 return |
| 305 else: | 305 else: |
| 306 return gettext(__index__.docs.get(name)) | 306 return gettext(__index__.docs.get(name)) |
| 307 except ImportError: | 307 except (ImportError, AttributeError): |
| 308 pass | 308 pass |
| 309 | 309 |
| 310 paths = _disabledpaths() | 310 paths = _disabledpaths() |
| 311 if name in paths: | 311 if name in paths: |
| 312 return _disabledhelp(paths[name]) | 312 return _disabledhelp(paths[name]) |