This is an archive of the discontinued Mercurial Phabricator instance.

Differential D804

alias: test duplicated definition earlier
ClosedPublic

Authored by quark on Sep 23 2017, 4:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0e48813cc106: alias: test duplicated definition earlier
Summary

This patch moves the old definition checking logic introduced by
f4b7be3f8430 earlier. So that the test itself does not depend on aliasdef.

The check is to avoid wrapping a same alias multiple times. It can be done
by checking the config name and value (definition in code), without
constructing a cmdalias instance.

This makes the next patch easier to review.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Sep 23 2017, 4:57 PM
quark updated this revision to Diff 2051.Sep 23 2017, 5:41 PM
Closed by commit rHG0e48813cc106: alias: test duplicated definition earlier (authored by quark). · Explain WhySep 25 2017, 11:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (8 lines)

Diff 2063

mercurial/dispatch.py

ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) ui.debug("alias '%s' expands to '%s'\n" % (self.name, args))
raise raise
def addaliases(ui, cmdtable): def addaliases(ui, cmdtable):
# aliases are processed after extensions have been loaded, so they # aliases are processed after extensions have been loaded, so they
# may use extension commands. Aliases can also use other alias definitions, # may use extension commands. Aliases can also use other alias definitions,
# but only if they have been defined prior to the current definition. # but only if they have been defined prior to the current definition.
for alias, definition in ui.configitems('alias'): for alias, definition in ui.configitems('alias'):
source = ui.configsource('alias', alias)
aliasdef = cmdalias(alias, definition, cmdtable, source)
try: try:
olddef = cmdtable[aliasdef.cmd][0] if cmdtable[alias][0].definition == definition:
if olddef.definition == aliasdef.definition:
continue continue
except (KeyError, AttributeError): except (KeyError, AttributeError):
# definition might not exist or it might not be a cmdalias # definition might not exist or it might not be a cmdalias
pass pass
source = ui.configsource('alias', alias)
aliasdef = cmdalias(alias, definition, cmdtable, source)
cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
def _parse(ui, args): def _parse(ui, args):
options = {} options = {}
cmdoptions = {} cmdoptions = {}
try: try:
args = fancyopts.fancyopts(args, commands.globalopts, options) args = fancyopts.fancyopts(args, commands.globalopts, options)