[PATCH v2] show: make template option actually show up in help

Ryan McElroy rm at fb.com
Thu Apr 13 10:45:43 UTC 2017


# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1492078673 25200
#      Thu Apr 13 03:17:53 2017 -0700
# Node ID 7b40e2f960e9b53ce3e9f0ae3a6fe22b4f921297
# Parent  3c77f03f16b386940c60af36d6a3ad83bee37ad4
show: make template option actually show up in help

Previously, the --template/-T option didn't show up in help because it's marked
as experimental. It's not really experimental for show, and its quite important
for show's funcationality, so let's make sure it always shows up.

diff --git a/hgext/show.py b/hgext/show.py
--- a/hgext/show.py
+++ b/hgext/show.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
 from mercurial.i18n import _
 from mercurial import (
     cmdutil,
-    commands,
     error,
     formatter,
     pycompat,
@@ -53,7 +52,14 @@ class showcmdfunc(registrar._funcregistr
 
 showview = showcmdfunc()
 
- at command('show', commands.formatteropts, _('VIEW'))
+ at command('show', [
+    # TODO: Switch this template flag to use commands.formatteropts if
+    # 'hg show' becomes stable before --template/-T is stable. For now,
+    # we are putting it here without the '(EXPERIMENTAL)' flag because it
+    # is an important part of the 'hg show' user experience and the entire
+    # 'hg show' experience is experimental.
+    ('T', 'template', '', ('display with template'), _('TEMPLATE')),
+    ], _('VIEW'))
 def show(ui, repo, view=None, template=None):
     """show various repository information
 
diff --git a/tests/test-show.t b/tests/test-show.t
--- a/tests/test-show.t
+++ b/tests/test-show.t
@@ -43,6 +43,8 @@ No arguments shows available views
   
   options:
   
+   -T --template TEMPLATE display with template
+  
   (some details hidden, use --verbose to show complete help)
 
 Unknown view prints error


More information about the Mercurial-devel mailing list