comparison tests/test-notify.t @ 28951:1bba1b43525a

notify: do not load style file if template is specified (BC)

This patch makes sure that either "tmpl" or "mapfile" is exclusively set,
which is the same behavior as common log-like templates and formatter outputs.

See the previous patch for why.

28950:9e1c9f016b72

  
  changeset 38b42fa092de in b
  description: test
  (run 'hg heads' to see heads)

28951:1bba1b43525a

  
  changeset 38b42fa092de in b
  description: test
  (run 'hg heads' to see heads)

default template:

  $ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new"
  $ mv "$HGRCPATH.new" $HGRCPATH
  $ echo a >> a/a
  $ hg --cwd a commit -m 'default template'
  $ hg --cwd b pull ../a -q | \
  >   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: changeset in b: default template
  From: [e-mail]
  X-Hg-Notification: changeset 3548c9e294b6
  Message-Id: <hg.3548c9e294b6.*.*@*> (glob)
  To: [e-mail], foo@bar
  
  changeset 3548c9e294b6 in $TESTTMP/b
  details: http://test/b?cmd=changeset;node=3548c9e294b6
  description: default template

with style:

  $ cat <<EOF > notifystyle.map
  > changeset = "Subject: {desc|firstline|strip}
  >              From: {author}
  >              {""}
  >              changeset {node|short}"
  > EOF
  $ cat <<EOF >> $HGRCPATH
  > [notify]
  > style = $TESTTMP/notifystyle.map
  > EOF
  $ echo a >> a/a
  $ hg --cwd a commit -m 'with style'
  $ hg --cwd b pull ../a -q | \
  >   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: with style
  From: [e-mail]
  X-Hg-Notification: changeset e917dbd961d3
  Message-Id: <hg.e917dbd961d3.*.*@*> (glob)
  To: [e-mail], foo@bar
  
  changeset e917dbd961d3

with template (overrides style):

  $ cat <<EOF >> $HGRCPATH
  > template = Subject: {node|short}: {desc|firstline|strip}
  >            From: {author}
  >            {""}
  >            {desc}
  > EOF
  $ echo a >> a/a
  $ hg --cwd a commit -m 'with template'
  $ hg --cwd b pull ../a -q | \
  >   $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: a09743fd3edd: with template
  From: [e-mail]
  X-Hg-Notification: changeset a09743fd3edd
  Message-Id: <hg.a09743fd3edd.*.*@*> (glob)
  To: [e-mail], foo@bar
  
  with template