# HG changeset patch # User Pradeepkumar Gayam # Date 1282014511 -19800 # Node ID 106311e7740ff350cce0ba43fe1b14495559dea7 # Parent 7d2ea5ce4aace67e299a99e6292b379686b1bde9 tests: unify test-copy2 diff -r 7d2ea5ce4aac -r 106311e7740f tests/test-copy2 --- a/tests/test-copy2 Sun Aug 15 13:29:46 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -#!/bin/sh - -hg init -echo foo > foo -echo "# should fail - foo is not managed" -hg mv foo bar -hg st -A -hg add foo -echo "# dry-run; print a warning that this is not a real copy; foo is added" -hg mv --dry-run foo bar -hg st -A -echo "# should print a warning that this is not a real copy; bar is added" -hg mv foo bar -hg st -A -echo "# should print a warning that this is not a real copy; foo is added" -hg cp bar foo -hg rm -f bar -rm bar -hg st -A -hg commit -m1 - -echo "# copy --after to a nonexistant target filename" -hg cp -A foo dummy - -echo "# dry-run; should show that foo is clean" -hg copy --dry-run foo bar -hg st -A -echo "# should show copy" -hg copy foo bar -hg st -C - -echo "# shouldn't show copy" -hg commit -m2 -hg st -C - -echo "# should match" -hg debugindex .hg/store/data/foo.i -hg debugrename bar - -echo bleah > foo -echo quux > bar -hg commit -m3 - -echo "# should not be renamed" -hg debugrename bar - -hg copy -f foo bar -echo "# should show copy" -hg st -C -hg commit -m3 - -echo "# should show no parents for tip" -hg debugindex .hg/store/data/bar.i -echo "# should match" -hg debugindex .hg/store/data/foo.i -hg debugrename bar - -echo "# should show no copies" -hg st -C - -echo "# copy --after on an added file" -cp bar baz -hg add baz -hg cp -A bar baz -hg st -C - -echo "# foo was clean:" -hg st -AC foo -echo "# but it's considered modified after a copy --after --force" -hg copy -Af bar foo -hg st -AC foo - -exit 0 diff -r 7d2ea5ce4aac -r 106311e7740f tests/test-copy2.out --- a/tests/test-copy2.out Sun Aug 15 13:29:46 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -# should fail - foo is not managed -foo: not copying - file is not managed -abort: no files to copy -? foo -# dry-run; print a warning that this is not a real copy; foo is added -foo has not been committed yet, so no copy data will be stored for bar. -A foo -# should print a warning that this is not a real copy; bar is added -foo has not been committed yet, so no copy data will be stored for bar. -A bar -# should print a warning that this is not a real copy; foo is added -bar has not been committed yet, so no copy data will be stored for foo. -A foo -# copy --after to a nonexistant target filename -foo: not recording copy - dummy does not exist -# dry-run; should show that foo is clean -C foo -# should show copy -A bar - foo -# shouldn't show copy -# should match - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 -bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd -# should not be renamed -bar not renamed -# should show copy -M bar - foo -# should show no parents for tip - rev offset length base linkrev nodeid p1 p2 - 0 0 69 0 1 7711d36246cc 000000000000 000000000000 - 1 69 6 1 2 bdf70a2b8d03 7711d36246cc 000000000000 - 2 75 81 1 3 b2558327ea8d 000000000000 000000000000 -# should match - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 - 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 -bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 -# should show no copies -# copy --after on an added file -A baz - bar -# foo was clean: -C foo -# but it's considered modified after a copy --after --force -M foo - bar diff -r 7d2ea5ce4aac -r 106311e7740f tests/test-copy2.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-copy2.t Tue Aug 17 08:38:31 2010 +0530 @@ -0,0 +1,103 @@ + $ hg init + $ echo foo > foo +should fail - foo is not managed + $ hg mv foo bar + foo: not copying - file is not managed + abort: no files to copy + $ hg st -A + ? foo + $ hg add foo +dry-run; print a warning that this is not a real copy; foo is added + $ hg mv --dry-run foo bar + foo has not been committed yet, so no copy data will be stored for bar. + $ hg st -A + A foo +should print a warning that this is not a real copy; bar is added + $ hg mv foo bar + foo has not been committed yet, so no copy data will be stored for bar. + $ hg st -A + A bar +should print a warning that this is not a real copy; foo is added + $ hg cp bar foo + bar has not been committed yet, so no copy data will be stored for foo. + $ hg rm -f bar + $ rm bar + $ hg st -A + A foo + $ hg commit -m1 + +copy --after to a nonexistant target filename + $ hg cp -A foo dummy + foo: not recording copy - dummy does not exist + +dry-run; should show that foo is clean + $ hg copy --dry-run foo bar + $ hg st -A + C foo +should show copy + $ hg copy foo bar + $ hg st -C + A bar + foo + +shouldn't show copy + $ hg commit -m2 + $ hg st -C + +should match + $ hg debugindex .hg/store/data/foo.i + rev offset length base linkrev nodeid p1 p2 + 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 + $ hg debugrename bar + bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd + + $ echo bleah > foo + $ echo quux > bar + $ hg commit -m3 + +should not be renamed + $ hg debugrename bar + bar not renamed + + $ hg copy -f foo bar +should show copy + $ hg st -C + M bar + foo + $ hg commit -m3 + +should show no parents for tip + $ hg debugindex .hg/store/data/bar.i + rev offset length base linkrev nodeid p1 p2 + 0 0 69 0 1 7711d36246cc 000000000000 000000000000 + 1 69 6 1 2 bdf70a2b8d03 7711d36246cc 000000000000 + 2 75 81 1 3 b2558327ea8d 000000000000 000000000000 +should match + $ hg debugindex .hg/store/data/foo.i + rev offset length base linkrev nodeid p1 p2 + 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 + 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 + $ hg debugrename bar + bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 + +should show no copies + $ hg st -C + +copy --after on an added file + $ cp bar baz + $ hg add baz + $ hg cp -A bar baz + $ hg st -C + A baz + bar + +foo was clean: + $ hg st -AC foo + C foo +but it's considered modified after a copy --after --force + $ hg copy -Af bar foo + $ hg st -AC foo + M foo + bar + + $ exit 0