# HG changeset patch # User Martin Geisler # Date 2009-04-26 12:49:49 # Node ID 8766fee6f2250a1343fb36ef424d34d6dff363d6 # Parent 6c82beaaa11a93443588dc2d6bc254d23b716623 tests: removed redundant "-u test" from test scripts The tests are executed with a .hgrc file which adds "-u test" by default. diff --git a/tests/test-bookmarks-rebase b/tests/test-bookmarks-rebase --- a/tests/test-bookmarks-rebase +++ b/tests/test-bookmarks-rebase @@ -14,17 +14,17 @@ echo % initialize repository hg init echo 'a' > a -hg ci -A -u test -m "0" +hg ci -A -m "0" echo 'b' > b -hg ci -A -u test -m "1" +hg ci -A -m "1" hg up 0 echo 'c' > c -hg ci -A -u test -m "2" +hg ci -A -m "2" echo 'd' > d -hg ci -A -u test -m "3" +hg ci -A -m "3" hg bookmark -r 1 one hg bookmark -r 3 two diff --git a/tests/test-branches b/tests/test-branches --- a/tests/test-branches +++ b/tests/test-branches @@ -4,42 +4,42 @@ hg init a cd a echo 'root' >root hg add root -hg commit -d '0 0' -u test -m "Adding root node" +hg commit -d '0 0' -m "Adding root node" echo 'a' >a hg add a hg branch a -hg commit -d '1 0' -u test -m "Adding a branch" +hg commit -d '1 0' -m "Adding a branch" hg branch q echo 'aa' >a hg branch -C -hg commit -d '2 0' -u test -m "Adding to a branch" +hg commit -d '2 0' -m "Adding to a branch" hg update -C 0 echo 'b' >b hg add b hg branch b -hg commit -d '2 0' -u test -m "Adding b branch" +hg commit -d '2 0' -m "Adding b branch" echo 'bh1' >bh1 hg add bh1 -hg commit -d '3 0' -u test -m "Adding b branch head 1" +hg commit -d '3 0' -m "Adding b branch head 1" hg update -C 2 echo 'bh2' >bh2 hg add bh2 -hg commit -d '4 0' -u test -m "Adding b branch head 2" +hg commit -d '4 0' -m "Adding b branch head 2" echo 'c' >c hg add c hg branch c -hg commit -d '5 0' -u test -m "Adding c branch" +hg commit -d '5 0' -m "Adding c branch" echo 'd' >d hg add d hg branch 'a branch name much longer than the default justification used by branches' -hg commit -d '6 0' -u test -m "Adding d branch" +hg commit -d '6 0' -m "Adding d branch" hg branches echo '-------' @@ -55,24 +55,24 @@ echo "---- going to test branch closing" hg branches hg up -C b echo 'xxx1' >> b -hg commit -d '7 0' -u test -m 'adding cset to branch b' +hg commit -d '7 0' -m 'adding cset to branch b' hg up -C aee39cd168d0 echo 'xxx2' >> b -hg commit -d '8 0' -u test -m 'adding head to branch b' +hg commit -d '8 0' -m 'adding head to branch b' echo 'xxx3' >> b -hg commit -d '9 0' -u test -m 'adding another cset to branch b' +hg commit -d '9 0' -m 'adding another cset to branch b' hg branches hg heads hg heads -a -hg commit -d '9 0' -u test --close-branch -m 'prune bad branch' +hg commit -d '9 0' --close-branch -m 'prune bad branch' hg branches -a hg up -C b -hg commit -d '9 0' -u test --close-branch -m 'close this part branch too' +hg commit -d '9 0' --close-branch -m 'close this part branch too' echo '--- b branch should be inactive' hg branches hg branches -a echo 'xxx4' >> b -hg commit -d '9 0' -u test -m 'reopen branch with a change' +hg commit -d '9 0' -m 'reopen branch with a change' echo '--- branch b is back in action' hg branches -a hg heads diff --git a/tests/test-commit b/tests/test-commit --- a/tests/test-commit +++ b/tests/test-commit @@ -62,8 +62,8 @@ echo foo > foo/foo mkdir bar echo bar > bar/bar hg add -hg ci -d '1000000 0' -u test -m commit-subdir-1 foo -hg ci -d '1000001 0' -u test -m commit-subdir-2 bar +hg ci -d '1000000 0' -m commit-subdir-1 foo +hg ci -d '1000001 0' -m commit-subdir-2 bar echo % subdir log 1 hg log -v foo echo % subdir log 2 @@ -78,9 +78,9 @@ cd test3 mkdir foo echo foo content > foo/plain-file hg add foo/plain-file -hg ci -d '1000000 0' -u test -m commit-foo-subdir foo +hg ci -d '1000000 0' -m commit-foo-subdir foo echo modified foo content > foo/plain-file -hg ci -d '2000000 0' -u test -m commit-foo-dot . +hg ci -d '2000000 0' -m commit-foo-dot . echo % full log hg log -v echo % subdir log diff --git a/tests/test-commit-unresolved b/tests/test-commit-unresolved --- a/tests/test-commit-unresolved +++ b/tests/test-commit-unresolved @@ -6,11 +6,11 @@ echo "graphlog=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } hg init a diff --git a/tests/test-merge10 b/tests/test-merge10 --- a/tests/test-merge10 +++ b/tests/test-merge10 @@ -9,23 +9,23 @@ cd a mkdir -p testdir echo a > testdir/a hg add testdir/a -hg commit -u test -d '1000000 0' -m a +hg commit -d '1000000 0' -m a cd .. hg clone a b cd a echo alpha > testdir/a -hg commit -u test -d '1000000 0' -m remote-change +hg commit -d '1000000 0' -m remote-change cd .. cd b mkdir testdir/subdir hg mv testdir/a testdir/subdir/a -hg commit -u test -d '1000000 0' -m move +hg commit -d '1000000 0' -m move mkdir newdir echo beta > newdir/beta hg add newdir/beta -hg commit -u test -d '1000000 0' -m local-addition +hg commit -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge diff --git a/tests/test-rebase-abort b/tests/test-rebase-abort --- a/tests/test-rebase-abort +++ b/tests/test-rebase-abort @@ -14,22 +14,22 @@ hg init a cd a echo 'c1' >common hg add common -hg commit -d '0 0' -u test -m "C1" +hg commit -d '0 0' -m "C1" echo 'c2' >>common -hg commit -d '1 0' -u test -m "C2" +hg commit -d '1 0' -m "C2" echo 'c3' >>common -hg commit -d '2 0' -u test -m "C3" +hg commit -d '2 0' -m "C3" hg update -C 1 echo 'l1' >>extra hg add extra -hg commit -d '3 0' -u test -m "L1" +hg commit -d '3 0' -m "L1" sed -e 's/c2/l2/' common > common.new mv common.new common -hg commit -d '4 0' -u test -m "L2" +hg commit -d '4 0' -m "L2" hg glog --template '{rev}: {desc}\n' diff --git a/tests/test-rebase-check-restore b/tests/test-rebase-check-restore --- a/tests/test-rebase-check-restore +++ b/tests/test-rebase-check-restore @@ -9,11 +9,11 @@ BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } createrepo () { diff --git a/tests/test-rebase-collapse b/tests/test-rebase-collapse --- a/tests/test-rebase-collapse +++ b/tests/test-rebase-collapse @@ -9,11 +9,11 @@ BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } createrepo () { diff --git a/tests/test-rebase-conflicts b/tests/test-rebase-conflicts --- a/tests/test-rebase-conflicts +++ b/tests/test-rebase-conflicts @@ -14,26 +14,26 @@ hg init a cd a echo 'c1' >common hg add common -hg commit -d '0 0' -u test -m "C1" +hg commit -d '0 0' -m "C1" echo 'c2' >>common -hg commit -d '1 0' -u test -m "C2" +hg commit -d '1 0' -m "C2" echo 'c3' >>common -hg commit -d '2 0' -u test -m "C3" +hg commit -d '2 0' -m "C3" hg update -C 1 echo 'l1' >>extra hg add extra -hg commit -d '3 0' -u test -m "L1" +hg commit -d '3 0' -m "L1" sed -e 's/c2/l2/' common > common.new mv common.new common -hg commit -d '4 0' -u test -m "L2" +hg commit -d '4 0' -m "L2" echo 'l3' >> extra2 hg add extra2 -hg commit -d '5 0' -u test -m "L3" +hg commit -d '5 0' -m "L3" hg glog --template '{rev}: {desc}\n' diff --git a/tests/test-rebase-interruptions b/tests/test-rebase-interruptions --- a/tests/test-rebase-interruptions +++ b/tests/test-rebase-interruptions @@ -9,11 +9,11 @@ BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } createrepo () { diff --git a/tests/test-rebase-issue-noparam-single-rev b/tests/test-rebase-issue-noparam-single-rev --- a/tests/test-rebase-issue-noparam-single-rev +++ b/tests/test-rebase-issue-noparam-single-rev @@ -7,7 +7,7 @@ echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } hg init a diff --git a/tests/test-rebase-keep-branch b/tests/test-rebase-keep-branch --- a/tests/test-rebase-keep-branch +++ b/tests/test-rebase-keep-branch @@ -7,7 +7,7 @@ echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } hg init a diff --git a/tests/test-rebase-mq b/tests/test-rebase-mq --- a/tests/test-rebase-mq +++ b/tests/test-rebase-mq @@ -22,10 +22,10 @@ hg qinit -c # This must work even with a echo 'c1' > f hg add f -hg commit -d '0 0' -u test -m "C1" +hg commit -d '0 0' -m "C1" echo 'r1' > f -hg commit -d '2 0' -u test -m "R1" +hg commit -d '2 0' -m "R1" hg up 0 hg qnew f.patch diff --git a/tests/test-rebase-mq-skip b/tests/test-rebase-mq-skip --- a/tests/test-rebase-mq-skip +++ b/tests/test-rebase-mq-skip @@ -13,11 +13,11 @@ hg qinit -c # This must work even with a echo 'c1' > c1 hg add c1 -hg commit -d '0 0' -u test -m "C1" +hg commit -d '0 0' -m "C1" echo 'r1' > r1 hg add r1 -hg commit -d '1 0' -u test -m "R1" +hg commit -d '1 0' -m "R1" hg up 0 hg qnew p0.patch diff --git a/tests/test-rebase-parameters b/tests/test-rebase-parameters --- a/tests/test-rebase-parameters +++ b/tests/test-rebase-parameters @@ -6,11 +6,11 @@ echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } createrepo () { diff --git a/tests/test-rebase-pull b/tests/test-rebase-pull --- a/tests/test-rebase-pull +++ b/tests/test-rebase-pull @@ -9,11 +9,11 @@ BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } cd $BASE diff --git a/tests/test-rebase-scenario-global b/tests/test-rebase-scenario-global --- a/tests/test-rebase-scenario-global +++ b/tests/test-rebase-scenario-global @@ -9,11 +9,11 @@ BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } commit () { - hg commit -d "${2} 0" -u test -m $1 + hg commit -d "${2} 0" -m $1 } createrepo () {