D4363: log: respect graphshorten on terminal nodes (collapsing o-~ to just o~)

spectral (Kyle Lippincott) phabricator at mercurial-scm.org
Thu Aug 23 20:51:25 EDT 2018


spectral added a comment.


  In https://phab.mercurial-scm.org/D4363#67017, @martinvonz wrote:
  
  > In https://phab.mercurial-scm.org/D4363#67016, @spectral wrote:
  >
  > > In https://phab.mercurial-scm.org/D4363#67015, @martinvonz wrote:
  > >
  > > > In https://phab.mercurial-scm.org/D4363#67012, @martinvonz wrote:
  > > >
  > > > > Can we have a test for this?
  > > >
  > > >
  > > > Oh, sorry, there are updated tests (my browser tab was stale when I reviewed this). That also explains why two `minlines` changed by 2: the `~` is also removed, which I didn't expect. I think I would like to have the `~` in there. Without them, it may look like two independent branches come in sequence, no?
  > >
  > >
  > > Yes, it might.  I kinda went back and forth on this, as you probably saw on the FR from our users; I came to the conclusion that those using graphshorten are already losing `:` vs `|` distinctions, so seems to already be opting in to potentially misleading graphs.  When I realized that `hg show work` also used graphshorten and this wasn't an explicit choice by the user, I was less sure on this and requested input from indygreg.   If we agree that we need the ~ by default, I can easily add it back.  Having never used `hg show work`, doing most of my changes in a repo where we don't really have branches that would cause this to be confusing, and that we have the branch name in the compact log format that I showed in the commit description, I don't think I'm a good judge of the importance of the ~ in these cases :)
  >
  >
  > I feel pretty strongly that making a non-linear graph appear linear is much more misleading than eliding intermediate nodes, so I'd really like the ~ back.
  
  
  I tried to find a sane way of determining if we were at the end of the graph and eliding that ~, at least, but couldn't figure it out.  Done: all of the ~s are back.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4363

To: spectral, #hg-reviewers, indygreg
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list