Patchwork color: update docstring for debug option

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date Oct. 3, 2014, 8:19 p.m.
Message ID <9f9ba0dcf5fdcc9978db.1412367595@Iris>
Download mbox | patch
Permalink /patch/6097/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - Oct. 3, 2014, 8:19 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1408916427 14400
#      Sun Aug 24 17:40:27 2014 -0400
# Node ID 9f9ba0dcf5fdcc9978db7fdbd909916f0c35e4a6
# Parent  7b18366b12d6081bc78bb2beb98bdcb71018ef69
color: update docstring for debug option

964dd1c491ca updated the format for the --color=debug option. This
updates the documentation to match this new format.
Augie Fackler - Oct. 7, 2014, 5:14 p.m.
On Fri, Oct 03, 2014 at 04:19:55PM -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1408916427 14400
> #      Sun Aug 24 17:40:27 2014 -0400
> # Node ID 9f9ba0dcf5fdcc9978db7fdbd909916f0c35e4a6
> # Parent  7b18366b12d6081bc78bb2beb98bdcb71018ef69
> color: update docstring for debug option

This was pushed as 60ac52a21512.

>
> 964dd1c491ca updated the format for the --color=debug option. This
> updates the documentation to match this new format.
>
> diff --git a/hgext/color.py b/hgext/color.py
> --- a/hgext/color.py
> +++ b/hgext/color.py
> @@ -28,11 +28,10 @@ effects. This includes the special "none
>  other effects.
>
>  Labels are normally invisible. In order to see these labels and their
> -position in the text, use the global --color=debug option. In case of
> -multiple labels for the same text, the labels will be enclosed by
> -square brackets, e.g.
> +position in the text, use the global --color=debug option. The same
> +anchor text may be associated to multiple labels, e.g.
>
> -  [log.changeset changeset.secret](changeset:   22611:6f0a53c8f587)
> +  [log.changeset changeset.secret|changeset:   22611:6f0a53c8f587]
>
>  The following are the default effects for some default labels. Default
>  effects may be overridden from your configuration file::
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/color.py b/hgext/color.py
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -28,11 +28,10 @@  effects. This includes the special "none
 other effects.
 
 Labels are normally invisible. In order to see these labels and their
-position in the text, use the global --color=debug option. In case of
-multiple labels for the same text, the labels will be enclosed by
-square brackets, e.g.
+position in the text, use the global --color=debug option. The same
+anchor text may be associated to multiple labels, e.g.
 
-  [log.changeset changeset.secret](changeset:   22611:6f0a53c8f587)
+  [log.changeset changeset.secret|changeset:   22611:6f0a53c8f587]
 
 The following are the default effects for some default labels. Default
 effects may be overridden from your configuration file::