[PATCH 4 of 5 V2] formatter: remove experimental marker from -T option

Yuya Nishihara yuya at tcha.org
Mon Oct 1 07:15:39 EDT 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1538290416 -32400
#      Sun Sep 30 15:53:36 2018 +0900
# Node ID f61b449768f46663d0df7e48a3c19f3e2174a8de
# Parent  6dae8e405a4addf193cdfbbf71bb9c88d6f2b8dd
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)
 


More information about the Mercurial-devel mailing list