Show More
@@ -22,6 +22,7 b' from . import (' | |||||
22 | ) |
|
22 | ) | |
23 |
|
23 | |||
24 | _extensions = {} |
|
24 | _extensions = {} | |
|
25 | _disabledextensions = {} | |||
25 | _aftercallbacks = {} |
|
26 | _aftercallbacks = {} | |
26 | _order = [] |
|
27 | _order = [] | |
27 | _builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'progress', 'interhg', |
|
28 | _builtin = set(['hbisect', 'bookmarks', 'parentrevspec', 'progress', 'interhg', | |
@@ -148,6 +149,7 b' def loadall(ui):' | |||||
148 | for (name, path) in result: |
|
149 | for (name, path) in result: | |
149 | if path: |
|
150 | if path: | |
150 | if path[0] == '!': |
|
151 | if path[0] == '!': | |
|
152 | _disabledextensions[name] = path[1:] | |||
151 | continue |
|
153 | continue | |
152 | try: |
|
154 | try: | |
153 | load(ui, name, path) |
|
155 | load(ui, name, path) | |
@@ -370,6 +372,7 b' def _disabledpaths(strip_init=False):' | |||||
370 | if name in exts or name in _order or name == '__init__': |
|
372 | if name in exts or name in _order or name == '__init__': | |
371 | continue |
|
373 | continue | |
372 | exts[name] = path |
|
374 | exts[name] = path | |
|
375 | exts.update(_disabledextensions) | |||
373 | return exts |
|
376 | return exts | |
374 |
|
377 | |||
375 | def _moduledoc(file): |
|
378 | def _moduledoc(file): |
@@ -1624,6 +1624,17 b' such str.lower().' | |||||
1624 | > ambiguous = ! |
|
1624 | > ambiguous = ! | |
1625 | > EOF |
|
1625 | > EOF | |
1626 |
|
1626 | |||
|
1627 | Show help content of disabled extensions | |||
|
1628 | ||||
|
1629 | $ cat >> $HGRCPATH <<EOF | |||
|
1630 | > [extensions] | |||
|
1631 | > ambiguous = !./ambiguous.py | |||
|
1632 | > EOF | |||
|
1633 | $ hg help -e ambiguous | |||
|
1634 | ambiguous extension - (no help text available) | |||
|
1635 | ||||
|
1636 | (use "hg help extensions" for information on enabling extensions) | |||
|
1637 | ||||
1627 | Test dynamic list of merge tools only shows up once |
|
1638 | Test dynamic list of merge tools only shows up once | |
1628 | $ hg help merge-tools |
|
1639 | $ hg help merge-tools | |
1629 | Merge Tools |
|
1640 | Merge Tools |
General Comments 0
You need to be logged in to leave comments.
Login now