Patchwork annotate: mention that -n is suppressed in help

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 18, 2015, 5:40 p.m.
Message ID <c4f36622b387b5c4b23e.1450460449@waste.org>
Download mbox | patch
Permalink /patch/12158/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 18, 2015, 5:40 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450364174 0
#      Thu Dec 17 14:56:14 2015 +0000
# Node ID c4f36622b387b5c4b23e77398bcc366c1f8dcc2b
# Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
annotate: mention that -n is suppressed in help
Augie Fackler - Dec. 18, 2015, 5:51 p.m.
On Fri, Dec 18, 2015 at 11:40:49AM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450364174 0
> #      Thu Dec 17 14:56:14 2015 +0000
> # Node ID c4f36622b387b5c4b23e77398bcc366c1f8dcc2b
> # Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
> annotate: mention that -n is suppressed in help

Queued, thanks.

>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -329,6 +329,9 @@
>      This command is useful for discovering when a change was made and
>      by whom.
>
> +    If you include --file, --user, or --date, the revision number is
> +    suppressed unless you also include --number.
> +
>      Without the -a/--text option, annotate will avoid processing files
>      it detects as binary. With -a, annotate will annotate the file
>      anyway, although the results will probably be neither useful
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -329,6 +329,9 @@ 
     This command is useful for discovering when a change was made and
     by whom.
 
+    If you include --file, --user, or --date, the revision number is
+    suppressed unless you also include --number.
+
     Without the -a/--text option, annotate will avoid processing files
     it detects as binary. With -a, annotate will annotate the file
     anyway, although the results will probably be neither useful