Patchwork [STABLE] help: use --template to specify existing style

login
register
mail settings
Submitter Yuya Nishihara
Date July 21, 2014, 3:21 a.m.
Message ID <252f92d5119fcb44bb26.1405912919@mimosa>
Download mbox | patch
Permalink /patch/5187/
State Accepted
Commit 8534e670f4ee3c598b1b0ad4037fcda9647f744a
Headers show

Comments

Yuya Nishihara - July 21, 2014, 3:21 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1405910660 -32400
#      Mon Jul 21 11:44:20 2014 +0900
# Branch stable
# Node ID 252f92d5119fcb44bb26b62e166bb6971ba02c21
# Parent  c67868cfe14f8b48584716f6431e0068c57ad03c
help: use --template to specify existing style

--style is deprecated since 3a35ba2681ec and 870d60294b04.
Matt Mackall - July 21, 2014, 9:15 p.m.
On Mon, 2014-07-21 at 12:21 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1405910660 -32400
> #      Mon Jul 21 11:44:20 2014 +0900
> # Branch stable
> # Node ID 252f92d5119fcb44bb26b62e166bb6971ba02c21
> # Parent  c67868cfe14f8b48584716f6431e0068c57ad03c
> help: use --template to specify existing style
> 
> --style is deprecated since 3a35ba2681ec and 870d60294b04.

Good spotting, queued for stable.

Patch

diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
--- a/mercurial/help/templates.txt
+++ b/mercurial/help/templates.txt
@@ -1,7 +1,6 @@ 
 Mercurial allows you to customize output of commands through
-templates. You can either pass in a template from the command
-line, via the --template option, or select an existing
-template-style (--style).
+templates. You can either pass in a template or select an existing
+template-style from the command line, via the --template option.
 
 You can customize output for any "log-like" command: log,
 outgoing, incoming, tip, parents, heads and glog.
@@ -11,7 +10,7 @@  when no explicit preference is passed), 
 and xml.
 Usage::
 
-    $ hg log -r1 --style changelog
+    $ hg log -r1 --template changelog
 
 A template is a piece of text, with markup to invoke variable
 expansion::