Patchwork [STABLE] graphlog: document what "_" and "*" mean

login
register
mail settings
Submitter Anton Shestakov
Date Feb. 22, 2018, 7:34 a.m.
Message ID <a1b8de1983b1c5421f7c.1519284843@neuro>
Download mbox | patch
Permalink /patch/28248/
State Accepted
Headers show

Comments

Anton Shestakov - Feb. 22, 2018, 7:34 a.m.
# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1519283924 -28800
#      Thu Feb 22 15:18:44 2018 +0800
# Branch stable
# Node ID a1b8de1983b1c5421f7c7195e01b20df5306500a
# Parent  c19e66dacaa184feba31136c18a369ba995ddfe4
graphlog: document what "_" and "*" mean

Documenting "*" should've been a part of 9b3f95d9783d, but I somehow didn't
notice that the symbols are explained in the command's help text.
Boris FELD - Feb. 22, 2018, 8:20 a.m.
LGTM


On 22/02/2018 08:34, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1519283924 -28800
> #      Thu Feb 22 15:18:44 2018 +0800
> # Branch stable
> # Node ID a1b8de1983b1c5421f7c7195e01b20df5306500a
> # Parent  c19e66dacaa184feba31136c18a369ba995ddfe4
> graphlog: document what "_" and "*" mean
>
> Documenting "*" should've been a part of 9b3f95d9783d, but I somehow didn't
> notice that the symbols are explained in the command's help text.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -3301,9 +3301,10 @@ def log(ui, repo, *pats, **opts):
>   
>       With --graph the revisions are shown as an ASCII art DAG with the most
>       recent changeset at the top.
> -    'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
> -    and '+' represents a fork where the changeset from the lines below is a
> -    parent of the 'o' merge on the same line.
> +    'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
> +    'x' is obsolete, '*' is unstable, and '+' represents a fork where the
> +    changeset from the lines below is a parent of the 'o' merge on the same
> +    line.
>       Paths in the DAG are represented with '|', '/' and so forth. ':' in place
>       of a '|' indicates one or more revisions in a path are omitted.
>   
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - Feb. 22, 2018, 11:52 a.m.
On Thu, 22 Feb 2018 15:34:03 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1519283924 -28800
> #      Thu Feb 22 15:18:44 2018 +0800
> # Branch stable
> # Node ID a1b8de1983b1c5421f7c7195e01b20df5306500a
> # Parent  c19e66dacaa184feba31136c18a369ba995ddfe4
> graphlog: document what "_" and "*" mean

Queued for stable, thanks.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3301,9 +3301,10 @@  def log(ui, repo, *pats, **opts):
 
     With --graph the revisions are shown as an ASCII art DAG with the most
     recent changeset at the top.
-    'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
-    and '+' represents a fork where the changeset from the lines below is a
-    parent of the 'o' merge on the same line.
+    'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
+    'x' is obsolete, '*' is unstable, and '+' represents a fork where the
+    changeset from the lines below is a parent of the 'o' merge on the same
+    line.
     Paths in the DAG are represented with '|', '/' and so forth. ':' in place
     of a '|' indicates one or more revisions in a path are omitted.