This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5112

graphmod: remove support for graph lines mixing parent/grandparent styles (BC)
ClosedPublic

Authored by spectral on Oct 16 2018, 8:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG264a2cbb25d0: graphmod: remove support for graph lines mixing parent/grandparent styles (BC)
rHG2e97640c598e: graphmod: remove support for graph lines mixing parent/grandparent styles (BC)
Summary

Currently, if the configuration for a graph edge draw style has multiple bytes
(at least on python2), it is interpreted as "this is a request to draw the line
partially in the style of the parent, partially in the style of the
grandparent". This precludes the configuration handling unicode characters
(which trigger the len > 1 check, at least on python2), and I believe was part
of the reason that beautifygraph was written the way it was.

Talking with the person who implemented this, it appears to have been to achieve
feature parity with the rendering of the smartlog extension. I suspect that this
isn't actually used outside of that situation, so I think that we can remove it
without much issue.

This will make it so that multi-character edges are possible, and render any
existing configuration that uses this feature with these multiple characters.
This is *not* going to adjust the width of everything to make it line up
correctly, please see the test that's being modified in this changeset for an
example of how the previous configuration now renders.

Note also that the previous configuration seems to have been broken, or at least
it was behaving in a really non-obvious way - it was avoiding the grandparent
character(s) when it should have been displaying them! This is why so many "!"
characters changed to "3."; I don't know if this was intentional.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Oct 16 2018, 8:41 AM
martinvonz added a subscriber: martinvonz.May 10 2019, 12:46 PM

This makes sense to me. Do you still want this queued?

tests/test-glog.t
3147–3149

I'm not sure it's worth keeping this test.

Closed by commit rHG2e97640c598e: graphmod: remove support for graph lines mixing parent/grandparent styles (BC) (authored by spectral). · Explain WhyMay 15 2019, 2:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/graphmod.py (16 lines)
Mtests/test-glog.t (255 lines)

Diff 15120

mercurial/graphmod.py

while len(lines) < len(text): while len(lines) < len(text):
lines.append(extra_interline[:]) lines.append(extra_interline[:])
_drawendinglines(lines, extra_interline, edgemap, seen, state) _drawendinglines(lines, extra_interline, edgemap, seen, state)
while len(text) < len(lines): while len(text) < len(lines):
text.append("") text.append("")
if any(len(char) > 1 for char in edgemap.values()):
# limit drawing an edge to the first or last N lines of the current
# section the rest of the edge is drawn like a parent line.
parent = state['styles'][PARENT][-1:]
def _drawgp(char, i):
# should a grandparent character be drawn for this line?
if len(char) < 2:
return True
num = int(char[:-1])
# either skip first num lines or take last num lines, based on sign
return -num <= i if num < 0 else (len(lines) - i) <= num
for i, line in enumerate(lines):
line[:] = [c[-1:] if _drawgp(c, i) else parent for c in line]
edgemap.update(
(e, (c if len(c) < 2 else parent)) for e, c in edgemap.items())
# print lines # print lines
indentation_level = max(ncols, ncols + coldiff) indentation_level = max(ncols, ncols + coldiff)
lines = ["%-*s " % (2 * indentation_level, "".join(line)) for line in lines] lines = ["%-*s " % (2 * indentation_level, "".join(line)) for line in lines]
outputgraph(ui, zip(lines, text)) outputgraph(ui, zip(lines, text))
# ... and start over # ... and start over
state['lastcoldiff'] = coldiff state['lastcoldiff'] = coldiff
state['lastindex'] = idx state['lastindex'] = idx

tests/test-glog.t

