diff -r f53c549237ca -r e0eae93e6c67 mercurial/dispatch.py --- a/mercurial/dispatch.py Wed Oct 21 13:40:55 2009 +0200 +++ b/mercurial/dispatch.py Wed Oct 28 23:55:23 2009 +0900 @@ -358,17 +358,7 @@ extensions.loadall(lui) exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] - # (uisetup is handled in extensions.loadall) - - for name, module in exts: - extsetup = getattr(module, 'extsetup', None) - if extsetup: - try: - extsetup(ui) - except TypeError: - if extsetup.func_code.co_argcount != 0: - raise - extsetup() # old extsetup with no ui argument + # (uisetup and extsetup are handled in extensions.loadall) for name, module in exts: cmdtable = getattr(module, 'cmdtable', {})