Patchwork log: document the characters ---graph uses to draw

login
register
mail settings
Submitter via Mercurial-devel
Date April 25, 2017, 10:53 p.m.
Message ID <4fe35e47405aee3f61da.1493160832@matvore-linux.svl.corp.google.com>
Download mbox | patch
Permalink /patch/20297/
State Changes Requested
Headers show

Comments

via Mercurial-devel - April 25, 2017, 10:53 p.m.
# HG changeset patch
# User Matt DeVore <matvore@google.com>
# Date 1492552292 25200
#      Tue Apr 18 14:51:32 2017 -0700
# Node ID 4fe35e47405aee3f61da848a06bef4dc05287ffb
# Parent  ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd
log: document the characters ---graph uses to draw

The meaning of : vs | was undocumented and non-obvious.
Sean Farley - April 26, 2017, 5:36 a.m.
Matt DeVore via Mercurial-devel <mercurial-devel@mercurial-scm.org>
writes:

> # HG changeset patch
> # User Matt DeVore <matvore@google.com>
> # Date 1492552292 25200
> #      Tue Apr 18 14:51:32 2017 -0700
> # Node ID 4fe35e47405aee3f61da848a06bef4dc05287ffb
> # Parent  ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd
> log: document the characters ---graph uses to draw
>
> The meaning of : vs | was undocumented and non-obvious.
>
> diff -r ed42e00a5c4e -r 4fe35e47405a mercurial/commands.py
> --- a/mercurial/commands.py	Thu Apr 13 22:31:17 2017 +0900
> +++ b/mercurial/commands.py	Tue Apr 18 14:51:32 2017 -0700
> @@ -3334,6 +3334,8 @@
>      '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.
> +    Paths in the DAG are represented with '|', '/' and so forth. ':' in place
> +    of a '|' indicates one or more revisions in a path are omitted.

This would change the help, so I think you'd need another version that
updates the output. I'm not sure ':' is out of experimental? Though, it
would be nice to have help text augmented if graphstyle.granparent is
set. [corrected below]

Actually, I just checked and this made it to core in d7af9b4ae7dd. Do we
no longer need graphstyle.grandparent and graphstyle.missing in
[experimental]?
Augie Fackler - April 27, 2017, 2:45 p.m.
On Tue, Apr 25, 2017 at 10:36:10PM -0700, Sean Farley wrote:
> Matt DeVore via Mercurial-devel <mercurial-devel@mercurial-scm.org>
> writes:
>
> > # HG changeset patch
> > # User Matt DeVore <matvore@google.com>
> > # Date 1492552292 25200
> > #      Tue Apr 18 14:51:32 2017 -0700
> > # Node ID 4fe35e47405aee3f61da848a06bef4dc05287ffb
> > # Parent  ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd
> > log: document the characters ---graph uses to draw
> >
> > The meaning of : vs | was undocumented and non-obvious.
> >
> > diff -r ed42e00a5c4e -r 4fe35e47405a mercurial/commands.py
> > --- a/mercurial/commands.py	Thu Apr 13 22:31:17 2017 +0900
> > +++ b/mercurial/commands.py	Tue Apr 18 14:51:32 2017 -0700
> > @@ -3334,6 +3334,8 @@
> >      '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.
> > +    Paths in the DAG are represented with '|', '/' and so forth. ':' in place
> > +    of a '|' indicates one or more revisions in a path are omitted.
>
> This would change the help, so I think you'd need another version that
> updates the output. I'm not sure ':' is out of experimental? Though, it
> would be nice to have help text augmented if graphstyle.granparent is
> set. [corrected below]
>
> Actually, I just checked and this made it to core in d7af9b4ae7dd. Do we
> no longer need graphstyle.grandparent and graphstyle.missing in
> [experimental]?

Queued, thanks. Sean, can you make a note somewhere to look at
cleaning up the experimental graph style knobs if that's the right
thing to do?




> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Sean Farley - April 27, 2017, 5:52 p.m.
Augie Fackler <raf@durin42.com> writes:

> On Tue, Apr 25, 2017 at 10:36:10PM -0700, Sean Farley wrote:
>> Matt DeVore via Mercurial-devel <mercurial-devel@mercurial-scm.org>
>> writes:
>>
>> > # HG changeset patch
>> > # User Matt DeVore <matvore@google.com>
>> > # Date 1492552292 25200
>> > #      Tue Apr 18 14:51:32 2017 -0700
>> > # Node ID 4fe35e47405aee3f61da848a06bef4dc05287ffb
>> > # Parent  ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd
>> > log: document the characters ---graph uses to draw
>> >
>> > The meaning of : vs | was undocumented and non-obvious.
>> >
>> > diff -r ed42e00a5c4e -r 4fe35e47405a mercurial/commands.py
>> > --- a/mercurial/commands.py	Thu Apr 13 22:31:17 2017 +0900
>> > +++ b/mercurial/commands.py	Tue Apr 18 14:51:32 2017 -0700
>> > @@ -3334,6 +3334,8 @@
>> >      '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.
>> > +    Paths in the DAG are represented with '|', '/' and so forth. ':' in place
>> > +    of a '|' indicates one or more revisions in a path are omitted.
>>
>> This would change the help, so I think you'd need another version that
>> updates the output. I'm not sure ':' is out of experimental? Though, it
>> would be nice to have help text augmented if graphstyle.granparent is
>> set. [corrected below]
>>
>> Actually, I just checked and this made it to core in d7af9b4ae7dd. Do we
>> no longer need graphstyle.grandparent and graphstyle.missing in
>> [experimental]?
>
> Queued, thanks. Sean, can you make a note somewhere to look at
> cleaning up the experimental graph style knobs if that's the right
> thing to do?

Sure. Maybe we can (with the new config stuff?) have a developer warning
when unused config options are present? Though, I'm not sure how to
implement that off the top of my head.

Patch

diff -r ed42e00a5c4e -r 4fe35e47405a mercurial/commands.py
--- a/mercurial/commands.py	Thu Apr 13 22:31:17 2017 +0900
+++ b/mercurial/commands.py	Tue Apr 18 14:51:32 2017 -0700
@@ -3334,6 +3334,8 @@ 
     '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.
+    Paths in the DAG are represented with '|', '/' and so forth. ':' in place
+    of a '|' indicates one or more revisions in a path are omitted.
 
     .. note::