| |
o changeset: 4:26a8bac39d9f o changeset: 4:26a8bac39d9f
|\ parent: 1:6db2ef61d156 |\ parent: 1:6db2ef61d156
~ ~ parent: 3:27eef8ed80b4 ~ ~ parent: 3:27eef8ed80b4
user: test user: test
date: Thu Jan 01 00:00:04 1970 +0000 date: Thu Jan 01 00:00:04 1970 +0000
summary: (4) merge two known; one immediate left, one immediate right summary: (4) merge two known; one immediate left, one immediate right
Draw only part of a grandparent line differently with "<N><char>"; only the Previously, one could specify graphstyle.grandparent = <N><char> to draw <char>
last N lines (for positive N) or everything but the first N lines (for on only the last N lines (for positive N) or everything but the first N lines
negative N) along the current node use the style, the rest of the edge uses (for negative N), with the rest of the edge using the parent edge styling.
the parent edge styling.
This was removed, and this test now shows that muliple characters being
Last 3 lines: specified in graphstyle.grandparent aren't treated specially (including in width
calculations; there's no specific reason to *avoid* handling the width
calculations, but it's difficult to do correctly and efficiently).
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [experimental] > [experimental]
> graphstyle.parent = ! > graphstyle.parent = !
> graphstyle.grandparent = 3. > graphstyle.grandparent = 3.
> graphstyle.missing = > graphstyle.missing =
> EOF > EOF
$ hg log -G -r '36:18 & file("a")' -m $ hg log -G -r '36:18 & file("a")' -m
@ changeset: 36:08a19a744424 @ changeset: 36:08a19a744424
! branch: branch 3. branch: branch
! tag: tip 3. tag: tip
! parent: 35:9159c3644c5e 3. parent: 35:9159c3644c5e
! parent: 35:9159c3644c5e 3. parent: 35:9159c3644c5e
! user: test 3. user: test
. date: Thu Jan 01 00:00:36 1970 +0000 3. date: Thu Jan 01 00:00:36 1970 +0000
. summary: (36) buggy merge: identical parents 3. summary: (36) buggy merge: identical parents
. 3.
o changeset: 32:d06dffa21a31 o changeset: 32:d06dffa21a31
!\ parent: 27:886ed638191b !\ parent: 27:886ed638191b
! ! parent: 31:621d83e11f67 ! 3. parent: 31:621d83e11f67
! ! user: test ! 3. user: test
! . date: Thu Jan 01 00:00:32 1970 +0000 ! 3. date: Thu Jan 01 00:00:32 1970 +0000
! . summary: (32) expand ! 3. summary: (32) expand
! . ! 3.
o ! changeset: 31:621d83e11f67 o 3. changeset: 31:621d83e11f67
!\! parent: 21:d42a756af44d !\3. parent: 21:d42a756af44d
! ! parent: 30:6e11cd4b648f ! 3. parent: 30:6e11cd4b648f
! ! user: test ! 3. user: test
! ! date: Thu Jan 01 00:00:31 1970 +0000 ! 3. date: Thu Jan 01 00:00:31 1970 +0000
! ! summary: (31) expand ! 3. summary: (31) expand
! ! ! 3.
o ! changeset: 30:6e11cd4b648f o 3. changeset: 30:6e11cd4b648f
!\ \ parent: 28:44ecd0b9ae99 !\ \ parent: 28:44ecd0b9ae99
! ~ ! parent: 29:cd9bb2be7593 ! ~ 3. parent: 29:cd9bb2be7593
! ! user: test ! 3. user: test
! ! date: Thu Jan 01 00:00:30 1970 +0000 ! 3. date: Thu Jan 01 00:00:30 1970 +0000
! ! summary: (30) expand ! 3. summary: (30) expand
! / ! /
o ! changeset: 28:44ecd0b9ae99 o 3. changeset: 28:44ecd0b9ae99
!\ \ parent: 1:6db2ef61d156 !\ \ parent: 1:6db2ef61d156
! ~ ! parent: 26:7f25b6c2f0b9 ! ~ 3. parent: 26:7f25b6c2f0b9
! ! user: test ! 3. user: test
! ! date: Thu Jan 01 00:00:28 1970 +0000 ! 3. date: Thu Jan 01 00:00:28 1970 +0000
! ! summary: (28) merge zero known ! 3. summary: (28) merge zero known
! / ! /
o ! changeset: 26:7f25b6c2f0b9 o 3. changeset: 26:7f25b6c2f0b9
!\ \ parent: 18:1aa84d96232a !\ \ parent: 18:1aa84d96232a
! ! ! parent: 25:91da8ed57247 ! ! 3. parent: 25:91da8ed57247
! ! ! user: test ! ! 3. user: test
! ! ! date: Thu Jan 01 00:00:26 1970 +0000 ! ! 3. date: Thu Jan 01 00:00:26 1970 +0000
! ! ! summary: (26) merge one known; far right ! ! 3. summary: (26) merge one known; far right
! ! ! ! ! 3.
! o ! changeset: 25:91da8ed57247 ! o 3. changeset: 25:91da8ed57247
! !\! parent: 21:d42a756af44d ! !\3. parent: 21:d42a756af44d
! ! ! parent: 24:a9c19a3d96b7 ! ! 3. parent: 24:a9c19a3d96b7
! ! ! user: test ! ! 3. user: test
! ! ! date: Thu Jan 01 00:00:25 1970 +0000 ! ! 3. date: Thu Jan 01 00:00:25 1970 +0000
! ! ! summary: (25) merge one known; far left ! ! 3. summary: (25) merge one known; far left
! ! ! ! ! 3.
! o ! changeset: 24:a9c19a3d96b7 ! o 3. changeset: 24:a9c19a3d96b7
! !\ \ parent: 0:e6eb3150255d ! !\ \ parent: 0:e6eb3150255d
! ! ~ ! parent: 23:a01cddf0766d ! ! ~ 3. parent: 23:a01cddf0766d
! ! ! user: test ! ! 3. user: test
! ! ! date: Thu Jan 01 00:00:24 1970 +0000 ! ! 3. date: Thu Jan 01 00:00:24 1970 +0000
! ! ! summary: (24) merge one known; immediate right ! ! 3. summary: (24) merge one known; immediate right
! ! / ! ! /
! o ! changeset: 23:a01cddf0766d ! o 3. changeset: 23:a01cddf0766d
! !\ \ parent: 1:6db2ef61d156 ! !\ \ parent: 1:6db2ef61d156
! ! ~ ! parent: 22:e0d9cccacb5d ! ! ~ 3. parent: 22:e0d9cccacb5d
! ! ! user: test ! ! 3. user: test
! ! ! date: Thu Jan 01 00:00:23 1970 +0000 ! ! 3. date: Thu Jan 01 00:00:23 1970 +0000
! ! ! summary: (23) merge one known; immediate left ! ! 3. summary: (23) merge one known; immediate left
! ! / ! ! /
! o ! changeset: 22:e0d9cccacb5d ! o 3. changeset: 22:e0d9cccacb5d
!/!/ parent: 18:1aa84d96232a !/3./ parent: 18:1aa84d96232a
! ! parent: 21:d42a756af44d ! 3. parent: 21:d42a756af44d
! ! user: test ! 3. user: test
! ! date: Thu Jan 01 00:00:22 1970 +0000 ! 3. date: Thu Jan 01 00:00:22 1970 +0000
! ! summary: (22) merge two known; one far left, one far right ! 3. summary: (22) merge two known; one far left, one far right
! ! ! 3.
! o changeset: 21:d42a756af44d ! o changeset: 21:d42a756af44d
! !\ parent: 19:31ddc2c1573b ! !\ parent: 19:31ddc2c1573b
! ! ! parent: 20:d30ed6450e32 ! ! ! parent: 20:d30ed6450e32
! ! ! user: test ! ! ! user: test
! ! ! date: Thu Jan 01 00:00:21 1970 +0000 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
! ! ! summary: (21) expand ! ! ! summary: (21) expand
! ! ! ! ! !
+---o changeset: 20:d30ed6450e32 +---o changeset: 20:d30ed6450e32
! !
o changeset: 18:1aa84d96232a o changeset: 18:1aa84d96232a
|\ parent: 1:6db2ef61d156 |\ parent: 1:6db2ef61d156
~ ~ parent: 15:1dda3f72782d ~ ~ parent: 15:1dda3f72782d
user: test user: test
date: Thu Jan 01 00:00:18 1970 +0000 date: Thu Jan 01 00:00:18 1970 +0000
summary: (18) merge two known; two far left summary: (18) merge two known; two far left
All but the first 3 lines: (This formerly tested "All but the first 3 lines", but is now showing that it's
still not treated any differently):
martinvonzUnsubmitted
Not Done

