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

login
register
mail settings
Submitter Yuya Nishihara
Date Oct. 1, 2018, 11:15 a.m.
Message ID <f61b449768f46663d0df.1538392539@mimosa>
Download mbox | patch
Permalink /patch/35237/
State New
Headers show

Comments

Yuya Nishihara - Oct. 1, 2018, 11:15 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@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.
Augie Fackler - Oct. 1, 2018, 1:59 p.m.
On Mon, Oct 01, 2018 at 08:15:39PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@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

WOOOHOOOOOOO

Thanks for pouring so much work into this over time.

>
> 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)
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

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)