# HG changeset patch # User Yuya Nishihara # Date 2018-09-30 06:53:36 # Node ID 0d703063d0c867ac35f71259cc16de033b5bed0c # Parent 66df1059b7c067403bc76ec27d79b8f7d33e2792 formatter: remove experimental marker from -T option I think it's good enough to stabilize the feature, at least for the core and non-experimental commands. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -97,10 +97,9 @@ commitopts2 = [ _('record the specified user as committer'), _('USER')), ] -# hidden for now formatteropts = [ ('T', 'template', '', - _('display with template (EXPERIMENTAL)'), _('TEMPLATE')), + _('display with template'), _('TEMPLATE')), ] templateopts = [ diff --git a/tests/test-alias.t b/tests/test-alias.t --- a/tests/test-alias.t +++ b/tests/test-alias.t @@ -194,6 +194,7 @@ help -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -S --subrepos recurse into subrepositories + -T --template TEMPLATE display with template (some details hidden, use --verbose to show complete help) diff --git a/tests/test-dispatch.t b/tests/test-dispatch.t --- a/tests/test-dispatch.t +++ b/tests/test-dispatch.t @@ -26,6 +26,7 @@ Missing arg: --decode apply any matching decode filter -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns + -T --template TEMPLATE display with template (use 'hg cat -h' to show more help) [255] diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -604,6 +604,8 @@ hide outer repo options: + -T --template TEMPLATE display with template + (some details hidden, use --verbose to show complete help) @@ -614,7 +616,7 @@ hide outer repo options: - -T --template TEMPLATE display with template (EXPERIMENTAL) + -T --template TEMPLATE display with template global options ([+] can be repeated): @@ -653,7 +655,7 @@ hide outer repo options: - -T --template TEMPLATE display with template (EXPERIMENTAL) + -T --template TEMPLATE display with template global options ([+] can be repeated): diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -637,6 +637,7 @@ Test command without options -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -S --subrepos recurse into subrepositories + -T --template TEMPLATE display with template (some details hidden, use --verbose to show complete help)