I'm not sure it's worth keeping this test.

martinvonz: I'm not sure it's worth keeping this test.
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [experimental] > [experimental]
> graphstyle.parent = ! > graphstyle.parent = !
> graphstyle.grandparent = -3. > graphstyle.grandparent = -3.
> graphstyle.missing = > graphstyle.missing =
> EOF > EOF
$ hg log -G -r '36:18 & file("a")' -m $ hg log -G -r '36:18 & file("a")' -m
@ changeset: 36:08a19a744424 @ changeset: 36:08a19a744424
! branch: branch -3. branch: branch
! tag: tip -3. tag: tip
. parent: 35:9159c3644c5e -3. parent: 35:9159c3644c5e
. parent: 35:9159c3644c5e -3. parent: 35:9159c3644c5e
. user: test -3. user: test
. date: Thu Jan 01 00:00:36 1970 +0000 -3. date: Thu Jan 01 00:00:36 1970 +0000
. summary: (36) buggy merge: identical parents -3. summary: (36) buggy merge: identical parents
. -3.
o changeset: 32:d06dffa21a31 o changeset: 32:d06dffa21a31
!\ parent: 27:886ed638191b !\ parent: 27:886ed638191b
! ! parent: 31:621d83e11f67 ! -3. parent: 31:621d83e11f67
! . user: test ! -3. user: test
! . date: Thu Jan 01 00:00:32 1970 +0000 ! -3. date: Thu Jan 01 00:00:32 1970 +0000
! . summary: (32) expand ! -3. summary: (32) expand
! . ! -3.
o ! changeset: 31:621d83e11f67 o -3. changeset: 31:621d83e11f67
!\! parent: 21:d42a756af44d !\-3. parent: 21:d42a756af44d
! ! parent: 30:6e11cd4b648f ! -3. parent: 30:6e11cd4b648f
! ! user: test ! -3. user: test
! ! date: Thu Jan 01 00:00:31 1970 +0000 ! -3. date: Thu Jan 01 00:00:31 1970 +0000
! ! summary: (31) expand ! -3. summary: (31) expand
! ! ! -3.
o ! changeset: 30:6e11cd4b648f o -3. changeset: 30:6e11cd4b648f
!\ \ parent: 28:44ecd0b9ae99 !\ \ parent: 28:44ecd0b9ae99
! ~ ! parent: 29:cd9bb2be7593 ! ~ -3. parent: 29:cd9bb2be7593
! ! user: test ! -3. user: test
! ! date: Thu Jan 01 00:00:30 1970 +0000 ! -3. date: Thu Jan 01 00:00:30 1970 +0000
! ! summary: (30) expand ! -3. summary: (30) expand
! / ! /
o ! changeset: 28:44ecd0b9ae99 o -3. changeset: 28:44ecd0b9ae99
!\ \ parent: 1:6db2ef61d156 !\ \ parent: 1:6db2ef61d156
! ~ ! parent: 26:7f25b6c2f0b9 ! ~ -3. parent: 26:7f25b6c2f0b9
! ! user: test ! -3. user: test
! ! date: Thu Jan 01 00:00:28 1970 +0000 ! -3. date: Thu Jan 01 00:00:28 1970 +0000
! ! summary: (28) merge zero known ! -3. summary: (28) merge zero known
! / ! /
o ! changeset: 26:7f25b6c2f0b9 o -3. changeset: 26:7f25b6c2f0b9
!\ \ parent: 18:1aa84d96232a !\ \ parent: 18:1aa84d96232a
! ! ! parent: 25:91da8ed57247 ! ! -3. parent: 25:91da8ed57247
! ! ! user: test ! ! -3. user: test
! ! ! date: Thu Jan 01 00:00:26 1970 +0000 ! ! -3. date: Thu Jan 01 00:00:26 1970 +0000
! ! ! summary: (26) merge one known; far right ! ! -3. summary: (26) merge one known; far right
! ! ! ! ! -3.
! o ! changeset: 25:91da8ed57247 ! o -3. changeset: 25:91da8ed57247
! !\! parent: 21:d42a756af44d ! !\-3. parent: 21:d42a756af44d
! ! ! parent: 24:a9c19a3d96b7 ! ! -3. parent: 24:a9c19a3d96b7
! ! ! user: test ! ! -3. user: test
! ! ! date: Thu Jan 01 00:00:25 1970 +0000 ! ! -3. date: Thu Jan 01 00:00:25 1970 +0000
! ! ! summary: (25) merge one known; far left ! ! -3. summary: (25) merge one known; far left
! ! ! ! ! -3.
! o ! changeset: 24:a9c19a3d96b7 ! o -3. changeset: 24:a9c19a3d96b7
! !\ \ parent: 0:e6eb3150255d ! !\ \ parent: 0:e6eb3150255d
! ! ~ ! parent: 23:a01cddf0766d ! ! ~ -3. parent: 23:a01cddf0766d
! ! ! user: test ! ! -3. user: test
! ! ! date: Thu Jan 01 00:00:24 1970 +0000 ! ! -3. date: Thu Jan 01 00:00:24 1970 +0000
! ! ! summary: (24) merge one known; immediate right ! ! -3. summary: (24) merge one known; immediate right
! ! / ! ! /
! o ! changeset: 23:a01cddf0766d ! o -3. changeset: 23:a01cddf0766d
! !\ \ parent: 1:6db2ef61d156 ! !\ \ parent: 1:6db2ef61d156
! ! ~ ! parent: 22:e0d9cccacb5d ! ! ~ -3. parent: 22:e0d9cccacb5d
! ! ! user: test ! ! -3. user: test
! ! ! date: Thu Jan 01 00:00:23 1970 +0000 ! ! -3. date: Thu Jan 01 00:00:23 1970 +0000
! ! ! summary: (23) merge one known; immediate left ! ! -3. summary: (23) merge one known; immediate left
! ! / ! ! /
! o ! changeset: 22:e0d9cccacb5d ! o -3. changeset: 22:e0d9cccacb5d
!/!/ parent: 18:1aa84d96232a !/-3./ parent: 18:1aa84d96232a
! ! parent: 21:d42a756af44d ! -3. parent: 21:d42a756af44d
! ! user: test ! -3. user: test
! ! date: Thu Jan 01 00:00:22 1970 +0000 ! -3. date: Thu Jan 01 00:00:22 1970 +0000
! ! summary: (22) merge two known; one far left, one far right ! -3. summary: (22) merge two known; one far left, one far right
! ! ! -3.
! o changeset: 21:d42a756af44d ! o changeset: 21:d42a756af44d
! !\ parent: 19:31ddc2c1573b ! !\ parent: 19:31ddc2c1573b
! ! ! parent: 20:d30ed6450e32 ! ! ! parent: 20:d30ed6450e32
! ! ! user: test ! ! ! user: test
! ! ! date: Thu Jan 01 00:00:21 1970 +0000 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000
! ! ! summary: (21) expand ! ! ! summary: (21) expand
! ! ! ! ! !
+---o changeset: 20:d30ed6450e32 +---o changeset: 20:d30ed6450e32