Mercurial > hg > hgforest
changeset 55:146cb75364c0
Make findcmd compatible with 18a9fbb5cd78
Consistently use try blocks for backwards compatibility.
Rename findcmd to _findcmd internally.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Sat, 18 Aug 2007 10:17:17 +0200 |
| parents | ccfac5e72669 |
| children | 8648e7ba97e8 |
| files | forest.py |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/forest.py Mon Jul 16 11:44:42 2007 -0400 +++ b/forest.py Sat Aug 18 10:17:17 2007 +0200 @@ -51,10 +51,11 @@ from mercurial import commands, hg, node, util from mercurial import localrepo, sshrepo, sshserver, httprepo, statichttprepo from mercurial.hgweb import hgweb_mod -if not hasattr(commands, "findcmd"): - from mercurial.cmdutil import findcmd -else: - findcmd = commands.findcmd +try: + _findcmd = commands.findcmd +except AttributeError: + from mercurial import cmdutil + _findcmd = cmdutil.findcmd from mercurial.i18n import gettext as _ from mercurial.repo import RepoError @@ -64,7 +65,10 @@ def cmd_options(ui, cmd, remove=None): - aliases, spec = findcmd(ui, cmd) + try: + aliases, spec = _findcmd(ui, cmd, commands.table) + except TypeError: + aliases, spec = _findcmd(ui, cmd) res = list(spec[1]) if remove is not None: res = [opt for opt in res if opt[0] not in remove]