[PATCH 2 of 5 paths v3] commands.paths: use ui.paths to show paths

[Gregory Szorc]

On Sun, Mar 8, 2015 at 12:54 PM, Gregory Szorc <gregory.szorc at gmail.com>
wrote:

> # HG changeset patch
> # User Gregory Szorc <gregory.szorc at gmail.com>
> # Date 1423342170 28800
> #      Sat Feb 07 12:49:30 2015 -0800
> # Node ID 57681bad997779da88778ff95254951c89250441
> # Parent  7df546527053a134d03777d89e8c98ec75edaf6f
> commands.paths: use ui.paths to show paths
>
> We now have an API for representing a collection of paths. Use it.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4825,21 +4825,22 @@ def paths(ui, repo, search=None):
>
>      Returns 0 on success.
>      """
>      if search:
> -        for name, path in ui.configitems("paths"):
> +        for name, path in sorted(ui.paths.iteritems()):
>              if name == search:
> -                ui.status("%s\n" % util.hidepassword(path))
> +                ui.status("%s\n" % util.hidepassword(path.loc))
>                  return
>          if not ui.quiet:
>              ui.warn(_("not found!\n"))
>          return 1
>      else:
> -        for name, path in ui.configitems("paths"):
> +        for name, path in sorted(ui.paths.iteritems()):
>              if ui.quiet:
>                  ui.write("%s\n" % name)
>              else:
> -                ui.write("%s = %s\n" % (name, util.hidepassword(path)))
> +                ui.write("%s = %s\n" % (name,
> +                                        util.hidepassword(path.loc)))
>
>  @command('phase',
>      [('p', 'public', False, _('set changeset phase to public')),
>       ('d', 'draft', False, _('set changeset phase to draft')),
>

For the record, I'm not a huge fan of the sorted() here. I'm half tempted
to throw an __iter__ on paths (like how it was done in v2). v3's paths
inherits from dict, which is why the custom __iter__ went away.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150308/3d2673e0/attachment.html>