Mercurial > hg
changeset 8167:6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
line wrap: on
line diff
--- a/tests/test-backout Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-backout Sun Apr 26 14:29:02 2009 +0200 @@ -42,16 +42,16 @@ hg init branch cd branch echo a > a -hg ci -Am0 -d '0 0' +hg ci -Am0 echo b > b -hg ci -Am1 -d '0 0' +hg ci -Am1 hg co -C 0 # should fail -hg backout -d '0 0' 1 +hg backout 1 echo c > c -hg ci -Am2 -d '0 0' +hg ci -Am2 # should fail -hg backout -d '0 0' 1 +hg backout 1 echo '# backout with merge' cd ..
--- a/tests/test-bookmarks-rebase Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-bookmarks-rebase Sun Apr 26 14:29:02 2009 +0200 @@ -14,17 +14,17 @@ hg init echo 'a' > a -hg ci -A -d '0 0' -u test -m "0" +hg ci -A -u test -m "0" echo 'b' > b -hg ci -A -d '0 0' -u test -m "1" +hg ci -A -u test -m "1" hg up 0 echo 'c' > c -hg ci -A -d '0 0' -u test -m "2" +hg ci -A -u test -m "2" echo 'd' > d -hg ci -A -d '0 0' -u test -m "3" +hg ci -A -u test -m "3" hg bookmark -r 1 one hg bookmark -r 3 two @@ -35,4 +35,4 @@ echo % rebase hg rebase -s two -d one 2>&1 | cleanoutput -hg log \ No newline at end of file +hg log
--- a/tests/test-bundle Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-bundle Sun Apr 26 14:29:02 2009 +0200 @@ -117,14 +117,14 @@ cd orig echo foo > foo hg add foo -hg ci -m 'add foo' -d '0 0' +hg ci -m 'add foo' hg clone . ../copy -hg tag -d '0 0' foo +hg tag foo cd ../copy echo >> foo -hg ci -m 'change foo' -d '0 0' +hg ci -m 'change foo' hg bundle ../bundle.hg ../orig cd ../orig
--- a/tests/test-changelog-exec Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-changelog-exec Sun Apr 26 14:29:02 2009 +0200 @@ -8,23 +8,23 @@ hg init repo cd repo echo foo > foo -hg ci -qAm 'add foo' -d '0 0' +hg ci -qAm 'add foo' echo bar > bar chmod +x bar -hg ci -qAm 'add bar' -d '0 0' +hg ci -qAm 'add bar' echo '% manifest of p2:' hg manifest echo hg up -qC 0 echo >> foo -hg ci -m 'change foo' -d '0 0' +hg ci -m 'change foo' echo '% manifest of p1:' hg manifest hg merge -hg ci -m 'merge' -d '0 0' +hg ci -m 'merge' echo '% this should not mention bar:' hg tip -v
--- a/tests/test-clone Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-clone Sun Apr 26 14:29:02 2009 +0200 @@ -7,14 +7,14 @@ hg init echo a > a hg add a -hg commit -m test -d '0 0' +hg commit -m test echo first line > b hg add b # create a non-inlined filelog python -c 'for x in range(10000): print x' >> data1 for j in 0 1 2 3 4 5 6 7 8 9; do cat data1 >> b - hg commit -m test -d '0 0' + hg commit -m test done echo % "list files in store/data (should show a 'b.d')" for i in .hg/store/data/*; do
--- a/tests/test-clone-failure Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-clone-failure Sun Apr 26 14:29:02 2009 +0200 @@ -53,7 +53,7 @@ hg init c cd c echo c > c -hg commit -A -m test -d '0 0' +hg commit -A -m test chmod -rx .hg/store/data cd .. mkdir d
--- a/tests/test-commit Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-commit Sun Apr 26 14:29:02 2009 +0200 @@ -26,28 +26,28 @@ mkdir dir echo boo > dir/file hg add -hg -v commit -d '0 0' -m commit-9 dir +hg -v commit -m commit-9 dir echo > dir.file hg add -hg commit -d '0 0' -m commit-10 dir dir.file +hg commit -m commit-10 dir dir.file echo >> dir/file mkdir bleh mkdir dir2 cd bleh -hg commit -d '0 0' -m commit-11 . -hg commit -d '0 0' -m commit-12 ../dir ../dir2 -hg -v commit -d '0 0' -m commit-13 ../dir +hg commit -m commit-11 . +hg commit -m commit-12 ../dir ../dir2 +hg -v commit -m commit-13 ../dir cd .. -hg commit -d '0 0' -m commit-14 does-not-exist +hg commit -m commit-14 does-not-exist ln -s foo baz -hg commit -d '0 0' -m commit-15 baz +hg commit -m commit-15 baz touch quux -hg commit -d '0 0' -m commit-16 quux +hg commit -m commit-16 quux echo >> dir/file -hg -v commit -d '0 0' -m commit-17 dir/file +hg -v commit -m commit-17 dir/file # An empty date was interpreted as epoch origin echo foo >> foo hg commit -d '' -m commit-no-date
--- a/tests/test-convert-authormap Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-convert-authormap Sun Apr 26 14:29:02 2009 +0200 @@ -9,7 +9,7 @@ hg init orig cd orig echo foo > foo -HGUSER='user name' hg ci -qAm 'foo' -d '0 0' +HGUSER='user name' hg ci -qAm 'foo' cd .. # Explicit --authors
--- a/tests/test-convert-hg-sink Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-convert-hg-sink Sun Apr 26 14:29:02 2009 +0200 @@ -11,16 +11,16 @@ cd orig echo foo > foo echo bar > bar -hg ci -qAm 'add foo and bar' -d '0 0' +hg ci -qAm 'add foo and bar' hg rm foo -hg ci -m 'remove foo' -d '0 0' +hg ci -m 'remove foo' mkdir foo echo file > foo/file -hg ci -qAm 'add foo/file' -d '0 0' +hg ci -qAm 'add foo/file' -hg tag -d '0 0' some-tag +hg tag some-tag hg log cd ..
--- a/tests/test-copy2 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-copy2 Sun Apr 26 14:29:02 2009 +0200 @@ -17,7 +17,7 @@ hg rm -f bar rm bar hg st -A -hg commit -m1 -d"0 0" +hg commit -m1 echo "# dry-run; should show that foo is clean" hg copy --dry-run foo bar @@ -27,7 +27,7 @@ hg st -C echo "# shouldn't show copy" -hg commit -m2 -d"0 0" +hg commit -m2 hg st -C echo "# should match" @@ -36,7 +36,7 @@ echo bleah > foo echo quux > bar -hg commit -m3 -d"0 0" +hg commit -m3 echo "# should not be renamed" hg debugrename bar @@ -44,7 +44,7 @@ hg copy -f foo bar echo "# should show copy" hg st -C -hg commit -m3 -d"0 0" +hg commit -m3 echo "# should show no parents for tip" hg debugindex .hg/store/data/bar.i
--- a/tests/test-diff-binary-file Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-diff-binary-file Sun Apr 26 14:29:02 2009 +0200 @@ -4,13 +4,13 @@ cd a cp $TESTDIR/binfile.bin . hg add binfile.bin -hg ci -m 'add binfile.bin' -d '0 0' +hg ci -m 'add binfile.bin' echo >> binfile.bin -hg ci -m 'change binfile.bin' -d '0 0' +hg ci -m 'change binfile.bin' hg revert -r 0 binfile.bin -hg ci -m 'revert binfile.bin' -d '0 0' +hg ci -m 'revert binfile.bin' echo % diff -r 0 -r 1 hg diff --nodates -r 0 -r 1
--- a/tests/test-diff-ignore-whitespace Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-diff-ignore-whitespace Sun Apr 26 14:29:02 2009 +0200 @@ -108,7 +108,7 @@ hg init printf 'hello world\ngoodbye world\n' >foo -hg ci -Amfoo -ufoo -d '0 0' +hg ci -Amfoo -ufoo test_added_blank_lines test_added_horizontal_space_first_on_a_line
--- a/tests/test-dispatch Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-dispatch Sun Apr 26 14:29:02 2009 +0200 @@ -6,7 +6,7 @@ hg init a cd a echo a > a -hg ci -Ama -d '0 0' +hg ci -Ama echo "# missing arg" hg cat
--- a/tests/test-dumprevlog Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-dumprevlog Sun Apr 26 14:29:02 2009 +0200 @@ -9,13 +9,13 @@ echo this is file a > a hg add a -hg commit -m first -d '0 0' +hg commit -m first echo adding to file a >> a -hg commit -m second -d '0 0' +hg commit -m second echo adding more to file a >> a -hg commit -m third -d '0 0' +hg commit -m third hg verify
--- a/tests/test-export Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-export Sun Apr 26 14:29:02 2009 +0200 @@ -6,7 +6,7 @@ hg add foo for i in 0 1 2 3 4 5 6 7 8 9 10 11; do echo "foo-$i" >> foo - hg ci -m "foo-$i" -d "0 0" + hg ci -m "foo-$i" done for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do
--- a/tests/test-fncache Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-fncache Sun Apr 26 14:29:02 2009 +0200 @@ -8,7 +8,7 @@ echo "% add a; ci" echo "some text" > a hg add -hg ci -d '0 0' -m first +hg ci -m first echo echo "% cat .hg/store/fncache" @@ -19,7 +19,7 @@ mkdir a.i echo "some other text" > a.i/b hg add -hg ci -d '0 0' -m second +hg ci -m second echo echo "% cat .hg/store/fncache" @@ -30,7 +30,7 @@ mkdir a.i.hg echo "yet another text" > a.i.hg/c hg add -hg ci -d '0 0' -m third +hg ci -m third echo echo "% cat .hg/store/fncache"
--- a/tests/test-git-export Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-git-export Sun Apr 26 14:29:02 2009 +0200 @@ -4,24 +4,24 @@ cd a echo start > start -hg ci -Amstart -d '0 0' +hg ci -Amstart echo new > new -hg ci -Amnew -d '0 0' +hg ci -Amnew echo '% new file' hg diff --git -r 0 hg cp new copy -hg ci -mcopy -d '0 0' +hg ci -mcopy echo '% copy' hg diff --git -r 1:tip hg mv copy rename -hg ci -mrename -d '0 0' +hg ci -mrename echo '% rename' hg diff --git -r 2:tip hg rm rename -hg ci -mdelete -d '0 0' +hg ci -mdelete echo '% delete' hg diff --git -r 3:tip @@ -32,16 +32,16 @@ 4 5 EOF -hg ci -Amsrc -d '0 0' +hg ci -Amsrc chmod +x src -hg ci -munexec -d '0 0' +hg ci -munexec echo '% chmod 644' hg diff --git -r 5:tip hg mv src dst chmod -x dst echo a >> dst -hg ci -mrenamemod -d '0 0' +hg ci -mrenamemod echo '% rename+mod+chmod' hg diff --git -r 6:tip @@ -68,14 +68,14 @@ echo echo '% diff across many revisions' hg mv dst dst2 -hg ci -m 'mv dst dst2' -d '0 0' +hg ci -m 'mv dst dst2' echo >> start -hg ci -m 'change start' -d '0 0' +hg ci -m 'change start' hg revert -r -2 start hg mv dst2 dst3 -hg ci -m 'mv dst2 dst3; revert start' -d '0 0' +hg ci -m 'mv dst2 dst3; revert start' hg diff --git -r 9:11 echo '% reversed' @@ -110,7 +110,7 @@ echo echo '% comparing with the working dir' echo >> start -hg ci -m 'change start again' -d '0 0' +hg ci -m 'change start again' echo > created hg add created
--- a/tests/test-grep Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-grep Sun Apr 26 14:29:02 2009 +0200 @@ -42,14 +42,14 @@ echo blue >> color echo black >> color hg add color -hg ci -m 0 -d '0 0' +hg ci -m 0 echo orange >> color -hg ci -m 1 -d '0 0' +hg ci -m 1 echo black > color -hg ci -m 2 -d '0 0' +hg ci -m 2 echo orange >> color echo blue >> color -hg ci -m 3 -d '0 0' +hg ci -m 3 hg grep orange hg grep --all orange
--- a/tests/test-hgweb Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-hgweb Sun Apr 26 14:29:02 2009 +0200 @@ -6,7 +6,7 @@ mkdir da echo foo > da/foo echo foo > foo -hg ci -Ambase -d '0 0' +hg ci -Ambase hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS echo % manifest
--- a/tests/test-hgweb-commands Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-hgweb-commands Sun Apr 26 14:29:02 2009 +0200 @@ -11,7 +11,7 @@ mkdir da echo foo > da/foo echo foo > foo -hg ci -d'0 0' -Ambase +hg ci -Ambase hg tag 1.0 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log cat hg.pid >> $DAEMON_PIDS
--- a/tests/test-hgweb-no-path-info Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-hgweb-no-path-info Sun Apr 26 14:29:02 2009 +0200 @@ -8,7 +8,7 @@ hg init echo foo > bar hg add bar -hg commit -m "test" -d "0 0" -u "Testing" +hg commit -m "test" -u "Testing" hg tip cat > request.py <<EOF
--- a/tests/test-hgweb-no-request-uri Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-hgweb-no-request-uri Sun Apr 26 14:29:02 2009 +0200 @@ -8,7 +8,7 @@ hg init echo foo > bar hg add bar -hg commit -m "test" -d "0 0" -u "Testing" +hg commit -m "test" -u "Testing" hg tip cat > request.py <<EOF
--- a/tests/test-http Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-http Sun Apr 26 14:29:02 2009 +0200 @@ -5,7 +5,7 @@ hg init test cd test echo foo>foo -hg commit -A -d '0 0' -m 1 +hg commit -A -m 1 hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid hg serve -p $HGPORT1 -d --pid-file=../hg2.pid # Test server address cannot be reused
--- a/tests/test-import Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-import Sun Apr 26 14:29:02 2009 +0200 @@ -5,7 +5,7 @@ mkdir a/d1/d2 echo line 1 > a/a echo line 1 > a/d1/d2/a -hg --cwd a ci -d '0 0' -Ama +hg --cwd a ci -Ama echo line 2 >> a/a hg --cwd a ci -u someone -d '1 0' -m'second change'
--- a/tests/test-issue522 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-issue522 Sun Apr 26 14:29:02 2009 +0200 @@ -10,21 +10,21 @@ cd repo echo foo > foo -hg ci -d '0 0' -qAm 'add foo' +hg ci -qAm 'add foo' echo bar >> foo -hg ci -d '0 0' -m 'change foo' +hg ci -m 'change foo' -hg backout -d '0 0' -r tip -m 'backout changed foo' +hg backout -r tip -m 'backout changed foo' hg up -C 0 touch bar -hg ci -d '0 0' -qAm 'add bar' +hg ci -qAm 'add bar' hg merge --debug hg debugstate | grep foo hg st -A foo -hg ci -d '0 0' -m 'merge' +hg ci -m 'merge' hg manifest --debug | grep foo hg debugindex .hg/store/data/foo.i
--- a/tests/test-issue672 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-issue672 Sun Apr 26 14:29:02 2009 +0200 @@ -11,21 +11,21 @@ touch 1 touch 2 -hg commit -Am init -d "0 0" # 0 +hg commit -Am init # 0 hg rename 1 1a -hg commit -m rename -d "0 0" # 1 +hg commit -m rename # 1 hg co -C 0 echo unrelated >> 2 -hg ci -m unrelated1 -d "0 0" # 2 +hg ci -m unrelated1 # 2 hg merge --debug 1 -hg ci -m merge1 -d "0 0" # 3 +hg ci -m merge1 # 3 hg co -C 2 echo hello >> 1 -hg ci -m unrelated2 -d "0 0" # 4 +hg ci -m unrelated2 # 4 hg co -C 3 hg merge -y --debug 4
--- a/tests/test-keyword Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-keyword Sun Apr 26 14:29:02 2009 +0200 @@ -63,7 +63,7 @@ hg status echo % commit -hg --debug commit -mabsym -d '0 0' -u 'User Name <user@example.com>' +hg --debug commit -mabsym -u 'User Name <user@example.com>' echo % status hg status echo % identify
--- a/tests/test-mactext Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-mactext Sun Apr 26 14:29:02 2009 +0200 @@ -23,10 +23,10 @@ echo hello > f hg add f -hg ci -m 1 -d'0 0' +hg ci -m 1 echo python unix2mac.py f -hg ci -m 2 -d'0 0' +hg ci -m 2 hg cat f | python print.py cat f | python print.py
--- a/tests/test-merge-commit Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-merge-commit Sun Apr 26 14:29:02 2009 +0200 @@ -7,22 +7,22 @@ echo line1 > foo hg add foo -hg ci -m '0: add foo' -d '0 0' +hg ci -m '0: add foo' echo line2 >> foo -hg ci -m '1: change foo' -d '0 0' +hg ci -m '1: change foo' hg up -C 0 hg mv foo bar rm bar echo line0 > bar echo line1 >> bar -hg ci -m '2: mv foo bar; change bar' -d '0 0' +hg ci -m '2: mv foo bar; change bar' hg merge 1 echo '% contents of bar should be line0 line1 line2' cat bar -hg ci -m '3: merge with local rename' -d '0 0' +hg ci -m '3: merge with local rename' hg debugindex .hg/store/data/bar.i hg debugrename bar hg debugindex .hg/store/data/foo.i @@ -31,14 +31,14 @@ hg up -C 2 rm bar echo line1 > bar -hg ci -m '4: revert content change from rev 2' -d '0 0' +hg ci -m '4: revert content change from rev 2' hg log --template '#rev#:#node|short# #parents#\n' echo '% this should use bar@rev2 as the ancestor' hg --debug merge 3 echo '% contents of bar should be line1 line2' cat bar -hg ci -m '5: merge' -d '0 0' +hg ci -m '5: merge' hg debugindex .hg/store/data/bar.i @@ -53,7 +53,7 @@ hg merge 2 echo '% contents of bar should be line0 line1 line2' cat bar -hg ci -m '3: merge with remote rename' -d '0 0' +hg ci -m '3: merge with remote rename' hg debugindex .hg/store/data/bar.i hg debugrename bar hg debugindex .hg/store/data/foo.i @@ -62,13 +62,13 @@ hg up -C 2 rm bar echo line1 > bar -hg ci -m '4: revert content change from rev 2' -d '0 0' +hg ci -m '4: revert content change from rev 2' hg log --template '#rev#:#node|short# #parents#\n' echo '% this should use bar@rev2 as the ancestor' hg --debug merge 3 echo '% contents of bar should be line1 line2' cat bar -hg ci -m '5: merge' -d '0 0' +hg ci -m '5: merge' hg debugindex .hg/store/data/bar.i
--- a/tests/test-merge9 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-merge9 Sun Apr 26 14:29:02 2009 +0200 @@ -8,18 +8,18 @@ echo foo > foo echo a > bar -hg ci -Am 'add foo' -d '0 0' +hg ci -Am 'add foo' hg mv foo baz echo b >> bar echo quux > quux1 -hg ci -Am 'mv foo baz' -d '0 0' +hg ci -Am 'mv foo baz' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 -hg ci -Am 'change foo' -d '0 0' +hg ci -Am 'change foo' # test with the rename on the remote side HGMERGE=false hg merge
--- a/tests/test-mq Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-mq Sun Apr 26 14:29:02 2009 +0200 @@ -251,7 +251,7 @@ hg init refresh cd refresh echo a > a -hg ci -Ama -d'0 0' +hg ci -Ama hg qnew -mfoo foo echo a >> a hg qrefresh @@ -410,14 +410,14 @@ cd strip touch foo hg add foo -hg ci -m 'add foo' -d '0 0' +hg ci -m 'add foo' echo >> foo -hg ci -m 'change foo 1' -d '0 0' +hg ci -m 'change foo 1' hg up -C 0 echo 1 >> foo -hg ci -m 'change foo 2' -d '0 0' +hg ci -m 'change foo 2' HGMERGE=true hg merge -hg ci -m merge -d '0 0' +hg ci -m merge hg log hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' checkundo strip
--- a/tests/test-mq-qpush-fail Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-mq-qpush-fail Sun Apr 26 14:29:02 2009 +0200 @@ -9,7 +9,7 @@ cd repo echo foo > foo -hg ci -Am 'add foo' -d '0 0' +hg ci -Am 'add foo' touch untracked-file echo 'syntax: glob' > .hgignore
--- a/tests/test-non-interactive-wsgi Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-non-interactive-wsgi Sun Apr 26 14:29:02 2009 +0200 @@ -7,7 +7,7 @@ hg init echo foo > bar hg add bar -hg commit -m "test" -d "0 0" +hg commit -m "test" hg tip cat > request.py <<EOF
--- a/tests/test-parentrevspec Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-parentrevspec Sun Apr 26 14:29:02 2009 +0200 @@ -16,7 +16,7 @@ echo >> foo - hg commit -d '0 0' -qAm "$msg" + hg commit -qAm "$msg" } hg init repo
--- a/tests/test-pull-http Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-pull-http Sun Apr 26 14:29:02 2009 +0200 @@ -5,13 +5,13 @@ hg init test cd test echo a > a -hg ci -Ama -d '0 0' +hg ci -Ama cd .. hg clone test test2 cd test2 echo a >> a -hg ci -mb -d '0 0' +hg ci -mb echo % expect error, cloning not allowed echo '[web]' > .hg/hgrc
--- a/tests/test-pull-r Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-pull-r Sun Apr 26 14:29:02 2009 +0200 @@ -3,12 +3,12 @@ hg init repo cd repo echo foo > foo -hg ci -qAm 'add foo' -d '0 0' +hg ci -qAm 'add foo' echo >> foo -hg ci -m 'change foo' -d '0 0' +hg ci -m 'change foo' hg up -qC 0 echo bar > bar -hg ci -qAm 'add bar' -d '0 0' +hg ci -qAm 'add bar' hg log cd .. hg init copy
--- a/tests/test-push-http Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-push-http Sun Apr 26 14:29:02 2009 +0200 @@ -5,13 +5,13 @@ hg init test cd test echo a > a -hg ci -Ama -d '0 0' +hg ci -Ama cd .. hg clone test test2 cd test2 echo a >> a -hg ci -mb -d '0 0' +hg ci -mb req() { hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
--- a/tests/test-qrecord Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-qrecord Sun Apr 26 14:29:02 2009 +0200 @@ -47,7 +47,7 @@ EOF hg add 1.txt 2.txt dir/a.txt -hg commit -d '0 0' -m 'initial checkin' +hg commit -m 'initial checkin' echo % changing files
--- a/tests/test-rename-dir-merge Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-rename-dir-merge Sun Apr 26 14:29:02 2009 +0200 @@ -7,27 +7,27 @@ mkdir a echo foo > a/a echo bar > a/b -hg ci -Am "0" -d "0 0" +hg ci -Am "0" hg co -C 0 hg mv a b -hg ci -m "1 mv a/ b/" -d "0 0" +hg ci -m "1 mv a/ b/" hg co -C 0 echo baz > a/c echo quux > a/d hg add a/c -hg ci -m "2 add a/c" -d "0 0" +hg ci -m "2 add a/c" hg merge --debug 1 echo a/* b/* hg st -C -hg ci -m "3 merge 2+1" -d "0 0" +hg ci -m "3 merge 2+1" hg debugrename b/c hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C -hg ci -m "4 merge 1+2" -d "0 0" +hg ci -m "4 merge 1+2" hg debugrename b/c
--- a/tests/test-rename-merge1 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-rename-merge1 Sun Apr 26 14:29:02 2009 +0200 @@ -8,20 +8,20 @@ echo foo > a echo foo > a2 hg add a a2 -hg ci -m "start" -d "0 0" +hg ci -m "start" hg mv a b hg mv a2 b2 -hg ci -m "rename" -d "0 0" +hg ci -m "rename" echo "checkout" hg co 0 echo blahblah > a echo blahblah > a2 hg mv a2 c2 -hg ci -m "modify" -d "0 0" +hg ci -m "modify" echo "merge" hg merge -y --debug hg status -AC cat b -hg ci -m "merge" -d "0 0" +hg ci -m "merge" hg debugindex .hg/store/data/b.i -hg debugrename b \ No newline at end of file +hg debugrename b
--- a/tests/test-rename-merge2 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-rename-merge2 Sun Apr 26 14:29:02 2009 +0200 @@ -30,18 +30,18 @@ echo base > a echo base > rev # used to force commits hg add a rev - hg ci -m "base" -d "0 0" + hg ci -m "base" # remote echo remote > rev if [ "$2" != "" ] ; then $2 ; fi - hg ci -m "remote" -d "0 0" + hg ci -m "remote" # local hg co -q 0 echo local > rev if [ "$1" != "" ] ; then $1 ; fi - hg ci -m "local" -d "0 0" + hg ci -m "local" # working dir echo local > rev @@ -56,7 +56,7 @@ echo "--------------" hg status -camC -X rev - hg ci -m "merge" -d "0 0" + hg ci -m "merge" echo "--------------" echo
--- a/tests/test-resolve Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-resolve Sun Apr 26 14:29:02 2009 +0200 @@ -6,22 +6,22 @@ cd repo echo foo > file -hg commit -Am 'add file' -d '0 0' +hg commit -Am 'add file' echo bar >> file -hg commit -Am 'append bar' -d '0 0' +hg commit -Am 'append bar' echo % create a second head hg up -C 0 echo baz >> file -hg commit -Am 'append baz' -d '0 0' +hg commit -Am 'append baz' echo % failing merge HGMERGE=internal:fail hg merge echo resolved > file hg resolve -m file -hg commit -m 'resolved' -d '0 0' +hg commit -m 'resolved' echo % resolve -l, should be empty hg resolve -l
--- a/tests/test-strict Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-strict Sun Apr 26 14:29:02 2009 +0200 @@ -3,7 +3,7 @@ hg init echo a > a -hg ci -d '0 0' -Ama +hg ci -Ama hg an a
--- a/tests/test-transplant Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-transplant Sun Apr 26 14:29:02 2009 +0200 @@ -73,7 +73,7 @@ baz EOF echo toremove > toremove -hg ci -Amfoo -d '0 0' +hg ci -Amfoo cat <<EOF > foo foo2 bar2 @@ -81,14 +81,14 @@ EOF rm toremove echo added > added -hg ci -Amfoo2 -d '0 0' +hg ci -Amfoo2 echo bar > bar -hg ci -Ambar -d '0 0' +hg ci -Ambar echo bar2 >> bar -hg ci -mbar2 -d '0 0' +hg ci -mbar2 hg up 0 echo foobar > foo -hg ci -mfoobar -d '0 0' +hg ci -mfoobar hg transplant 1:3 # transplant -c shouldn't use an old changeset hg up -C
--- a/tests/test-url-rev Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-url-rev Sun Apr 26 14:29:02 2009 +0200 @@ -4,10 +4,10 @@ hg init repo cd repo echo a > a -hg ci -qAm 'add a' -d '0 0' +hg ci -qAm 'add a' hg branch foo echo >> a -hg ci -m 'change a' -d '0 0' +hg ci -m 'change a' cd .. echo '% clone repo#foo' @@ -22,10 +22,10 @@ echo '% changing original repo' cd repo echo >> a -hg ci -m 'new head of branch foo' -d '0 0' +hg ci -m 'new head of branch foo' hg up -qC default echo bar > bar -hg ci -qAm 'add bar' -d '0 0' +hg ci -qAm 'add bar' hg log echo
--- a/tests/test-verify Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-verify Sun Apr 26 14:29:02 2009 +0200 @@ -7,7 +7,7 @@ echo "another text" > bar.txt echo "more text" > QUICK.txt hg add -hg ci -d '0 0' -mtest1 +hg ci -mtest1 echo echo % verify
--- a/tests/test-win32text Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-win32text Sun Apr 26 14:29:02 2009 +0200 @@ -26,7 +26,7 @@ echo hello > f hg add f echo commit should succeed -hg ci -m 1 -d'0 0' +hg ci -m 1 echo hg clone . ../zoz @@ -34,14 +34,14 @@ python unix2dos.py f echo commit should fail -hg ci -m 2.1 -d'0 0' +hg ci -m 2.1 echo mv .hg/hgrc .hg/hgrc.bak echo commits should succeed -hg ci -m 2 -d'0 0' +hg ci -m 2 hg cp f g -hg ci -m 2.2 -d'0 0' +hg ci -m 2.2 echo echo push should fail @@ -52,7 +52,7 @@ echo hello > f hg rm g echo commit should succeed -hg ci -m 2.3 -d'0 0' +hg ci -m 2.3 echo echo push should succeed @@ -64,18 +64,18 @@ echo hello > d/f2 python unix2dos.py d/f2 hg add d/f2 -hg ci -m 3 -d'0 0' +hg ci -m 3 hg revert -a rm d/f2 echo hg rem f -hg ci -m 4 -d'0 0' +hg ci -m 4 echo python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' hg add bin -hg ci -m 5 -d'0 0' +hg ci -m 5 hg log -v echo @@ -84,9 +84,9 @@ for x in a b c d; do echo content > dupe/$x; done hg -R dupe add python unix2dos.py dupe/b dupe/c dupe/d -hg -R dupe ci -m a -d'0 0' dupe/a -hg -R dupe ci -m b/c -d'0 0' dupe/[bc] -hg -R dupe ci -m d -d'0 0' dupe/d +hg -R dupe ci -m a dupe/a +hg -R dupe ci -m b/c dupe/[bc] +hg -R dupe ci -m d dupe/d hg -R dupe log -v echo @@ -100,7 +100,7 @@ (echo some; echo text) > f3 python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")' hg add f3 f4.bat -hg ci -m 6 -d'0 0' +hg ci -m 6 python print.py < bin python print.py < f3 @@ -125,7 +125,7 @@ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' hg add f5.sh -hg ci -m 7 -d'0 0' +hg ci -m 7 python print.py < f5.sh hg cat f5.sh | python print.py