[PATCH 3 of 5] show: standarize abort output with help output

[Gregory Szorc]

On Mon, Apr 10, 2017 at 2:41 AM, Ryan McElroy <rm at fb.com> wrote:

> # HG changeset patch
> # User Ryan McElroy <rmcelroy at fb.com>
> # Date 1491585973 25200
> #      Fri Apr 07 10:26:13 2017 -0700
> # Node ID ee1bd54bfda1dd1aea0f9b2397ddeae42d58c54a
> # Parent  9397e5834ce19a95fbc6a6bb1cf099ec3c00f8f3
> show: standarize abort output with help output
>

I just saw this patch and realized I just sent another patch that
conflicts. Sorry about that.

I didn't give much thought to the formatting of help output for `hg show`
when I implemented it. I wanted to focus on more pressing matters (like
getting *something* landed). The block at the bottom of show.py adjusting
__doc__ in cmdtable is super hacky. And I support any improvement to it.


>
> diff --git a/hgext/show.py b/hgext/show.py
> --- a/hgext/show.py
> +++ b/hgext/show.py
> @@ -131,5 +131,5 @@ def showbookmarks(ui, repo, fm):
>  # TODO make this more robust.
>  longest = max(map(len, showview._table.keys()))
>  for key in sorted(showview._table.keys()):
> -    cmdtable['show'][0].__doc__ += ' %s   %s\n' % (
> +    cmdtable['show'][0].__doc__ += (showview._docformat + '\n') % (
>          key.ljust(longest), showview._table[key]._origdoc)
> diff --git a/tests/test-show.t b/tests/test-show.t
> --- a/tests/test-show.t
> +++ b/tests/test-show.t
> @@ -37,7 +37,7 @@ No arguments shows available views
>
>        Available views:
>
> -       bookmarks   bookmarks and their associated changeset
> +      bookmarks -- bookmarks and their associated changeset
>
>    (use 'hg help -e show' to show help for the show extension)
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170412/3ab5f002/attachment.html>