view tests/test-pushvars.t @ 39313: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

Setup

  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
  $ export PYTHONPATH

  $ cat > $TESTTMP/pretxnchangegroup.sh << EOF
  > #!/bin/sh
  > env | egrep "^HG_USERVAR_(DEBUG|BYPASS_REVIEW)" | sort
  > exit 0
  > EOF
  $ cat >> $HGRCPATH << EOF
  > [hooks]
  > pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh
  > EOF

  $ hg init repo
  $ hg clone -q repo child
  $ cd child

Test pushing vars to repo with pushvars.server not set

  $ echo b > a
  $ hg commit -Aqm a
  $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
  pushing to $TESTTMP/repo
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files

Setting pushvars.sever = true and then pushing.

  $ echo [push] >> $HGRCPATH
  $ echo "pushvars.server = true" >> $HGRCPATH
  $ echo b >> a
  $ hg commit -Aqm a
  $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
  pushing to $TESTTMP/repo
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files
  HG_USERVAR_BYPASS_REVIEW=true
  HG_USERVAR_DEBUG=1

Test pushing var with empty right-hand side

  $ echo b >> a
  $ hg commit -Aqm a
  $ hg push --pushvars "DEBUG="
  pushing to $TESTTMP/repo
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files
  HG_USERVAR_DEBUG=

Test pushing bad vars

  $ echo b >> a
  $ hg commit -Aqm b
  $ hg push --pushvars "DEBUG"
  pushing to $TESTTMP/repo
  searching for changes
  abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format
  [255]