##// END OF EJS Templates
tests: convert some 'hghave no-outer-repo' to #if...
Mads Kiilerich -
r17014:50fbe906 default
parent child Browse files
Show More
@@ -1,4 +1,4 b''
1 $ "$TESTDIR/hghave" svn13 no-outer-repo || exit 80
1 $ "$TESTDIR/hghave" svn13 || exit 80
2
2
3 $ fixpath()
3 $ fixpath()
4 > {
4 > {
@@ -356,7 +356,7 b' Branchy history'
356 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
356 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
357 [1]
357 [1]
358 $ hg --cwd b revert -r 2 b
358 $ hg --cwd b revert -r 2 b
359 $ hg resolve -m b
359 $ hg --cwd b resolve -m b
360 $ hg --cwd b ci -d '5 0' -m 'merge'
360 $ hg --cwd b ci -d '5 0' -m 'merge'
361
361
362 Expect 4 changes
362 Expect 4 changes
@@ -1,9 +1,5 b''
1 test command parsing and dispatch
1 test command parsing and dispatch
2
2
3 $ "$TESTDIR/hghave" no-outer-repo || exit 80
4
5 $ dir=`pwd`
6
7 $ hg init a
3 $ hg init a
8 $ cd a
4 $ cd a
9
5
@@ -48,6 +44,10 b' Missing arg:'
48 a: no such file in rev 000000000000
44 a: no such file in rev 000000000000
49 [1]
45 [1]
50
46
47 $ cd "$TESTTMP"
48
49 #if no-outer-repo
50
51 No repo:
51 No repo:
52
52
53 $ cd $dir
53 $ cd $dir
@@ -55,3 +55,4 b' No repo:'
55 abort: no repository found in '$TESTTMP' (.hg not found)!
55 abort: no repository found in '$TESTTMP' (.hg not found)!
56 [255]
56 [255]
57
57
58 #endif
@@ -1,7 +1,5 b''
1 Test basic extension support
1 Test basic extension support
2
2
3 $ "$TESTDIR/hghave" no-outer-repo || exit 80
4
5 $ cat > foobar.py <<EOF
3 $ cat > foobar.py <<EOF
6 > import os
4 > import os
7 > from mercurial import commands
5 > from mercurial import commands
@@ -132,6 +130,9 b" Check hgweb's load order:"
132
130
133 $ cd ..
131 $ cd ..
134
132
133 hide outer repo
134 $ hg init
135
135 $ cat > empty.py <<EOF
136 $ cat > empty.py <<EOF
136 > '''empty cmdtable
137 > '''empty cmdtable
137 > '''
138 > '''
@@ -1,5 +1,3 b''
1 $ "$TESTDIR/hghave" no-outer-repo || exit 80
2
3 $ hg init a
1 $ hg init a
4 $ cd a
2 $ cd a
5 $ echo a > a
3 $ echo a > a
@@ -77,6 +75,8 b' Testing -R/--repository:'
77 8580ff50825a tip
75 8580ff50825a tip
78 $ cd ..
76 $ cd ..
79
77
78 #if no-outer-repo
79
80 Implicit -R:
80 Implicit -R:
81
81
82 $ hg ann a/a
82 $ hg ann a/a
@@ -93,6 +93,8 b' Implicit -R:'
93 abort: no repository found in '$TESTTMP' (.hg not found)!
93 abort: no repository found in '$TESTTMP' (.hg not found)!
94 [255]
94 [255]
95
95
96 #endif
97
96 Abbreviation of long option:
98 Abbreviation of long option:
97
99
98 $ hg --repo c tip
100 $ hg --repo c tip
@@ -272,6 +274,9 b' Testing --version:'
272 $ hg --version -q
274 $ hg --version -q
273 Mercurial Distributed SCM * (glob)
275 Mercurial Distributed SCM * (glob)
274
276
277 hide outer repo
278 $ hg init
279
275 Testing -h/--help:
280 Testing -h/--help:
276
281
277 $ hg -h
282 $ hg -h
@@ -69,8 +69,6 b' o / (1) collapse'
69 o (0) root
69 o (0) root
70
70
71
71
72 $ "$TESTDIR/hghave" no-outer-repo || exit 80
73
74 $ commit()
72 $ commit()
75 > {
73 > {
76 > rev=$1
74 > rev=$1
@@ -1136,8 +1134,11 b' File glog per revset (only merges):'
1136 Empty revision range - display nothing:
1134 Empty revision range - display nothing:
1137 $ hg glog -r 1..0
1135 $ hg glog -r 1..0
1138
1136
1137 $ cd ..
1138
1139 #if no-outer-repo
1140
1139 From outer space:
1141 From outer space:
1140 $ cd ..
1141 $ hg glog -l1 repo
1142 $ hg glog -l1 repo
1142 @ changeset: 34:fea3ac5810e0
1143 @ changeset: 34:fea3ac5810e0
1143 | tag: tip
1144 | tag: tip
@@ -1156,6 +1157,8 b' From outer space:'
1156 |
1157 |
1157 $ hg glog -l1 repo/missing
1158 $ hg glog -l1 repo/missing
1158
1159
1160 #endif
1161
1159 File log with revs != cset revs:
1162 File log with revs != cset revs:
1160 $ hg init flog
1163 $ hg init flog
1161 $ cd flog
1164 $ cd flog
@@ -1,4 +1,6 b''
1 $ "$TESTDIR/hghave" no-outer-repo serve || exit 80
1 $ "$TESTDIR/hghave" serve || exit 80
2
3 #if no-outer-repo
2
4
3 no repo
5 no repo
4
6
@@ -6,6 +8,8 b' no repo'
6 abort: there is no Mercurial repository here (.hg not found)
8 abort: there is no Mercurial repository here (.hg not found)
7 [255]
9 [255]
8
10
11 #endif
12
9 create repo
13 create repo
10
14
11 $ hg init test
15 $ hg init test
@@ -51,8 +55,10 b' other local repo'
51 $ cd ..
55 $ cd ..
52 $ hg -R test id
56 $ hg -R test id
53 cb9a9f314b8b+ tip
57 cb9a9f314b8b+ tip
58 #if no-outer-repo
54 $ hg id test
59 $ hg id test
55 cb9a9f314b8b+ tip
60 cb9a9f314b8b+ tip
61 #endif
56
62
57 with remote http repo
63 with remote http repo
58
64
@@ -111,7 +117,8 b' Make sure we do not obscure unknown requ'
111 [255]
117 [255]
112
118
113 $ cd ..
119 $ cd ..
120 #if no-outer-repo
114 $ hg id test
121 $ hg id test
115 abort: unknown repository format: requires features 'fake' (upgrade Mercurial)!
122 abort: unknown repository format: requires features 'fake' (upgrade Mercurial)!
116 [255]
123 [255]
117
124 #endif
General Comments 0
You need to be logged in to leave comments. Login now