##// END OF EJS Templates
tests: removed redundant "-d '0 0'" from test scripts...
Martin Geisler -
r8167:6c82beaa default
parent child Browse files
Show More
@@ -42,16 +42,16 b' cd ..'
42 hg init branch
42 hg init branch
43 cd branch
43 cd branch
44 echo a > a
44 echo a > a
45 hg ci -Am0 -d '0 0'
45 hg ci -Am0
46 echo b > b
46 echo b > b
47 hg ci -Am1 -d '0 0'
47 hg ci -Am1
48 hg co -C 0
48 hg co -C 0
49 # should fail
49 # should fail
50 hg backout -d '0 0' 1
50 hg backout 1
51 echo c > c
51 echo c > c
52 hg ci -Am2 -d '0 0'
52 hg ci -Am2
53 # should fail
53 # should fail
54 hg backout -d '0 0' 1
54 hg backout 1
55
55
56 echo '# backout with merge'
56 echo '# backout with merge'
57 cd ..
57 cd ..
@@ -14,17 +14,17 b' echo % initialize repository'
14 hg init
14 hg init
15
15
16 echo 'a' > a
16 echo 'a' > a
17 hg ci -A -d '0 0' -u test -m "0"
17 hg ci -A -u test -m "0"
18
18
19 echo 'b' > b
19 echo 'b' > b
20 hg ci -A -d '0 0' -u test -m "1"
20 hg ci -A -u test -m "1"
21
21
22 hg up 0
22 hg up 0
23 echo 'c' > c
23 echo 'c' > c
24 hg ci -A -d '0 0' -u test -m "2"
24 hg ci -A -u test -m "2"
25
25
26 echo 'd' > d
26 echo 'd' > d
27 hg ci -A -d '0 0' -u test -m "3"
27 hg ci -A -u test -m "3"
28
28
29 hg bookmark -r 1 one
29 hg bookmark -r 1 one
30 hg bookmark -r 3 two
30 hg bookmark -r 3 two
@@ -35,4 +35,4 b' hg bookmark'
35 echo % rebase
35 echo % rebase
36 hg rebase -s two -d one 2>&1 | cleanoutput
36 hg rebase -s two -d one 2>&1 | cleanoutput
37
37
38 hg log No newline at end of file
38 hg log
@@ -117,14 +117,14 b' hg init orig'
117 cd orig
117 cd orig
118 echo foo > foo
118 echo foo > foo
119 hg add foo
119 hg add foo
120 hg ci -m 'add foo' -d '0 0'
120 hg ci -m 'add foo'
121
121
122 hg clone . ../copy
122 hg clone . ../copy
123 hg tag -d '0 0' foo
123 hg tag foo
124
124
125 cd ../copy
125 cd ../copy
126 echo >> foo
126 echo >> foo
127 hg ci -m 'change foo' -d '0 0'
127 hg ci -m 'change foo'
128 hg bundle ../bundle.hg ../orig
128 hg bundle ../bundle.hg ../orig
129
129
130 cd ../orig
130 cd ../orig
@@ -8,23 +8,23 b''
8 hg init repo
8 hg init repo
9 cd repo
9 cd repo
10 echo foo > foo
10 echo foo > foo
11 hg ci -qAm 'add foo' -d '0 0'
11 hg ci -qAm 'add foo'
12
12
13 echo bar > bar
13 echo bar > bar
14 chmod +x bar
14 chmod +x bar
15 hg ci -qAm 'add bar' -d '0 0'
15 hg ci -qAm 'add bar'
16 echo '% manifest of p2:'
16 echo '% manifest of p2:'
17 hg manifest
17 hg manifest
18 echo
18 echo
19
19
20 hg up -qC 0
20 hg up -qC 0
21 echo >> foo
21 echo >> foo
22 hg ci -m 'change foo' -d '0 0'
22 hg ci -m 'change foo'
23 echo '% manifest of p1:'
23 echo '% manifest of p1:'
24 hg manifest
24 hg manifest
25
25
26 hg merge
26 hg merge
27 hg ci -m 'merge' -d '0 0'
27 hg ci -m 'merge'
28
28
29 echo '% this should not mention bar:'
29 echo '% this should not mention bar:'
30 hg tip -v
30 hg tip -v
@@ -7,14 +7,14 b' cd a'
7 hg init
7 hg init
8 echo a > a
8 echo a > a
9 hg add a
9 hg add a
10 hg commit -m test -d '0 0'
10 hg commit -m test
11 echo first line > b
11 echo first line > b
12 hg add b
12 hg add b
13 # create a non-inlined filelog
13 # create a non-inlined filelog
14 python -c 'for x in range(10000): print x' >> data1
14 python -c 'for x in range(10000): print x' >> data1
15 for j in 0 1 2 3 4 5 6 7 8 9; do
15 for j in 0 1 2 3 4 5 6 7 8 9; do
16 cat data1 >> b
16 cat data1 >> b
17 hg commit -m test -d '0 0'
17 hg commit -m test
18 done
18 done
19 echo % "list files in store/data (should show a 'b.d')"
19 echo % "list files in store/data (should show a 'b.d')"
20 for i in .hg/store/data/*; do
20 for i in .hg/store/data/*; do
@@ -53,7 +53,7 b' echo $?'
53 hg init c
53 hg init c
54 cd c
54 cd c
55 echo c > c
55 echo c > c
56 hg commit -A -m test -d '0 0'
56 hg commit -A -m test
57 chmod -rx .hg/store/data
57 chmod -rx .hg/store/data
58 cd ..
58 cd ..
59 mkdir d
59 mkdir d
@@ -26,28 +26,28 b' hg -q revert -a --no-backup'
26 mkdir dir
26 mkdir dir
27 echo boo > dir/file
27 echo boo > dir/file
28 hg add
28 hg add
29 hg -v commit -d '0 0' -m commit-9 dir
29 hg -v commit -m commit-9 dir
30
30
31 echo > dir.file
31 echo > dir.file
32 hg add
32 hg add
33 hg commit -d '0 0' -m commit-10 dir dir.file
33 hg commit -m commit-10 dir dir.file
34
34
35 echo >> dir/file
35 echo >> dir/file
36 mkdir bleh
36 mkdir bleh
37 mkdir dir2
37 mkdir dir2
38 cd bleh
38 cd bleh
39 hg commit -d '0 0' -m commit-11 .
39 hg commit -m commit-11 .
40 hg commit -d '0 0' -m commit-12 ../dir ../dir2
40 hg commit -m commit-12 ../dir ../dir2
41 hg -v commit -d '0 0' -m commit-13 ../dir
41 hg -v commit -m commit-13 ../dir
42 cd ..
42 cd ..
43
43
44 hg commit -d '0 0' -m commit-14 does-not-exist
44 hg commit -m commit-14 does-not-exist
45 ln -s foo baz
45 ln -s foo baz
46 hg commit -d '0 0' -m commit-15 baz
46 hg commit -m commit-15 baz
47 touch quux
47 touch quux
48 hg commit -d '0 0' -m commit-16 quux
48 hg commit -m commit-16 quux
49 echo >> dir/file
49 echo >> dir/file
50 hg -v commit -d '0 0' -m commit-17 dir/file
50 hg -v commit -m commit-17 dir/file
51 # An empty date was interpreted as epoch origin
51 # An empty date was interpreted as epoch origin
52 echo foo >> foo
52 echo foo >> foo
53 hg commit -d '' -m commit-no-date
53 hg commit -d '' -m commit-no-date
@@ -9,7 +9,7 b' EOF'
9 hg init orig
9 hg init orig
10 cd orig
10 cd orig
11 echo foo > foo
11 echo foo > foo
12 HGUSER='user name' hg ci -qAm 'foo' -d '0 0'
12 HGUSER='user name' hg ci -qAm 'foo'
13 cd ..
13 cd ..
14
14
15 # Explicit --authors
15 # Explicit --authors
@@ -11,16 +11,16 b' hg init orig'
11 cd orig
11 cd orig
12 echo foo > foo
12 echo foo > foo
13 echo bar > bar
13 echo bar > bar
14 hg ci -qAm 'add foo and bar' -d '0 0'
14 hg ci -qAm 'add foo and bar'
15
15
16 hg rm foo
16 hg rm foo
17 hg ci -m 'remove foo' -d '0 0'
17 hg ci -m 'remove foo'
18
18
19 mkdir foo
19 mkdir foo
20 echo file > foo/file
20 echo file > foo/file
21 hg ci -qAm 'add foo/file' -d '0 0'
21 hg ci -qAm 'add foo/file'
22
22
23 hg tag -d '0 0' some-tag
23 hg tag some-tag
24
24
25 hg log
25 hg log
26 cd ..
26 cd ..
@@ -17,7 +17,7 b' hg cp bar foo'
17 hg rm -f bar
17 hg rm -f bar
18 rm bar
18 rm bar
19 hg st -A
19 hg st -A
20 hg commit -m1 -d"0 0"
20 hg commit -m1
21
21
22 echo "# dry-run; should show that foo is clean"
22 echo "# dry-run; should show that foo is clean"
23 hg copy --dry-run foo bar
23 hg copy --dry-run foo bar
@@ -27,7 +27,7 b' hg copy foo bar'
27 hg st -C
27 hg st -C
28
28
29 echo "# shouldn't show copy"
29 echo "# shouldn't show copy"
30 hg commit -m2 -d"0 0"
30 hg commit -m2
31 hg st -C
31 hg st -C
32
32
33 echo "# should match"
33 echo "# should match"
@@ -36,7 +36,7 b' hg debugrename bar'
36
36
37 echo bleah > foo
37 echo bleah > foo
38 echo quux > bar
38 echo quux > bar
39 hg commit -m3 -d"0 0"
39 hg commit -m3
40
40
41 echo "# should not be renamed"
41 echo "# should not be renamed"
42 hg debugrename bar
42 hg debugrename bar
@@ -44,7 +44,7 b' hg debugrename bar'
44 hg copy -f foo bar
44 hg copy -f foo bar
45 echo "# should show copy"
45 echo "# should show copy"
46 hg st -C
46 hg st -C
47 hg commit -m3 -d"0 0"
47 hg commit -m3
48
48
49 echo "# should show no parents for tip"
49 echo "# should show no parents for tip"
50 hg debugindex .hg/store/data/bar.i
50 hg debugindex .hg/store/data/bar.i
@@ -4,13 +4,13 b' hg init a'
4 cd a
4 cd a
5 cp $TESTDIR/binfile.bin .
5 cp $TESTDIR/binfile.bin .
6 hg add binfile.bin
6 hg add binfile.bin
7 hg ci -m 'add binfile.bin' -d '0 0'
7 hg ci -m 'add binfile.bin'
8
8
9 echo >> binfile.bin
9 echo >> binfile.bin
10 hg ci -m 'change binfile.bin' -d '0 0'
10 hg ci -m 'change binfile.bin'
11
11
12 hg revert -r 0 binfile.bin
12 hg revert -r 0 binfile.bin
13 hg ci -m 'revert binfile.bin' -d '0 0'
13 hg ci -m 'revert binfile.bin'
14
14
15 echo % diff -r 0 -r 1
15 echo % diff -r 0 -r 1
16 hg diff --nodates -r 0 -r 1
16 hg diff --nodates -r 0 -r 1
@@ -108,7 +108,7 b' test_whitespace_changes_and_blank_lines('
108
108
109 hg init
109 hg init
110 printf 'hello world\ngoodbye world\n' >foo
110 printf 'hello world\ngoodbye world\n' >foo
111 hg ci -Amfoo -ufoo -d '0 0'
111 hg ci -Amfoo -ufoo
112
112
113 test_added_blank_lines
113 test_added_blank_lines
114 test_added_horizontal_space_first_on_a_line
114 test_added_horizontal_space_first_on_a_line
@@ -6,7 +6,7 b''
6 hg init a
6 hg init a
7 cd a
7 cd a
8 echo a > a
8 echo a > a
9 hg ci -Ama -d '0 0'
9 hg ci -Ama
10
10
11 echo "# missing arg"
11 echo "# missing arg"
12 hg cat
12 hg cat
@@ -9,13 +9,13 b' hg init'
9
9
10 echo this is file a > a
10 echo this is file a > a
11 hg add a
11 hg add a
12 hg commit -m first -d '0 0'
12 hg commit -m first
13
13
14 echo adding to file a >> a
14 echo adding to file a >> a
15 hg commit -m second -d '0 0'
15 hg commit -m second
16
16
17 echo adding more to file a >> a
17 echo adding more to file a >> a
18 hg commit -m third -d '0 0'
18 hg commit -m third
19
19
20 hg verify
20 hg verify
21
21
@@ -6,7 +6,7 b' touch foo'
6 hg add foo
6 hg add foo
7 for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
7 for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
8 echo "foo-$i" >> foo
8 echo "foo-$i" >> foo
9 hg ci -m "foo-$i" -d "0 0"
9 hg ci -m "foo-$i"
10 done
10 done
11
11
12 for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do
12 for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do
@@ -8,7 +8,7 b' echo'
8 echo "% add a; ci"
8 echo "% add a; ci"
9 echo "some text" > a
9 echo "some text" > a
10 hg add
10 hg add
11 hg ci -d '0 0' -m first
11 hg ci -m first
12
12
13 echo
13 echo
14 echo "% cat .hg/store/fncache"
14 echo "% cat .hg/store/fncache"
@@ -19,7 +19,7 b' echo "% add a.i/b; ci"'
19 mkdir a.i
19 mkdir a.i
20 echo "some other text" > a.i/b
20 echo "some other text" > a.i/b
21 hg add
21 hg add
22 hg ci -d '0 0' -m second
22 hg ci -m second
23
23
24 echo
24 echo
25 echo "% cat .hg/store/fncache"
25 echo "% cat .hg/store/fncache"
@@ -30,7 +30,7 b' echo "% add a.i.hg/c; ci"'
30 mkdir a.i.hg
30 mkdir a.i.hg
31 echo "yet another text" > a.i.hg/c
31 echo "yet another text" > a.i.hg/c
32 hg add
32 hg add
33 hg ci -d '0 0' -m third
33 hg ci -m third
34
34
35 echo
35 echo
36 echo "% cat .hg/store/fncache"
36 echo "% cat .hg/store/fncache"
@@ -4,24 +4,24 b' hg init a'
4 cd a
4 cd a
5
5
6 echo start > start
6 echo start > start
7 hg ci -Amstart -d '0 0'
7 hg ci -Amstart
8 echo new > new
8 echo new > new
9 hg ci -Amnew -d '0 0'
9 hg ci -Amnew
10 echo '% new file'
10 echo '% new file'
11 hg diff --git -r 0
11 hg diff --git -r 0
12
12
13 hg cp new copy
13 hg cp new copy
14 hg ci -mcopy -d '0 0'
14 hg ci -mcopy
15 echo '% copy'
15 echo '% copy'
16 hg diff --git -r 1:tip
16 hg diff --git -r 1:tip
17
17
18 hg mv copy rename
18 hg mv copy rename
19 hg ci -mrename -d '0 0'
19 hg ci -mrename
20 echo '% rename'
20 echo '% rename'
21 hg diff --git -r 2:tip
21 hg diff --git -r 2:tip
22
22
23 hg rm rename
23 hg rm rename
24 hg ci -mdelete -d '0 0'
24 hg ci -mdelete
25 echo '% delete'
25 echo '% delete'
26 hg diff --git -r 3:tip
26 hg diff --git -r 3:tip
27
27
@@ -32,16 +32,16 b' 3'
32 4
32 4
33 5
33 5
34 EOF
34 EOF
35 hg ci -Amsrc -d '0 0'
35 hg ci -Amsrc
36 chmod +x src
36 chmod +x src
37 hg ci -munexec -d '0 0'
37 hg ci -munexec
38 echo '% chmod 644'
38 echo '% chmod 644'
39 hg diff --git -r 5:tip
39 hg diff --git -r 5:tip
40
40
41 hg mv src dst
41 hg mv src dst
42 chmod -x dst
42 chmod -x dst
43 echo a >> dst
43 echo a >> dst
44 hg ci -mrenamemod -d '0 0'
44 hg ci -mrenamemod
45 echo '% rename+mod+chmod'
45 echo '% rename+mod+chmod'
46 hg diff --git -r 6:tip
46 hg diff --git -r 6:tip
47
47
@@ -68,14 +68,14 b' hg diff --git'
68 echo
68 echo
69 echo '% diff across many revisions'
69 echo '% diff across many revisions'
70 hg mv dst dst2
70 hg mv dst dst2
71 hg ci -m 'mv dst dst2' -d '0 0'
71 hg ci -m 'mv dst dst2'
72
72
73 echo >> start
73 echo >> start
74 hg ci -m 'change start' -d '0 0'
74 hg ci -m 'change start'
75
75
76 hg revert -r -2 start
76 hg revert -r -2 start
77 hg mv dst2 dst3
77 hg mv dst2 dst3
78 hg ci -m 'mv dst2 dst3; revert start' -d '0 0'
78 hg ci -m 'mv dst2 dst3; revert start'
79
79
80 hg diff --git -r 9:11
80 hg diff --git -r 9:11
81 echo '% reversed'
81 echo '% reversed'
@@ -110,7 +110,7 b' hg diff --git -r -1:-5'
110 echo
110 echo
111 echo '% comparing with the working dir'
111 echo '% comparing with the working dir'
112 echo >> start
112 echo >> start
113 hg ci -m 'change start again' -d '0 0'
113 hg ci -m 'change start again'
114
114
115 echo > created
115 echo > created
116 hg add created
116 hg add created
@@ -42,14 +42,14 b' hg grep foobar'
42 echo blue >> color
42 echo blue >> color
43 echo black >> color
43 echo black >> color
44 hg add color
44 hg add color
45 hg ci -m 0 -d '0 0'
45 hg ci -m 0
46 echo orange >> color
46 echo orange >> color
47 hg ci -m 1 -d '0 0'
47 hg ci -m 1
48 echo black > color
48 echo black > color
49 hg ci -m 2 -d '0 0'
49 hg ci -m 2
50 echo orange >> color
50 echo orange >> color
51 echo blue >> color
51 echo blue >> color
52 hg ci -m 3 -d '0 0'
52 hg ci -m 3
53 hg grep orange
53 hg grep orange
54 hg grep --all orange
54 hg grep --all orange
55
55
@@ -6,7 +6,7 b' cd test'
6 mkdir da
6 mkdir da
7 echo foo > da/foo
7 echo foo > da/foo
8 echo foo > foo
8 echo foo > foo
9 hg ci -Ambase -d '0 0'
9 hg ci -Ambase
10 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
10 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
11 cat hg.pid >> $DAEMON_PIDS
11 cat hg.pid >> $DAEMON_PIDS
12 echo % manifest
12 echo % manifest
@@ -11,7 +11,7 b' cd test'
11 mkdir da
11 mkdir da
12 echo foo > da/foo
12 echo foo > da/foo
13 echo foo > foo
13 echo foo > foo
14 hg ci -d'0 0' -Ambase
14 hg ci -Ambase
15 hg tag 1.0
15 hg tag 1.0
16 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
16 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
17 cat hg.pid >> $DAEMON_PIDS
17 cat hg.pid >> $DAEMON_PIDS
@@ -8,7 +8,7 b' cd repo'
8 hg init
8 hg init
9 echo foo > bar
9 echo foo > bar
10 hg add bar
10 hg add bar
11 hg commit -m "test" -d "0 0" -u "Testing"
11 hg commit -m "test" -u "Testing"
12 hg tip
12 hg tip
13
13
14 cat > request.py <<EOF
14 cat > request.py <<EOF
@@ -8,7 +8,7 b' cd repo'
8 hg init
8 hg init
9 echo foo > bar
9 echo foo > bar
10 hg add bar
10 hg add bar
11 hg commit -m "test" -d "0 0" -u "Testing"
11 hg commit -m "test" -u "Testing"
12 hg tip
12 hg tip
13
13
14 cat > request.py <<EOF
14 cat > request.py <<EOF
@@ -5,7 +5,7 b' cp "$TESTDIR"/printenv.py .'
5 hg init test
5 hg init test
6 cd test
6 cd test
7 echo foo>foo
7 echo foo>foo
8 hg commit -A -d '0 0' -m 1
8 hg commit -A -m 1
9 hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
9 hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
10 hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
10 hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
11 # Test server address cannot be reused
11 # Test server address cannot be reused
@@ -5,7 +5,7 b' mkdir a/d1'
5 mkdir a/d1/d2
5 mkdir a/d1/d2
6 echo line 1 > a/a
6 echo line 1 > a/a
7 echo line 1 > a/d1/d2/a
7 echo line 1 > a/d1/d2/a
8 hg --cwd a ci -d '0 0' -Ama
8 hg --cwd a ci -Ama
9
9
10 echo line 2 >> a/a
10 echo line 2 >> a/a
11 hg --cwd a ci -u someone -d '1 0' -m'second change'
11 hg --cwd a ci -u someone -d '1 0' -m'second change'
@@ -10,21 +10,21 b' hg init repo'
10 cd repo
10 cd repo
11
11
12 echo foo > foo
12 echo foo > foo
13 hg ci -d '0 0' -qAm 'add foo'
13 hg ci -qAm 'add foo'
14
14
15 echo bar >> foo
15 echo bar >> foo
16 hg ci -d '0 0' -m 'change foo'
16 hg ci -m 'change foo'
17
17
18 hg backout -d '0 0' -r tip -m 'backout changed foo'
18 hg backout -r tip -m 'backout changed foo'
19
19
20 hg up -C 0
20 hg up -C 0
21 touch bar
21 touch bar
22 hg ci -d '0 0' -qAm 'add bar'
22 hg ci -qAm 'add bar'
23
23
24 hg merge --debug
24 hg merge --debug
25 hg debugstate | grep foo
25 hg debugstate | grep foo
26 hg st -A foo
26 hg st -A foo
27 hg ci -d '0 0' -m 'merge'
27 hg ci -m 'merge'
28
28
29 hg manifest --debug | grep foo
29 hg manifest --debug | grep foo
30 hg debugindex .hg/store/data/foo.i
30 hg debugindex .hg/store/data/foo.i
@@ -11,21 +11,21 b' cd t'
11
11
12 touch 1
12 touch 1
13 touch 2
13 touch 2
14 hg commit -Am init -d "0 0" # 0
14 hg commit -Am init # 0
15
15
16 hg rename 1 1a
16 hg rename 1 1a
17 hg commit -m rename -d "0 0" # 1
17 hg commit -m rename # 1
18
18
19 hg co -C 0
19 hg co -C 0
20 echo unrelated >> 2
20 echo unrelated >> 2
21 hg ci -m unrelated1 -d "0 0" # 2
21 hg ci -m unrelated1 # 2
22
22
23 hg merge --debug 1
23 hg merge --debug 1
24 hg ci -m merge1 -d "0 0" # 3
24 hg ci -m merge1 # 3
25
25
26 hg co -C 2
26 hg co -C 2
27 echo hello >> 1
27 echo hello >> 1
28 hg ci -m unrelated2 -d "0 0" # 4
28 hg ci -m unrelated2 # 4
29
29
30 hg co -C 3
30 hg co -C 3
31 hg merge -y --debug 4
31 hg merge -y --debug 4
@@ -63,7 +63,7 b' echo % status'
63 hg status
63 hg status
64
64
65 echo % commit
65 echo % commit
66 hg --debug commit -mabsym -d '0 0' -u 'User Name <user@example.com>'
66 hg --debug commit -mabsym -u 'User Name <user@example.com>'
67 echo % status
67 echo % status
68 hg status
68 hg status
69 echo % identify
69 echo % identify
@@ -23,10 +23,10 b' echo'
23
23
24 echo hello > f
24 echo hello > f
25 hg add f
25 hg add f
26 hg ci -m 1 -d'0 0'
26 hg ci -m 1
27 echo
27 echo
28
28
29 python unix2mac.py f
29 python unix2mac.py f
30 hg ci -m 2 -d'0 0'
30 hg ci -m 2
31 hg cat f | python print.py
31 hg cat f | python print.py
32 cat f | python print.py
32 cat f | python print.py
@@ -7,22 +7,22 b' cd a'
7
7
8 echo line1 > foo
8 echo line1 > foo
9 hg add foo
9 hg add foo
10 hg ci -m '0: add foo' -d '0 0'
10 hg ci -m '0: add foo'
11
11
12 echo line2 >> foo
12 echo line2 >> foo
13 hg ci -m '1: change foo' -d '0 0'
13 hg ci -m '1: change foo'
14
14
15 hg up -C 0
15 hg up -C 0
16 hg mv foo bar
16 hg mv foo bar
17 rm bar
17 rm bar
18 echo line0 > bar
18 echo line0 > bar
19 echo line1 >> bar
19 echo line1 >> bar
20 hg ci -m '2: mv foo bar; change bar' -d '0 0'
20 hg ci -m '2: mv foo bar; change bar'
21
21
22 hg merge 1
22 hg merge 1
23 echo '% contents of bar should be line0 line1 line2'
23 echo '% contents of bar should be line0 line1 line2'
24 cat bar
24 cat bar
25 hg ci -m '3: merge with local rename' -d '0 0'
25 hg ci -m '3: merge with local rename'
26 hg debugindex .hg/store/data/bar.i
26 hg debugindex .hg/store/data/bar.i
27 hg debugrename bar
27 hg debugrename bar
28 hg debugindex .hg/store/data/foo.i
28 hg debugindex .hg/store/data/foo.i
@@ -31,14 +31,14 b' hg debugindex .hg/store/data/foo.i'
31 hg up -C 2
31 hg up -C 2
32 rm bar
32 rm bar
33 echo line1 > bar
33 echo line1 > bar
34 hg ci -m '4: revert content change from rev 2' -d '0 0'
34 hg ci -m '4: revert content change from rev 2'
35
35
36 hg log --template '#rev#:#node|short# #parents#\n'
36 hg log --template '#rev#:#node|short# #parents#\n'
37 echo '% this should use bar@rev2 as the ancestor'
37 echo '% this should use bar@rev2 as the ancestor'
38 hg --debug merge 3
38 hg --debug merge 3
39 echo '% contents of bar should be line1 line2'
39 echo '% contents of bar should be line1 line2'
40 cat bar
40 cat bar
41 hg ci -m '5: merge' -d '0 0'
41 hg ci -m '5: merge'
42 hg debugindex .hg/store/data/bar.i
42 hg debugindex .hg/store/data/bar.i
43
43
44
44
@@ -53,7 +53,7 b' hg up -C 1'
53 hg merge 2
53 hg merge 2
54 echo '% contents of bar should be line0 line1 line2'
54 echo '% contents of bar should be line0 line1 line2'
55 cat bar
55 cat bar
56 hg ci -m '3: merge with remote rename' -d '0 0'
56 hg ci -m '3: merge with remote rename'
57 hg debugindex .hg/store/data/bar.i
57 hg debugindex .hg/store/data/bar.i
58 hg debugrename bar
58 hg debugrename bar
59 hg debugindex .hg/store/data/foo.i
59 hg debugindex .hg/store/data/foo.i
@@ -62,13 +62,13 b' hg debugindex .hg/store/data/foo.i'
62 hg up -C 2
62 hg up -C 2
63 rm bar
63 rm bar
64 echo line1 > bar
64 echo line1 > bar
65 hg ci -m '4: revert content change from rev 2' -d '0 0'
65 hg ci -m '4: revert content change from rev 2'
66
66
67 hg log --template '#rev#:#node|short# #parents#\n'
67 hg log --template '#rev#:#node|short# #parents#\n'
68 echo '% this should use bar@rev2 as the ancestor'
68 echo '% this should use bar@rev2 as the ancestor'
69 hg --debug merge 3
69 hg --debug merge 3
70 echo '% contents of bar should be line1 line2'
70 echo '% contents of bar should be line1 line2'
71 cat bar
71 cat bar
72 hg ci -m '5: merge' -d '0 0'
72 hg ci -m '5: merge'
73 hg debugindex .hg/store/data/bar.i
73 hg debugindex .hg/store/data/bar.i
74
74
@@ -8,18 +8,18 b' cd repo'
8
8
9 echo foo > foo
9 echo foo > foo
10 echo a > bar
10 echo a > bar
11 hg ci -Am 'add foo' -d '0 0'
11 hg ci -Am 'add foo'
12
12
13 hg mv foo baz
13 hg mv foo baz
14 echo b >> bar
14 echo b >> bar
15 echo quux > quux1
15 echo quux > quux1
16 hg ci -Am 'mv foo baz' -d '0 0'
16 hg ci -Am 'mv foo baz'
17
17
18 hg up -qC 0
18 hg up -qC 0
19 echo >> foo
19 echo >> foo
20 echo c >> bar
20 echo c >> bar
21 echo quux > quux2
21 echo quux > quux2
22 hg ci -Am 'change foo' -d '0 0'
22 hg ci -Am 'change foo'
23
23
24 # test with the rename on the remote side
24 # test with the rename on the remote side
25 HGMERGE=false hg merge
25 HGMERGE=false hg merge
@@ -251,7 +251,7 b" echo '% cd b; hg qrefresh'"
251 hg init refresh
251 hg init refresh
252 cd refresh
252 cd refresh
253 echo a > a
253 echo a > a
254 hg ci -Ama -d'0 0'
254 hg ci -Ama
255 hg qnew -mfoo foo
255 hg qnew -mfoo foo
256 echo a >> a
256 echo a >> a
257 hg qrefresh
257 hg qrefresh
@@ -410,14 +410,14 b' hg init strip'
410 cd strip
410 cd strip
411 touch foo
411 touch foo
412 hg add foo
412 hg add foo
413 hg ci -m 'add foo' -d '0 0'
413 hg ci -m 'add foo'
414 echo >> foo
414 echo >> foo
415 hg ci -m 'change foo 1' -d '0 0'
415 hg ci -m 'change foo 1'
416 hg up -C 0
416 hg up -C 0
417 echo 1 >> foo
417 echo 1 >> foo
418 hg ci -m 'change foo 2' -d '0 0'
418 hg ci -m 'change foo 2'
419 HGMERGE=true hg merge
419 HGMERGE=true hg merge
420 hg ci -m merge -d '0 0'
420 hg ci -m merge
421 hg log
421 hg log
422 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
422 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
423 checkundo strip
423 checkundo strip
@@ -9,7 +9,7 b' hg init repo'
9 cd repo
9 cd repo
10
10
11 echo foo > foo
11 echo foo > foo
12 hg ci -Am 'add foo' -d '0 0'
12 hg ci -Am 'add foo'
13
13
14 touch untracked-file
14 touch untracked-file
15 echo 'syntax: glob' > .hgignore
15 echo 'syntax: glob' > .hgignore
@@ -7,7 +7,7 b' cd repo'
7 hg init
7 hg init
8 echo foo > bar
8 echo foo > bar
9 hg add bar
9 hg add bar
10 hg commit -m "test" -d "0 0"
10 hg commit -m "test"
11 hg tip
11 hg tip
12
12
13 cat > request.py <<EOF
13 cat > request.py <<EOF
@@ -16,7 +16,7 b' commit()'
16
16
17 echo >> foo
17 echo >> foo
18
18
19 hg commit -d '0 0' -qAm "$msg"
19 hg commit -qAm "$msg"
20 }
20 }
21
21
22 hg init repo
22 hg init repo
@@ -5,13 +5,13 b' cp "$TESTDIR"/printenv.py .'
5 hg init test
5 hg init test
6 cd test
6 cd test
7 echo a > a
7 echo a > a
8 hg ci -Ama -d '0 0'
8 hg ci -Ama
9
9
10 cd ..
10 cd ..
11 hg clone test test2
11 hg clone test test2
12 cd test2
12 cd test2
13 echo a >> a
13 echo a >> a
14 hg ci -mb -d '0 0'
14 hg ci -mb
15
15
16 echo % expect error, cloning not allowed
16 echo % expect error, cloning not allowed
17 echo '[web]' > .hg/hgrc
17 echo '[web]' > .hg/hgrc
@@ -3,12 +3,12 b''
3 hg init repo
3 hg init repo
4 cd repo
4 cd repo
5 echo foo > foo
5 echo foo > foo
6 hg ci -qAm 'add foo' -d '0 0'
6 hg ci -qAm 'add foo'
7 echo >> foo
7 echo >> foo
8 hg ci -m 'change foo' -d '0 0'
8 hg ci -m 'change foo'
9 hg up -qC 0
9 hg up -qC 0
10 echo bar > bar
10 echo bar > bar
11 hg ci -qAm 'add bar' -d '0 0'
11 hg ci -qAm 'add bar'
12 hg log
12 hg log
13 cd ..
13 cd ..
14 hg init copy
14 hg init copy
@@ -5,13 +5,13 b' cp "$TESTDIR"/printenv.py .'
5 hg init test
5 hg init test
6 cd test
6 cd test
7 echo a > a
7 echo a > a
8 hg ci -Ama -d '0 0'
8 hg ci -Ama
9
9
10 cd ..
10 cd ..
11 hg clone test test2
11 hg clone test test2
12 cd test2
12 cd test2
13 echo a >> a
13 echo a >> a
14 hg ci -mb -d '0 0'
14 hg ci -mb
15
15
16 req() {
16 req() {
17 hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
17 hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
@@ -47,7 +47,7 b' me'
47 EOF
47 EOF
48
48
49 hg add 1.txt 2.txt dir/a.txt
49 hg add 1.txt 2.txt dir/a.txt
50 hg commit -d '0 0' -m 'initial checkin'
50 hg commit -m 'initial checkin'
51
51
52 echo % changing files
52 echo % changing files
53
53
@@ -7,27 +7,27 b' hg init'
7 mkdir a
7 mkdir a
8 echo foo > a/a
8 echo foo > a/a
9 echo bar > a/b
9 echo bar > a/b
10 hg ci -Am "0" -d "0 0"
10 hg ci -Am "0"
11
11
12 hg co -C 0
12 hg co -C 0
13 hg mv a b
13 hg mv a b
14 hg ci -m "1 mv a/ b/" -d "0 0"
14 hg ci -m "1 mv a/ b/"
15
15
16 hg co -C 0
16 hg co -C 0
17 echo baz > a/c
17 echo baz > a/c
18 echo quux > a/d
18 echo quux > a/d
19 hg add a/c
19 hg add a/c
20 hg ci -m "2 add a/c" -d "0 0"
20 hg ci -m "2 add a/c"
21
21
22 hg merge --debug 1
22 hg merge --debug 1
23 echo a/* b/*
23 echo a/* b/*
24 hg st -C
24 hg st -C
25 hg ci -m "3 merge 2+1" -d "0 0"
25 hg ci -m "3 merge 2+1"
26 hg debugrename b/c
26 hg debugrename b/c
27
27
28 hg co -C 1
28 hg co -C 1
29 hg merge --debug 2
29 hg merge --debug 2
30 echo a/* b/*
30 echo a/* b/*
31 hg st -C
31 hg st -C
32 hg ci -m "4 merge 1+2" -d "0 0"
32 hg ci -m "4 merge 1+2"
33 hg debugrename b/c
33 hg debugrename b/c
@@ -8,20 +8,20 b' echo "followcopies = 1" >> .hg/hgrc'
8 echo foo > a
8 echo foo > a
9 echo foo > a2
9 echo foo > a2
10 hg add a a2
10 hg add a a2
11 hg ci -m "start" -d "0 0"
11 hg ci -m "start"
12 hg mv a b
12 hg mv a b
13 hg mv a2 b2
13 hg mv a2 b2
14 hg ci -m "rename" -d "0 0"
14 hg ci -m "rename"
15 echo "checkout"
15 echo "checkout"
16 hg co 0
16 hg co 0
17 echo blahblah > a
17 echo blahblah > a
18 echo blahblah > a2
18 echo blahblah > a2
19 hg mv a2 c2
19 hg mv a2 c2
20 hg ci -m "modify" -d "0 0"
20 hg ci -m "modify"
21 echo "merge"
21 echo "merge"
22 hg merge -y --debug
22 hg merge -y --debug
23 hg status -AC
23 hg status -AC
24 cat b
24 cat b
25 hg ci -m "merge" -d "0 0"
25 hg ci -m "merge"
26 hg debugindex .hg/store/data/b.i
26 hg debugindex .hg/store/data/b.i
27 hg debugrename b No newline at end of file
27 hg debugrename b
@@ -30,18 +30,18 b' tm()'
30 echo base > a
30 echo base > a
31 echo base > rev # used to force commits
31 echo base > rev # used to force commits
32 hg add a rev
32 hg add a rev
33 hg ci -m "base" -d "0 0"
33 hg ci -m "base"
34
34
35 # remote
35 # remote
36 echo remote > rev
36 echo remote > rev
37 if [ "$2" != "" ] ; then $2 ; fi
37 if [ "$2" != "" ] ; then $2 ; fi
38 hg ci -m "remote" -d "0 0"
38 hg ci -m "remote"
39
39
40 # local
40 # local
41 hg co -q 0
41 hg co -q 0
42 echo local > rev
42 echo local > rev
43 if [ "$1" != "" ] ; then $1 ; fi
43 if [ "$1" != "" ] ; then $1 ; fi
44 hg ci -m "local" -d "0 0"
44 hg ci -m "local"
45
45
46 # working dir
46 # working dir
47 echo local > rev
47 echo local > rev
@@ -56,7 +56,7 b' tm()'
56 echo "--------------"
56 echo "--------------"
57 hg status -camC -X rev
57 hg status -camC -X rev
58
58
59 hg ci -m "merge" -d "0 0"
59 hg ci -m "merge"
60
60
61 echo "--------------"
61 echo "--------------"
62 echo
62 echo
@@ -6,22 +6,22 b' hg init repo'
6 cd repo
6 cd repo
7
7
8 echo foo > file
8 echo foo > file
9 hg commit -Am 'add file' -d '0 0'
9 hg commit -Am 'add file'
10
10
11 echo bar >> file
11 echo bar >> file
12 hg commit -Am 'append bar' -d '0 0'
12 hg commit -Am 'append bar'
13
13
14 echo % create a second head
14 echo % create a second head
15 hg up -C 0
15 hg up -C 0
16 echo baz >> file
16 echo baz >> file
17 hg commit -Am 'append baz' -d '0 0'
17 hg commit -Am 'append baz'
18
18
19 echo % failing merge
19 echo % failing merge
20 HGMERGE=internal:fail hg merge
20 HGMERGE=internal:fail hg merge
21
21
22 echo resolved > file
22 echo resolved > file
23 hg resolve -m file
23 hg resolve -m file
24 hg commit -m 'resolved' -d '0 0'
24 hg commit -m 'resolved'
25
25
26 echo % resolve -l, should be empty
26 echo % resolve -l, should be empty
27 hg resolve -l
27 hg resolve -l
@@ -3,7 +3,7 b''
3 hg init
3 hg init
4
4
5 echo a > a
5 echo a > a
6 hg ci -d '0 0' -Ama
6 hg ci -Ama
7
7
8 hg an a
8 hg an a
9
9
@@ -73,7 +73,7 b' bar'
73 baz
73 baz
74 EOF
74 EOF
75 echo toremove > toremove
75 echo toremove > toremove
76 hg ci -Amfoo -d '0 0'
76 hg ci -Amfoo
77 cat <<EOF > foo
77 cat <<EOF > foo
78 foo2
78 foo2
79 bar2
79 bar2
@@ -81,14 +81,14 b' baz2'
81 EOF
81 EOF
82 rm toremove
82 rm toremove
83 echo added > added
83 echo added > added
84 hg ci -Amfoo2 -d '0 0'
84 hg ci -Amfoo2
85 echo bar > bar
85 echo bar > bar
86 hg ci -Ambar -d '0 0'
86 hg ci -Ambar
87 echo bar2 >> bar
87 echo bar2 >> bar
88 hg ci -mbar2 -d '0 0'
88 hg ci -mbar2
89 hg up 0
89 hg up 0
90 echo foobar > foo
90 echo foobar > foo
91 hg ci -mfoobar -d '0 0'
91 hg ci -mfoobar
92 hg transplant 1:3
92 hg transplant 1:3
93 # transplant -c shouldn't use an old changeset
93 # transplant -c shouldn't use an old changeset
94 hg up -C
94 hg up -C
@@ -4,10 +4,10 b''
4 hg init repo
4 hg init repo
5 cd repo
5 cd repo
6 echo a > a
6 echo a > a
7 hg ci -qAm 'add a' -d '0 0'
7 hg ci -qAm 'add a'
8 hg branch foo
8 hg branch foo
9 echo >> a
9 echo >> a
10 hg ci -m 'change a' -d '0 0'
10 hg ci -m 'change a'
11 cd ..
11 cd ..
12
12
13 echo '% clone repo#foo'
13 echo '% clone repo#foo'
@@ -22,10 +22,10 b' echo'
22 echo '% changing original repo'
22 echo '% changing original repo'
23 cd repo
23 cd repo
24 echo >> a
24 echo >> a
25 hg ci -m 'new head of branch foo' -d '0 0'
25 hg ci -m 'new head of branch foo'
26 hg up -qC default
26 hg up -qC default
27 echo bar > bar
27 echo bar > bar
28 hg ci -qAm 'add bar' -d '0 0'
28 hg ci -qAm 'add bar'
29 hg log
29 hg log
30 echo
30 echo
31
31
@@ -7,7 +7,7 b' echo "some text" > FOO.txt'
7 echo "another text" > bar.txt
7 echo "another text" > bar.txt
8 echo "more text" > QUICK.txt
8 echo "more text" > QUICK.txt
9 hg add
9 hg add
10 hg ci -d '0 0' -mtest1
10 hg ci -mtest1
11
11
12 echo
12 echo
13 echo % verify
13 echo % verify
@@ -26,7 +26,7 b' echo'
26 echo hello > f
26 echo hello > f
27 hg add f
27 hg add f
28 echo commit should succeed
28 echo commit should succeed
29 hg ci -m 1 -d'0 0'
29 hg ci -m 1
30 echo
30 echo
31
31
32 hg clone . ../zoz
32 hg clone . ../zoz
@@ -34,14 +34,14 b' cp .hg/hgrc ../zoz/.hg'
34
34
35 python unix2dos.py f
35 python unix2dos.py f
36 echo commit should fail
36 echo commit should fail
37 hg ci -m 2.1 -d'0 0'
37 hg ci -m 2.1
38 echo
38 echo
39
39
40 mv .hg/hgrc .hg/hgrc.bak
40 mv .hg/hgrc .hg/hgrc.bak
41 echo commits should succeed
41 echo commits should succeed
42 hg ci -m 2 -d'0 0'
42 hg ci -m 2
43 hg cp f g
43 hg cp f g
44 hg ci -m 2.2 -d'0 0'
44 hg ci -m 2.2
45 echo
45 echo
46
46
47 echo push should fail
47 echo push should fail
@@ -52,7 +52,7 b' mv .hg/hgrc.bak .hg/hgrc'
52 echo hello > f
52 echo hello > f
53 hg rm g
53 hg rm g
54 echo commit should succeed
54 echo commit should succeed
55 hg ci -m 2.3 -d'0 0'
55 hg ci -m 2.3
56 echo
56 echo
57
57
58 echo push should succeed
58 echo push should succeed
@@ -64,18 +64,18 b' mkdir d'
64 echo hello > d/f2
64 echo hello > d/f2
65 python unix2dos.py d/f2
65 python unix2dos.py d/f2
66 hg add d/f2
66 hg add d/f2
67 hg ci -m 3 -d'0 0'
67 hg ci -m 3
68 hg revert -a
68 hg revert -a
69 rm d/f2
69 rm d/f2
70 echo
70 echo
71
71
72 hg rem f
72 hg rem f
73 hg ci -m 4 -d'0 0'
73 hg ci -m 4
74 echo
74 echo
75
75
76 python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
76 python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
77 hg add bin
77 hg add bin
78 hg ci -m 5 -d'0 0'
78 hg ci -m 5
79 hg log -v
79 hg log -v
80 echo
80 echo
81
81
@@ -84,9 +84,9 b' echo'
84 for x in a b c d; do echo content > dupe/$x; done
84 for x in a b c d; do echo content > dupe/$x; done
85 hg -R dupe add
85 hg -R dupe add
86 python unix2dos.py dupe/b dupe/c dupe/d
86 python unix2dos.py dupe/b dupe/c dupe/d
87 hg -R dupe ci -m a -d'0 0' dupe/a
87 hg -R dupe ci -m a dupe/a
88 hg -R dupe ci -m b/c -d'0 0' dupe/[bc]
88 hg -R dupe ci -m b/c dupe/[bc]
89 hg -R dupe ci -m d -d'0 0' dupe/d
89 hg -R dupe ci -m d dupe/d
90 hg -R dupe log -v
90 hg -R dupe log -v
91 echo
91 echo
92
92
@@ -100,7 +100,7 b' rm .hg/hgrc'
100 (echo some; echo text) > f3
100 (echo some; echo text) > f3
101 python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
101 python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
102 hg add f3 f4.bat
102 hg add f3 f4.bat
103 hg ci -m 6 -d'0 0'
103 hg ci -m 6
104
104
105 python print.py < bin
105 python print.py < bin
106 python print.py < f3
106 python print.py < f3
@@ -125,7 +125,7 b' echo'
125
125
126 python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
126 python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
127 hg add f5.sh
127 hg add f5.sh
128 hg ci -m 7 -d'0 0'
128 hg ci -m 7
129 python print.py < f5.sh
129 python print.py < f5.sh
130 hg cat f5.sh | python print.py
130 hg cat f5.sh | python print.py
131
131
General Comments 0
You need to be logged in to leave comments. Login now