Mercurial > hg-stable
changeset 6910:93609576244e
Debashify rebase tests
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 19 Aug 2008 18:07:26 -0700 |
parents | b5a6fce0bc29 |
children | 1a14608bdeff |
files | tests/test-commit-unresolved tests/test-rebase-abort tests/test-rebase-collapse tests/test-rebase-conflicts tests/test-rebase-interruptions tests/test-rebase-issue-noparam-single-rev tests/test-rebase-parameters tests/test-rebase-pull tests/test-rebase-scenario-global |
diffstat | 9 files changed, 25 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-commit-unresolved Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-commit-unresolved Tue Aug 19 18:07:26 2008 -0700 @@ -3,12 +3,13 @@ echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { + +commit () { hg commit -d "${2} 0" -u test -m $1 }
--- a/tests/test-rebase-abort Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-abort Tue Aug 19 18:07:26 2008 -0700 @@ -4,7 +4,7 @@ echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH -function cleanoutput { +cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/'
--- a/tests/test-rebase-collapse Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-collapse Tue Aug 19 18:07:26 2008 -0700 @@ -6,16 +6,17 @@ BASE=`pwd` -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { + +commit () { hg commit -d "${2} 0" -u test -m $1 } -function createrepo { +createrepo () { cd $BASE rm -rf a hg init a @@ -50,7 +51,7 @@ hg rebase --base 6 --collapse 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}: {desc}\n' -function createrepocomplex { +createrepocomplex () { cd $BASE rm -rf a hg init a
--- a/tests/test-rebase-conflicts Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-conflicts Tue Aug 19 18:07:26 2008 -0700 @@ -4,7 +4,7 @@ echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH -function cleanoutput { +cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/'
--- a/tests/test-rebase-interruptions Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-interruptions Tue Aug 19 18:07:26 2008 -0700 @@ -6,16 +6,17 @@ BASE=`pwd` -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { + +commit () { hg commit -d "${2} 0" -u test -m $1 } -function createrepo { +createrepo () { cd $BASE rm -rf a hg init a
--- a/tests/test-rebase-issue-noparam-single-rev Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-issue-noparam-single-rev Tue Aug 19 18:07:26 2008 -0700 @@ -4,7 +4,7 @@ echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1
--- a/tests/test-rebase-parameters Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-parameters Tue Aug 19 18:07:26 2008 -0700 @@ -3,17 +3,17 @@ echo "[extensions]" >> $HGRCPATH echo "rebase=" >> $HGRCPATH -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { +commit () { hg commit -d "${2} 0" -u test -m $1 } -function createrepo { +createrepo () { hg init a cd a addcommit "c1" 0
--- a/tests/test-rebase-pull Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-pull Tue Aug 19 18:07:26 2008 -0700 @@ -6,12 +6,13 @@ BASE=`pwd` -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { + +commit () { hg commit -d "${2} 0" -u test -m $1 }
--- a/tests/test-rebase-scenario-global Tue Aug 19 15:36:03 2008 -0700 +++ b/tests/test-rebase-scenario-global Tue Aug 19 18:07:26 2008 -0700 @@ -6,16 +6,17 @@ BASE=`pwd` -function addcommit { +addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } -function commit { + +commit () { hg commit -d "${2} 0" -u test -m $1 } -function createrepo { +createrepo () { cd $BASE rm -rf a hg init a