Show More
@@ -1,60 +1,61 b'' | |||
|
1 | 1 | #!/bin/bash |
|
2 | 2 | |
|
3 | 3 | set -e |
|
4 | 4 | |
|
5 | 5 | tests=0 |
|
6 | 6 | failed=0 |
|
7 | 7 | H=$PWD |
|
8 | 8 | |
|
9 | 9 | function run_one |
|
10 | 10 | { |
|
11 | export TZ=GMT | |
|
11 | 12 | D=`mktemp -d` |
|
12 | 13 | if [ "$D" == "" ] ; then |
|
13 | 14 | echo mktemp failed! |
|
14 | 15 | fi |
|
15 | 16 | |
|
16 | 17 | cd $D |
|
17 | 18 | fail=0 |
|
18 | 19 | |
|
19 | 20 | if ! $H/$f > .out 2>&1 ; then |
|
20 | 21 | echo $f failed with error code $? |
|
21 | 22 | fail=1 |
|
22 | 23 | fi |
|
23 | 24 | |
|
24 | 25 | if [ -s .out -a ! -r $H/$f.out ] ; then |
|
25 | 26 | echo $f generated unexpected output: |
|
26 | 27 | cat .out |
|
27 | 28 | cp .out $H/$f.err |
|
28 | 29 | fail=1 |
|
29 | 30 | elif [ -r $H/$f.out ] && ! diff -u $H/$f.out .out > /dev/null ; then |
|
30 | 31 | echo $f output changed: |
|
31 | 32 | diff -u $H/$f.out .out && true |
|
32 | 33 | cp .out $H/$f.err |
|
33 | 34 | fail=1 |
|
34 | 35 | fi |
|
35 | 36 | |
|
36 | 37 | cd $H |
|
37 | 38 | rm -r $D |
|
38 | 39 | return $fail |
|
39 | 40 | } |
|
40 | 41 | |
|
41 | 42 | TESTS=$@ |
|
42 | 43 | if [ "$TESTS" == "" ] ; then |
|
43 | 44 | TESTS=`ls test-* | grep -Ev "\.|~"` |
|
44 | 45 | fi |
|
45 | 46 | |
|
46 | 47 | for f in $TESTS ; do |
|
47 | 48 | echo -n "." |
|
48 | 49 | if ! run_one $f ; then |
|
49 | 50 | failed=$[$failed + 1] |
|
50 | 51 | fi |
|
51 | 52 | tests=$[$tests + 1] |
|
52 | 53 | done |
|
53 | 54 | |
|
54 | 55 | echo |
|
55 | 56 | echo Ran $tests tests, $failed failed |
|
56 | 57 | |
|
57 | 58 | if [ $failed -gt 0 ] ; then |
|
58 | 59 | exit 1 |
|
59 | 60 | fi |
|
60 | 61 |
@@ -1,22 +1,22 b'' | |||
|
1 | 1 | + mkdir t |
|
2 | 2 | + cd t |
|
3 | 3 | + hg init |
|
4 | 4 | + echo a |
|
5 | 5 | + hg add a |
|
6 | 6 | + hg commit -t test -u test -d '0 0' |
|
7 | 7 | + hg history |
|
8 | 8 | changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
9 | 9 | user: test |
|
10 |
date: |
|
|
10 | date: Thu Jan 1 00:00:00 1970 | |
|
11 | 11 | summary: test |
|
12 | 12 | |
|
13 | 13 | + hg manifest |
|
14 | 14 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
|
15 | 15 | + hg cat a |
|
16 | 16 | a |
|
17 | 17 | + hg verify |
|
18 | 18 | checking changesets |
|
19 | 19 | checking manifests |
|
20 | 20 | crosschecking files in changesets and manifests |
|
21 | 21 | checking files |
|
22 | 22 | 1 files, 1 changesets, 1 total revisions |
@@ -1,51 +1,51 b'' | |||
|
1 | 1 | + hg init |
|
2 | 2 | + echo a |
|
3 | 3 | + hg add a |
|
4 | 4 | + hg commit -t 1 -u test -d '0 0' |
|
5 | 5 | + hg status |
|
6 | 6 | ? .out |
|
7 | 7 | + cp a b |
|
8 | 8 | + hg copy a b |
|
9 | 9 | + hg status |
|
10 | 10 | A b |
|
11 | 11 | ? .out |
|
12 | 12 | + hg -d commit -t 2 -u test -d '0 0' |
|
13 | 13 | b |
|
14 | 14 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
15 | 15 | + hg history |
|
16 | 16 | changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8 |
|
17 | 17 | user: test |
|
18 |
date: |
|
|
18 | date: Thu Jan 1 00:00:00 1970 | |
|
19 | 19 | summary: 2 |
|
20 | 20 | |
|
21 | 21 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
22 | 22 | user: test |
|
23 |
date: |
|
|
23 | date: Thu Jan 1 00:00:00 1970 | |
|
24 | 24 | summary: 1 |
|
25 | 25 | |
|
26 | 26 | + hg log a |
|
27 | 27 | revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
28 | 28 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
29 | 29 | user: test |
|
30 |
date: |
|
|
30 | date: Thu Jan 1 00:00:00 1970 | |
|
31 | 31 | summary: 1 |
|
32 | 32 | |
|
33 | 33 | + hexdump -C .hg/data/b.d |
|
34 | 34 | 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789| |
|
35 | 35 | 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c| |
|
36 | 36 | 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b| |
|
37 | 37 | 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a| |
|
38 | 38 | 00000040 0a |.| |
|
39 | 39 | 00000041 |
|
40 | 40 | + hg cat b |
|
41 | 41 | + md5sum |
|
42 | 42 | 60b725f10c9c85c70d97880dfe8191b3 - |
|
43 | 43 | + hg cat a |
|
44 | 44 | + md5sum |
|
45 | 45 | 60b725f10c9c85c70d97880dfe8191b3 - |
|
46 | 46 | + hg verify |
|
47 | 47 | checking changesets |
|
48 | 48 | checking manifests |
|
49 | 49 | crosschecking files in changesets and manifests |
|
50 | 50 | checking files |
|
51 | 51 | 2 files, 2 changesets, 2 total revisions |
@@ -1,24 +1,24 b'' | |||
|
1 | 1 | #!/bin/bash |
|
2 | 2 | |
|
3 | 3 | set -e |
|
4 | 4 | |
|
5 | 5 | mkdir test |
|
6 | 6 | cd test |
|
7 | 7 | echo foo>foo |
|
8 | 8 | hg init |
|
9 | 9 | hg addremove |
|
10 | 10 | hg commit -t "1" |
|
11 | 11 | hg verify |
|
12 | hg serve 2>/dev/null & | |
|
12 | hg serve -p 20059 2>/dev/null & | |
|
13 | 13 | C=$! |
|
14 | 14 | cd .. |
|
15 | 15 | |
|
16 | 16 | mkdir copy |
|
17 | 17 | cd copy |
|
18 |
hg init http://localhost: |
|
|
18 | hg init http://localhost:20059/ | |
|
19 | 19 | hg verify |
|
20 | 20 | hg co |
|
21 | 21 | cat foo |
|
22 | 22 | hg manifest |
|
23 | 23 | |
|
24 | 24 | kill $C |
@@ -1,30 +1,30 b'' | |||
|
1 | 1 | + mkdir t |
|
2 | 2 | + cd t |
|
3 | 3 | + hg init |
|
4 | 4 | + echo a |
|
5 | 5 | + hg add a |
|
6 | 6 | + hg commit -t test -u test -d '0 0' |
|
7 | 7 | + hg verify |
|
8 | 8 | checking changesets |
|
9 | 9 | checking manifests |
|
10 | 10 | crosschecking files in changesets and manifests |
|
11 | 11 | checking files |
|
12 | 12 | 1 files, 1 changesets, 1 total revisions |
|
13 | 13 | + hg parents |
|
14 | 14 | changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
15 | 15 | user: test |
|
16 |
date: |
|
|
16 | date: Thu Jan 1 00:00:00 1970 | |
|
17 | 17 | summary: test |
|
18 | 18 | |
|
19 | 19 | + hg status |
|
20 | 20 | + hg undo |
|
21 | 21 | attempting to rollback last transaction |
|
22 | 22 | + hg verify |
|
23 | 23 | checking changesets |
|
24 | 24 | checking manifests |
|
25 | 25 | crosschecking files in changesets and manifests |
|
26 | 26 | checking files |
|
27 | 27 | 0 files, 0 changesets, 0 total revisions |
|
28 | 28 | + hg parents |
|
29 | 29 | + hg status |
|
30 | 30 | A a |
@@ -1,70 +1,70 b'' | |||
|
1 | 1 | + mkdir r1 |
|
2 | 2 | + cd r1 |
|
3 | 3 | + hg init |
|
4 | 4 | + echo a |
|
5 | 5 | + hg addremove |
|
6 | 6 | + hg commit -t 1 -u test -d '0 0' |
|
7 | 7 | + cd .. |
|
8 | 8 | + mkdir r2 |
|
9 | 9 | + cd r2 |
|
10 | 10 | + hg init ../r1 |
|
11 | 11 | + hg up |
|
12 | 12 | + echo abc |
|
13 | 13 | + hg diff |
|
14 | 14 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
15 | 15 | --- a/a |
|
16 | 16 | +++ b/a |
|
17 | 17 | @@ -1,1 +1,1 @@ |
|
18 | 18 | -a |
|
19 | 19 | +abc |
|
20 | 20 | + cd ../r1 |
|
21 | 21 | + echo b |
|
22 | 22 | + echo a2 |
|
23 | 23 | + hg addremove |
|
24 | 24 | + hg commit -t 2 -u test -d '0 0' |
|
25 | 25 | + cd ../r2 |
|
26 | 26 | + hg -q pull ../r1 |
|
27 | 27 | + hg status |
|
28 | 28 | C a |
|
29 | 29 | + hg -d up |
|
30 | 30 | resolving manifests |
|
31 | 31 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
32 | 32 | a versions differ, resolve |
|
33 | 33 | remote created b |
|
34 | 34 | getting b |
|
35 | 35 | merging a |
|
36 | 36 | resolving a |
|
37 | 37 | file a: other d730145abbf9 ancestor b789fdd96dc2 |
|
38 | 38 | + hg -d up -m |
|
39 | 39 | resolving manifests |
|
40 | 40 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
|
41 | 41 | + hg parents |
|
42 | 42 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
43 | 43 | user: test |
|
44 |
date: |
|
|
44 | date: Thu Jan 1 00:00:00 1970 | |
|
45 | 45 | summary: 2 |
|
46 | 46 | |
|
47 | 47 | + hg -v history |
|
48 | 48 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
49 | 49 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
|
50 | 50 | user: test |
|
51 |
date: |
|
|
51 | date: Thu Jan 1 00:00:00 1970 | |
|
52 | 52 | files: a b |
|
53 | 53 | description: |
|
54 | 54 | 2 |
|
55 | 55 | |
|
56 | 56 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
57 | 57 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
58 | 58 | user: test |
|
59 |
date: |
|
|
59 | date: Thu Jan 1 00:00:00 1970 | |
|
60 | 60 | files: a |
|
61 | 61 | description: |
|
62 | 62 | 1 |
|
63 | 63 | |
|
64 | 64 | + hg diff |
|
65 | 65 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
66 | 66 | --- a/a |
|
67 | 67 | +++ b/a |
|
68 | 68 | @@ -1,1 +1,1 @@ |
|
69 | 69 | -a2 |
|
70 | 70 | +abc |
General Comments 0
You need to be logged in to leave comments.
Login now