annotate tests/test-mq-subrepo-svn.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

#require svn13

  $ cat <<EOF >> $HGRCPATH
  > [extensions]
  > mq =
  > [diff]
  > nodates = 1
  > [subrepos]
  > allowed = true
  > svn:allowed = true
  > EOF

fn to create new repository, and cd into it
  $ mkrepo() {
  >     hg init $1
  >     cd $1
  >     hg qinit
  > }


handle svn subrepos safely

  $ svnadmin create svn-repo-2499

  $ SVNREPOPATH=`pwd`/svn-repo-2499/project
#if windows
  $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
#else
  $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
#endif

  $ mkdir -p svn-project-2499/trunk
  $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"

qnew on repo w/svn subrepo
  $ mkrepo repo-2499-svn-subrepo
  $ svn co "$SVNREPOURL"/trunk sub
  Checked out revision 1.
  $ echo 'sub = [svn]sub' >> .hgsub
  $ hg add .hgsub
  $ hg status -S -X '**/format'
  A .hgsub
  $ hg qnew -m0 0.diff
  $ cd sub
  $ echo a > a
  $ svn add a
  A         a
  $ svn st
  A*    a (glob)
  $ cd ..
  $ hg status -S        # doesn't show status for svn subrepos (yet)
  $ hg qnew -m1 1.diff
  abort: uncommitted changes in subrepository "sub"
  [255]

  $ cd ..