Show More
@@ -1,3 +1,4 b'' | |||||
|
1 | # name space package to host third party extensions | |||
1 | from __future__ import absolute_import |
|
2 | from __future__ import absolute_import | |
2 | import pkgutil |
|
3 | import pkgutil | |
3 | __path__ = pkgutil.extend_path(__path__, __name__) |
|
4 | __path__ = pkgutil.extend_path(__path__, __name__) |
@@ -105,7 +105,11 b' def load(ui, name, path):' | |||||
105 | mod = _importh("hgext.%s" % name) |
|
105 | mod = _importh("hgext.%s" % name) | |
106 | except ImportError as err: |
|
106 | except ImportError as err: | |
107 | _reportimporterror(ui, err, "hgext.%s" % name, name) |
|
107 | _reportimporterror(ui, err, "hgext.%s" % name, name) | |
108 | mod = _importh(name) |
|
108 | try: | |
|
109 | mod = _importh("hgext3rd.%s" % name) | |||
|
110 | except ImportError as err: | |||
|
111 | _reportimporterror(ui, err, "hgext3rd.%s" % name, name) | |||
|
112 | mod = _importh(name) | |||
109 |
|
113 | |||
110 | # Before we do anything with the extension, check against minimum stated |
|
114 | # Before we do anything with the extension, check against minimum stated | |
111 | # compatibility. This gives extension authors a mechanism to have their |
|
115 | # compatibility. This gives extension authors a mechanism to have their |
@@ -506,7 +506,7 b" cmdclass = {'build': hgbuild," | |||||
506 | packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient', |
|
506 | packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient', | |
507 | 'mercurial.pure', |
|
507 | 'mercurial.pure', | |
508 | 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf', |
|
508 | 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf', | |
509 | 'hgext.largefiles'] |
|
509 | 'hgext.largefiles', 'hgext3rd'] | |
510 |
|
510 | |||
511 | common_depends = ['mercurial/util.h'] |
|
511 | common_depends = ['mercurial/util.h'] | |
512 |
|
512 |
@@ -56,6 +56,9 b' show traceback for ImportError of hgext.' | |||||
56 | could not import hgext.badext2 (No module named *badext2): trying badext2 (glob) |
|
56 | could not import hgext.badext2 (No module named *badext2): trying badext2 (glob) | |
57 | Traceback (most recent call last): |
|
57 | Traceback (most recent call last): | |
58 | ImportError: No module named *badext2 (glob) |
|
58 | ImportError: No module named *badext2 (glob) | |
|
59 | could not import hgext3rd.badext2 (No module named badext2): trying badext2 | |||
|
60 | Traceback (most recent call last): | |||
|
61 | ImportError: No module named badext2 | |||
59 | *** failed to import extension badext2: No module named badext2 |
|
62 | *** failed to import extension badext2: No module named badext2 | |
60 | Traceback (most recent call last): |
|
63 | Traceback (most recent call last): | |
61 | ImportError: No module named badext2 |
|
64 | ImportError: No module named badext2 |
General Comments 0
You need to be logged in to leave comments.
Login now