<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Apr 10, 2017 at 2:41 AM, Ryan McElroy <span dir="ltr"><<a href="mailto:rm@fb.com" target="_blank">rm@fb.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Ryan McElroy <<a href="mailto:rmcelroy@fb.com">rmcelroy@fb.com</a>><br>
# Date 1491585973 25200<br>
# Fri Apr 07 10:26:13 2017 -0700<br>
# Node ID ee1bd54bfda1dd1aea0f9b2397ddea<wbr>e42d58c54a<br>
# Parent 9397e5834ce19a95fbc6a6bb1cf099<wbr>ec3c00f8f3<br>
show: standarize abort output with help output<br></blockquote><div><br></div><div>I just saw this patch and realized I just sent another patch that conflicts. Sorry about that.</div><div><br></div><div>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.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff --git a/hgext/show.py b/hgext/show.py<br>
--- a/hgext/show.py<br>
+++ b/hgext/show.py<br>
@@ -131,5 +131,5 @@ def showbookmarks(ui, repo, fm):<br>
# TODO make this more robust.<br>
longest = max(map(len, showview._table.keys()))<br>
for key in sorted(showview._table.keys())<wbr>:<br>
- cmdtable['show'][0].__doc__ += ' %s %s\n' % (<br>
+ cmdtable['show'][0].__doc__ += (showview._docformat + '\n') % (<br>
key.ljust(longest), showview._table[key]._origdoc)<br>
diff --git a/tests/test-show.t b/tests/test-show.t<br>
--- a/tests/test-show.t<br>
+++ b/tests/test-show.t<br>
@@ -37,7 +37,7 @@ No arguments shows available views<br>
<br>
Available views:<br>
<br>
- bookmarks bookmarks and their associated changeset<br>
+ bookmarks -- bookmarks and their associated changeset<br>
<br>
(use 'hg help -e show' to show help for the show extension)<br>
<br>
______________________________<wbr>_________________<br>
Mercurial-devel mailing list<br>
<a href="mailto:Mercurial-devel@mercurial-scm.org">Mercurial-devel@mercurial-scm.<wbr>org</a><br>
<a href="https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel" rel="noreferrer" target="_blank">https://www.mercurial-scm.org/<wbr>mailman/listinfo/mercurial-<wbr>devel</a><br>
</blockquote></div><br></div></div>