equal
deleted
inserted
replaced
610 """Expand aliases in a tree, aliases is a list of (name, value) tuples""" |
610 """Expand aliases in a tree, aliases is a list of (name, value) tuples""" |
611 aliases = _aliasrules.buildmap(aliases) |
611 aliases = _aliasrules.buildmap(aliases) |
612 tree = _aliasrules.expand(aliases, tree) |
612 tree = _aliasrules.expand(aliases, tree) |
613 # warn about problematic (but not referred) aliases |
613 # warn about problematic (but not referred) aliases |
614 if warn is not None: |
614 if warn is not None: |
615 for name, alias in sorted(pycompat.iteritems(aliases)): |
615 for name, alias in sorted(aliases.items()): |
616 if alias.error and not alias.warned: |
616 if alias.error and not alias.warned: |
617 warn(_(b'warning: %s\n') % (alias.error)) |
617 warn(_(b'warning: %s\n') % (alias.error)) |
618 alias.warned = True |
618 alias.warned = True |
619 return tree |
619 return tree |
620 |
620 |