Show More
@@ -109,8 +109,10 b' invalid options' | |||||
109 |
|
109 | |||
110 | optional repository |
|
110 | optional repository | |
111 |
|
111 | |||
|
112 | #if no-outer-repo | |||
112 | $ hg optionalrepo |
|
113 | $ hg optionalrepo | |
113 | init |
|
114 | init | |
|
115 | #endif | |||
114 | $ cd alias |
|
116 | $ cd alias | |
115 | $ cat > .hg/hgrc <<EOF |
|
117 | $ cat > .hg/hgrc <<EOF | |
116 | > [alias] |
|
118 | > [alias] |
@@ -388,6 +388,9 b' Outgoing -R does-not-exist.hg vs partial' | |||||
388 | [255] |
|
388 | [255] | |
389 | $ cd .. |
|
389 | $ cd .. | |
390 |
|
390 | |||
|
391 | hide outer repo | |||
|
392 | $ hg init | |||
|
393 | ||||
391 | Direct clone from bundle (all-history) |
|
394 | Direct clone from bundle (all-history) | |
392 |
|
395 | |||
393 |
$ |
|
396 | $ hg clone full.hg full-clone |
@@ -1,3 +1,6 b'' | |||||
|
1 | hide outer repo | |||
|
2 | $ hg init | |||
|
3 | ||||
1 |
$ |
|
4 | $ echo '[Section]' >> $HGRCPATH | |
2 |
$ |
|
5 | $ echo 'KeY = Case Sensitive' >> $HGRCPATH | |
3 |
$ |
|
6 | $ echo 'key = lower case' >> $HGRCPATH |
@@ -143,9 +143,9 b' convert full repository (issue1649)' | |||||
143 | sorting... |
|
143 | sorting... | |
144 | converting... |
|
144 | converting... | |
145 | updating tags |
|
145 | updating tags | |
146 |
$ hg cat -r tip srcfull-hg |
|
146 | $ hg cat -r tip --cwd srcfull-hg src/a | |
147 | a |
|
147 | a | |
148 |
$ hg cat -r tip srcfull-hg |
|
148 | $ hg cat -r tip --cwd srcfull-hg src/b/c | |
149 | c |
|
149 | c | |
150 | c |
|
150 | c | |
151 |
|
151 |
@@ -14,12 +14,16 b" skip if we can't import elementtree" | |||||
14 | > exit 80 |
|
14 | > exit 80 | |
15 | > fi |
|
15 | > fi | |
16 |
|
16 | |||
|
17 | #if no-outer-repo | |||
|
18 | ||||
17 | try converting darcs1 repository |
|
19 | try converting darcs1 repository | |
18 |
|
20 | |||
19 | $ hg clone -q "$TESTDIR/bundles/darcs1.hg" darcs |
|
21 | $ hg clone -q "$TESTDIR/bundles/darcs1.hg" darcs | |
20 | $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0 |
|
22 | $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0 | |
21 | darcs-1.0 repository format is unsupported, please upgrade |
|
23 | darcs-1.0 repository format is unsupported, please upgrade | |
22 |
|
24 | |||
|
25 | #endif | |||
|
26 | ||||
23 | initialize darcs repo |
|
27 | initialize darcs repo | |
24 |
|
28 | |||
25 | $ mkdir darcs-repo |
|
29 | $ mkdir darcs-repo |
@@ -1,3 +1,6 b'' | |||||
|
1 | hide outer repo | |||
|
2 | $ hg init | |||
|
3 | ||||
1 | Use hgrc within $TESTTMP |
|
4 | Use hgrc within $TESTTMP | |
2 |
|
5 | |||
3 | $ HGRCPATH=`pwd`/hgrc |
|
6 | $ HGRCPATH=`pwd`/hgrc | |
@@ -63,6 +66,7 b' issue1829: wrong indentation' | |||||
63 | make sure global options given on the cmdline take precedence |
|
66 | make sure global options given on the cmdline take precedence | |
64 |
|
67 | |||
65 | $ hg showconfig --config ui.verbose=True --quiet |
|
68 | $ hg showconfig --config ui.verbose=True --quiet | |
|
69 | bundle.mainreporoot=$TESTTMP | |||
66 | ui.verbose=False |
|
70 | ui.verbose=False | |
67 | ui.debug=False |
|
71 | ui.debug=False | |
68 | ui.quiet=True |
|
72 | ui.quiet=True | |
@@ -93,6 +97,7 b' username expansion' | |||||
93 | $ cd .. |
|
97 | $ cd .. | |
94 |
|
98 | |||
95 | $ hg showconfig |
|
99 | $ hg showconfig | |
|
100 | bundle.mainreporoot=$TESTTMP | |||
96 | ui.username=$FAKEUSER |
|
101 | ui.username=$FAKEUSER | |
97 |
|
102 | |||
98 | $ unset FAKEUSER |
|
103 | $ unset FAKEUSER | |
@@ -117,7 +122,6 b' showconfig with multiple arguments' | |||||
117 |
|
122 | |||
118 | HGPLAIN |
|
123 | HGPLAIN | |
119 |
|
124 | |||
120 | $ p=`pwd` |
|
|||
121 | $ echo "[ui]" > $HGRC |
|
125 | $ echo "[ui]" > $HGRC | |
122 | $ echo "debug=true" >> $HGRC |
|
126 | $ echo "debug=true" >> $HGRC | |
123 | $ echo "fallbackencoding=ASCII" >> $HGRC |
|
127 | $ echo "fallbackencoding=ASCII" >> $HGRC | |
@@ -137,6 +141,7 b' customized hgrc' | |||||
137 | $ hg showconfig |
|
141 | $ hg showconfig | |
138 | read config from: $TESTTMP/hgrc |
|
142 | read config from: $TESTTMP/hgrc | |
139 | $TESTTMP/hgrc:13: alias.log=log -g |
|
143 | $TESTTMP/hgrc:13: alias.log=log -g | |
|
144 | none: bundle.mainreporoot=$TESTTMP | |||
140 | $TESTTMP/hgrc:11: defaults.identify=-n |
|
145 | $TESTTMP/hgrc:11: defaults.identify=-n | |
141 | $TESTTMP/hgrc:2: ui.debug=true |
|
146 | $TESTTMP/hgrc:2: ui.debug=true | |
142 | $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII |
|
147 | $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII | |
@@ -152,6 +157,7 b' plain hgrc' | |||||
152 | $ HGPLAIN=; export HGPLAIN |
|
157 | $ HGPLAIN=; export HGPLAIN | |
153 | $ hg showconfig --config ui.traceback=True --debug |
|
158 | $ hg showconfig --config ui.traceback=True --debug | |
154 | read config from: $TESTTMP/hgrc |
|
159 | read config from: $TESTTMP/hgrc | |
|
160 | none: bundle.mainreporoot=$TESTTMP | |||
155 | none: ui.traceback=True |
|
161 | none: ui.traceback=True | |
156 | none: ui.verbose=False |
|
162 | none: ui.verbose=False | |
157 | none: ui.debug=True |
|
163 | none: ui.debug=True | |
@@ -169,6 +175,7 b' plain mode with exceptions' | |||||
169 | $ hg showconfig --config ui.traceback=True --debug |
|
175 | $ hg showconfig --config ui.traceback=True --debug | |
170 | plain: True |
|
176 | plain: True | |
171 | read config from: $TESTTMP/hgrc |
|
177 | read config from: $TESTTMP/hgrc | |
|
178 | none: bundle.mainreporoot=$TESTTMP | |||
172 | $TESTTMP/hgrc:15: extensions.plain=./plain.py |
|
179 | $TESTTMP/hgrc:15: extensions.plain=./plain.py | |
173 | none: ui.traceback=True |
|
180 | none: ui.traceback=True | |
174 | none: ui.verbose=False |
|
181 | none: ui.verbose=False | |
@@ -178,6 +185,7 b' plain mode with exceptions' | |||||
178 | $ hg showconfig --config ui.traceback=True --debug |
|
185 | $ hg showconfig --config ui.traceback=True --debug | |
179 | plain: True |
|
186 | plain: True | |
180 | read config from: $TESTTMP/hgrc |
|
187 | read config from: $TESTTMP/hgrc | |
|
188 | none: bundle.mainreporoot=$TESTTMP | |||
181 | $TESTTMP/hgrc:15: extensions.plain=./plain.py |
|
189 | $TESTTMP/hgrc:15: extensions.plain=./plain.py | |
182 | none: ui.traceback=True |
|
190 | none: ui.traceback=True | |
183 | none: ui.verbose=False |
|
191 | none: ui.verbose=False | |
@@ -187,6 +195,7 b' plain mode with exceptions' | |||||
187 | $ hg showconfig --config ui.traceback=True --debug |
|
195 | $ hg showconfig --config ui.traceback=True --debug | |
188 | plain: True |
|
196 | plain: True | |
189 | read config from: $TESTTMP/hgrc |
|
197 | read config from: $TESTTMP/hgrc | |
|
198 | none: bundle.mainreporoot=$TESTTMP | |||
190 | $TESTTMP/hgrc:15: extensions.plain=./plain.py |
|
199 | $TESTTMP/hgrc:15: extensions.plain=./plain.py | |
191 | none: ui.traceback=True |
|
200 | none: ui.traceback=True | |
192 | none: ui.verbose=False |
|
201 | none: ui.verbose=False |
@@ -1,5 +1,10 b'' | |||||
1 | $ "$TESTDIR/hghave" serve || exit 80 |
|
1 | $ "$TESTDIR/hghave" serve || exit 80 | |
2 |
|
2 | |||
|
3 | hide outer repo and work in dir without '.hg' | |||
|
4 | $ hg init | |||
|
5 | $ mkdir dir | |||
|
6 | $ cd dir | |||
|
7 | ||||
3 | Tests some basic hgwebdir functionality. Tests setting up paths and |
|
8 | Tests some basic hgwebdir functionality. Tests setting up paths and | |
4 | collection, different forms of 404s and the subdirectory support. |
|
9 | collection, different forms of 404s and the subdirectory support. | |
5 |
|
10 | |||
@@ -59,6 +64,8 b' create repository without .hg/store' | |||||
59 | $ rm -R nostore/.hg/store |
|
64 | $ rm -R nostore/.hg/store | |
60 | $ root=`pwd` |
|
65 | $ root=`pwd` | |
61 | $ cd .. |
|
66 | $ cd .. | |
|
67 | ||||
|
68 | serve | |||
62 | $ cat > paths.conf <<EOF |
|
69 | $ cat > paths.conf <<EOF | |
63 | > [paths] |
|
70 | > [paths] | |
64 | > a=$root/a |
|
71 | > a=$root/a |
@@ -1,6 +1,10 b'' | |||||
1 | Tests whether or not hgwebdir properly handles various symlink topologies. |
|
1 | Tests whether or not hgwebdir properly handles various symlink topologies. | |
2 |
|
2 | |||
3 | $ "$TESTDIR/hghave" serve symlink || exit 80 |
|
3 | $ "$TESTDIR/hghave" serve symlink || exit 80 | |
|
4 | ||||
|
5 | hide outer repo | |||
|
6 | $ hg init | |||
|
7 | ||||
4 |
$ |
|
8 | $ hg init a | |
5 | $ echo a > a/a |
|
9 | $ echo a > a/a | |
6 | $ hg --cwd a ci -Ama -d'1 0' |
|
10 | $ hg --cwd a ci -Ama -d'1 0' |
@@ -2,6 +2,8 b' Translations are optional:' | |||||
2 |
|
2 | |||
3 | $ "$TESTDIR/hghave" gettext || exit 80 |
|
3 | $ "$TESTDIR/hghave" gettext || exit 80 | |
4 |
|
4 | |||
|
5 | #if no-outer-repo | |||
|
6 | ||||
5 | Test that translations are compiled and installed correctly. |
|
7 | Test that translations are compiled and installed correctly. | |
6 |
|
8 | |||
7 | Default encoding in tests is "ascii" and the translation is encoded |
|
9 | Default encoding in tests is "ascii" and the translation is encoded | |
@@ -23,6 +25,8 b' Different encoding:' | |||||
23 | abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado)! (esc) |
|
25 | abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado)! (esc) | |
24 | [255] |
|
26 | [255] | |
25 |
|
27 | |||
|
28 | #endif | |||
|
29 | ||||
26 | Test keyword search in translated help text: |
|
30 | Test keyword search in translated help text: | |
27 |
|
31 | |||
28 | $ HGENCODING=UTF-8 LANGUAGE=de hg help -k blättern |
|
32 | $ HGENCODING=UTF-8 LANGUAGE=de hg help -k blättern |
@@ -11,6 +11,9 b'' | |||||
11 | > interactive = true |
|
11 | > interactive = true | |
12 | > EOF |
|
12 | > EOF | |
13 |
|
13 | |||
|
14 | hide outer repo | |||
|
15 | $ hg init | |||
|
16 | ||||
14 | Run kwdemo before [keyword] files are set up |
|
17 | Run kwdemo before [keyword] files are set up | |
15 | as it would succeed without uisetup otherwise |
|
18 | as it would succeed without uisetup otherwise | |
16 |
|
19 |
@@ -1,5 +1,8 b'' | |||||
1 | $ "$TESTDIR/hghave" serve || exit 80 |
|
1 | $ "$TESTDIR/hghave" serve || exit 80 | |
2 |
|
2 | |||
|
3 | hide outer repo | |||
|
4 | $ hg init | |||
|
5 | ||||
3 |
$ |
|
6 | $ echo "[extensions]" >> $HGRCPATH | |
4 |
$ |
|
7 | $ echo "mq=" >> $HGRCPATH | |
5 |
$ |
|
8 | $ mkdir webdir |
@@ -211,6 +211,8 b' try the --mq option on a command provide' | |||||
211 |
|
211 | |||
212 | $ cd .. |
|
212 | $ cd .. | |
213 |
|
213 | |||
|
214 | #if no-outer-repo | |||
|
215 | ||||
214 | init --mq without repo |
|
216 | init --mq without repo | |
215 |
|
217 | |||
216 | $ mkdir f |
|
218 | $ mkdir f | |
@@ -220,6 +222,8 b' init --mq without repo' | |||||
220 | [255] |
|
222 | [255] | |
221 | $ cd .. |
|
223 | $ cd .. | |
222 |
|
224 | |||
|
225 | #endif | |||
|
226 | ||||
223 | init --mq with repo path |
|
227 | init --mq with repo path | |
224 |
|
228 | |||
225 | $ hg init g |
|
229 | $ hg init g |
@@ -271,6 +271,9 b' results here)' | |||||
271 |
|
271 | |||
272 | $ cd .. |
|
272 | $ cd .. | |
273 |
|
273 | |||
|
274 | hide outer repo | |||
|
275 | $ hg init | |||
|
276 | ||||
274 | Test remote paths with spaces (issue2983): |
|
277 | Test remote paths with spaces (issue2983): | |
275 |
|
278 | |||
276 | $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
|
279 | $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
@@ -29,6 +29,9 b' Cleaning both repositories, just as a cl' | |||||
29 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
29 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
30 | $ rm -rf main/sub |
|
30 | $ rm -rf main/sub | |
31 |
|
31 | |||
|
32 | hide outer repo | |||
|
33 | $ hg init | |||
|
34 | ||||
32 | Serving them both using hgweb |
|
35 | Serving them both using hgweb | |
33 |
|
36 | |||
34 | $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf |
|
37 | $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf |
@@ -8,8 +8,11 b" BUNDLEPATH = os.path.join(TESTDIR, 'bund" | |||||
8 | if not getattr(os, "symlink", False): |
|
8 | if not getattr(os, "symlink", False): | |
9 | sys.exit(80) # SKIPPED_STATUS defined in run-tests.py |
|
9 | sys.exit(80) # SKIPPED_STATUS defined in run-tests.py | |
10 |
|
10 | |||
|
11 | u = ui.ui() | |||
|
12 | # hide outer repo | |||
|
13 | hg.peer(u, {}, '.', create=True) | |||
|
14 | ||||
11 | # clone with symlink support |
|
15 | # clone with symlink support | |
12 | u = ui.ui() |
|
|||
13 | hg.clone(u, {}, BUNDLEPATH, 'test0') |
|
16 | hg.clone(u, {}, BUNDLEPATH, 'test0') | |
14 |
|
17 | |||
15 | repo = hg.repository(u, 'test0') |
|
18 | repo = hg.repository(u, 'test0') |
General Comments 0
You need to be logged in to leave comments.
Login now