Mercurial > hg-stable
changeset 21246:29eeaa6d662f
extdiff: declare command using decorator
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 04 May 2014 21:54:01 -0700 |
parents | 75c8720092ba |
children | b1e64c6720d8 |
files | hgext/extdiff.py |
diffstat | 1 files changed, 12 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/extdiff.py Sun May 04 21:46:24 2014 -0700 +++ b/hgext/extdiff.py Sun May 04 21:54:01 2014 -0700 @@ -63,9 +63,11 @@ from mercurial.i18n import _ from mercurial.node import short, nullid -from mercurial import scmutil, scmutil, util, commands, encoding +from mercurial import cmdutil, scmutil, scmutil, util, commands, encoding import os, shlex, shutil, tempfile, re +cmdtable = {} +command = cmdutil.command(cmdtable) testedwith = 'internal' def snapshot(ui, repo, files, node, tmproot): @@ -238,6 +240,15 @@ ui.note(_('cleaning up temp directory\n')) shutil.rmtree(tmproot) +@command('extdiff', + [('p', 'program', '', + _('comparison program to run'), _('CMD')), + ('o', 'option', [], + _('pass option to comparison program'), _('OPT')), + ('r', 'rev', [], _('revision'), _('REV')), + ('c', 'change', '', _('change made by revision'), _('REV')), + ] + commands.walkopts, + _('hg extdiff [OPT]... [FILE]...')) def extdiff(ui, repo, *pats, **opts): '''use external program to diff repository (or selected files) @@ -262,21 +273,6 @@ option = option or ['-Npru'] return dodiff(ui, repo, program, option, pats, opts) -cmdtable = { - "extdiff": - (extdiff, - [('p', 'program', '', - _('comparison program to run'), _('CMD')), - ('o', 'option', [], - _('pass option to comparison program'), _('OPT')), - ('r', 'rev', [], - _('revision'), _('REV')), - ('c', 'change', '', - _('change made by revision'), _('REV')), - ] + commands.walkopts, - _('hg extdiff [OPT]... [FILE]...')), - } - def uisetup(ui): for cmd, path in ui.configitems('extdiff'): if cmd.startswith('cmd.'):