comparison tests/bzr-definitions @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents aa9385f983fa
children 89872688893f
comparison
equal deleted inserted replaced
20213:8c69c69dbcd2 20306:fe8e254c7ad6
3 "$TESTDIR/hghave" bzr || exit 80 3 "$TESTDIR/hghave" bzr || exit 80
4 4
5 TERM=dumb; export TERM 5 TERM=dumb; export TERM
6 echo '[extensions]' >> $HGRCPATH 6 echo '[extensions]' >> $HGRCPATH
7 echo 'convert = ' >> $HGRCPATH 7 echo 'convert = ' >> $HGRCPATH
8 echo 'hgext.graphlog = ' >> $HGRCPATH
9 8
10 glog() 9 glog()
11 { 10 {
12 hg glog --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" 11 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
13 } 12 }
14 13
15 manifest() 14 manifest()
16 { 15 {
17 echo "% manifest of $2" 16 echo "% manifest of $2"