Patchwork [6,of,7] formatter: remove experimental marker from -T option

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 30, 2018, 1:43 p.m.
Message ID <d954a8babb5886ee0331.1538315030@mimosa>
Download mbox | patch
Permalink /patch/35220/
State Superseded
Headers show

Comments

Yuya Nishihara - Sept. 30, 2018, 1:43 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1538290416 -32400
#      Sun Sep 30 15:53:36 2018 +0900
# Node ID d954a8babb5886ee0331265d3994fdcd52983f50
# Parent  6b1a87ee8753534543236e3a64e66e8f0382b5eb
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.
Anton Shestakov - Oct. 1, 2018, 7:43 a.m.
On Sun, 30 Sep 2018 22:43:50 +0900
Yuya Nishihara <yuya@tcha.org> wrote:

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

Even though I'm not a fan of how certain variables are named, I'm
actually excited to see -T/--template on more commands :)

> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -100,7 +100,7 @@ commitopts2 = [
>  # hidden for now

I think this comment refers to the marker and needs to be removed too.

>  formatteropts = [
>      ('T', 'template', '',
> -     _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
> +     _('display with template'), _('TEMPLATE')),
>  ]
Yuya Nishihara - Oct. 1, 2018, 10:56 a.m.
On Mon, 1 Oct 2018 15:43:13 +0800, Anton Shestakov wrote:
> On Sun, 30 Sep 2018 22:43:50 +0900
> Yuya Nishihara <yuya@tcha.org> wrote:
> 
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1538290416 -32400
> > #      Sun Sep 30 15:53:36 2018 +0900
> > # Node ID d954a8babb5886ee0331265d3994fdcd52983f50
> > # Parent  6b1a87ee8753534543236e3a64e66e8f0382b5eb
> > 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.
> 
> Even though I'm not a fan of how certain variables are named, I'm
> actually excited to see -T/--template on more commands :)
> 
> > diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> > --- a/mercurial/cmdutil.py
> > +++ b/mercurial/cmdutil.py
> > @@ -100,7 +100,7 @@ commitopts2 = [
> >  # hidden for now
> 
> I think this comment refers to the marker and needs to be removed too.

Good catch. I'll send V2.

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -100,7 +100,7 @@  commitopts2 = [
 # 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)