view tests/test-issue612.t @ 39286:3c4b2e880273

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

Internally we have a custom template that's inspired by ones that we have seen
in the community. Normally, this looks something like:

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    |  cext: fix truncation warnings in revlog on Windows
    o  42cc76d0 matt_harbison
    |  cext: fix revlog compiler error on Windows
    ~
    o  bd63ada7 stable boris
    |  phases: drop dead code in `newheads`
    ~

With graphshorten on, and the descriptions of the public nodes hidden, it looks
like this, note that the commits right before the ~ are still "full height":

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    |
    ~
    o  bd63ada7 stable boris
    |
    ~

This patch makes them look like this, removing the | but keeping the ~:

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    ~
    o  bd63ada7 stable boris
    ~

This originally removed the ~s entirely, but this was determined to be too much
information loss and potentially confusing. This would have looked like the
following (note that the last commit is on a different branch than all of the
ones above it, and they are *not* linearly related):

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    o  bd63ada7 stable boris

Differential Revision: https://phab.mercurial-scm.org/D4363

https://bz.mercurial-scm.org/612

  $ hg init
  $ mkdir src
  $ echo a > src/a.c
  $ hg ci -Ama
  adding src/a.c

  $ hg mv src source
  moving src/a.c to source/a.c

  $ hg ci -Ammove

  $ hg co -C 0
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo new > src/a.c
  $ echo compiled > src/a.o
  $ hg ci -mupdate
  created new head

  $ hg status
  ? src/a.o

  $ hg merge
  merging src/a.c and source/a.c to source/a.c
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ hg status
  M source/a.c
  R src/a.c
  ? src/a.o