Show More
@@ -691,7 +691,12 b' def runone(options, test, skips, fails):' | |||||
691 | if options.timeout > 0: |
|
691 | if options.timeout > 0: | |
692 | signal.alarm(options.timeout) |
|
692 | signal.alarm(options.timeout) | |
693 |
|
693 | |||
694 |
ret, out = runner(testpath, options, [ |
|
694 | ret, out = runner(testpath, options, [ | |
|
695 | (testtmp, '$TESTTMP'), | |||
|
696 | (':%s' % options.port, ':$HGPORT'), | |||
|
697 | (':%s' % (options.port + 1), ':$HGPORT1'), | |||
|
698 | (':%s' % (options.port + 2), ':$HGPORT2'), | |||
|
699 | ]) | |||
695 | vlog("# Ret was:", ret) |
|
700 | vlog("# Ret was:", ret) | |
696 |
|
701 | |||
697 | if options.timeout > 0: |
|
702 | if options.timeout > 0: |
@@ -72,7 +72,7 b' should merge c into a' | |||||
72 | fetch over http, no auth |
|
72 | fetch over http, no auth | |
73 |
|
73 | |||
74 | $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ |
|
74 | $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | |
75 |
pulling from http://localhost: |
|
75 | pulling from http://localhost:$HGPORT/ | |
76 | searching for changes |
|
76 | searching for changes | |
77 | adding changesets |
|
77 | adding changesets | |
78 | adding manifests |
|
78 | adding manifests | |
@@ -84,12 +84,12 b' fetch over http, no auth' | |||||
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 | new changeset 3:* merges remote changes with local (glob) |
|
85 | new changeset 3:* merges remote changes with local (glob) | |
86 | $ hg --cwd d tip --template '{desc}\n' |
|
86 | $ hg --cwd d tip --template '{desc}\n' | |
87 |
Automated merge with http://localhost: |
|
87 | Automated merge with http://localhost:$HGPORT/ | |
88 |
|
88 | |||
89 | fetch over http with auth (should be hidden in desc) |
|
89 | fetch over http with auth (should be hidden in desc) | |
90 |
|
90 | |||
91 | $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ |
|
91 | $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ | |
92 |
pulling from http://user:***@localhost: |
|
92 | pulling from http://user:***@localhost:$HGPORT/ | |
93 | searching for changes |
|
93 | searching for changes | |
94 | adding changesets |
|
94 | adding changesets | |
95 | adding manifests |
|
95 | adding manifests | |
@@ -101,7 +101,7 b' fetch over http with auth (should be hid' | |||||
101 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 | new changeset 3:* merges remote changes with local (glob) |
|
102 | new changeset 3:* merges remote changes with local (glob) | |
103 | $ hg --cwd e tip --template '{desc}\n' |
|
103 | $ hg --cwd e tip --template '{desc}\n' | |
104 |
Automated merge with http://localhost: |
|
104 | Automated merge with http://localhost:$HGPORT/ | |
105 | $ hg clone a f |
|
105 | $ hg clone a f | |
106 | updating to branch default |
|
106 | updating to branch default | |
107 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
107 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -30,16 +30,16 b' Logs and changes' | |||||
30 | <?xml version="1.0" encoding="ascii"?> |
|
30 | <?xml version="1.0" encoding="ascii"?> | |
31 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
31 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
32 | <!-- Changelog --> |
|
32 | <!-- Changelog --> | |
33 | <id>http://*/</id> (glob) |
|
33 | <id>http://*:$HGPORT/</id> (glob) | |
34 | <link rel="self" href="http://*/atom-log"/> (glob) |
|
34 | <link rel="self" href="http://*:$HGPORT/atom-log"/> (glob) | |
35 | <link rel="alternate" href="http://*/"/> (glob) |
|
35 | <link rel="alternate" href="http://*:$HGPORT/"/> (glob) | |
36 | <title>test Changelog</title> |
|
36 | <title>test Changelog</title> | |
37 | <updated>1970-01-01T00:00:00+00:00</updated> |
|
37 | <updated>1970-01-01T00:00:00+00:00</updated> | |
38 |
|
38 | |||
39 | <entry> |
|
39 | <entry> | |
40 | <title>branch</title> |
|
40 | <title>branch</title> | |
41 | <id>http://*/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob) |
|
41 | <id>http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob) | |
42 | <link href="http://*/rev/1d22e65f027e"/> (glob) |
|
42 | <link href="http://*:$HGPORT/rev/1d22e65f027e"/> (glob) | |
43 | <author> |
|
43 | <author> | |
44 | <name>test</name> |
|
44 | <name>test</name> | |
45 | <email>test</email> |
|
45 | <email>test</email> | |
@@ -54,8 +54,8 b' Logs and changes' | |||||
54 | </entry> |
|
54 | </entry> | |
55 | <entry> |
|
55 | <entry> | |
56 | <title>Added tag 1.0 for changeset 2ef0ac749a14</title> |
|
56 | <title>Added tag 1.0 for changeset 2ef0ac749a14</title> | |
57 | <id>http://*/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) |
|
57 | <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) | |
58 | <link href="http://*/rev/a4f92ed23982"/> (glob) |
|
58 | <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob) | |
59 | <author> |
|
59 | <author> | |
60 | <name>test</name> |
|
60 | <name>test</name> | |
61 | <email>test</email> |
|
61 | <email>test</email> | |
@@ -70,8 +70,8 b' Logs and changes' | |||||
70 | </entry> |
|
70 | </entry> | |
71 | <entry> |
|
71 | <entry> | |
72 | <title>base</title> |
|
72 | <title>base</title> | |
73 | <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) |
|
73 | <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) | |
74 | <link href="http://*/rev/2ef0ac749a14"/> (glob) |
|
74 | <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob) | |
75 | <author> |
|
75 | <author> | |
76 | <name>test</name> |
|
76 | <name>test</name> | |
77 | <email>test</email> |
|
77 | <email>test</email> | |
@@ -92,16 +92,16 b' Logs and changes' | |||||
92 | <?xml version="1.0" encoding="ascii"?> |
|
92 | <?xml version="1.0" encoding="ascii"?> | |
93 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
93 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
94 | <!-- Changelog --> |
|
94 | <!-- Changelog --> | |
95 | <id>http://*/</id> (glob) |
|
95 | <id>http://*:$HGPORT/</id> (glob) | |
96 | <link rel="self" href="http://*/atom-log"/> (glob) |
|
96 | <link rel="self" href="http://*:$HGPORT/atom-log"/> (glob) | |
97 | <link rel="alternate" href="http://*/"/> (glob) |
|
97 | <link rel="alternate" href="http://*:$HGPORT/"/> (glob) | |
98 | <title>test Changelog</title> |
|
98 | <title>test Changelog</title> | |
99 | <updated>1970-01-01T00:00:00+00:00</updated> |
|
99 | <updated>1970-01-01T00:00:00+00:00</updated> | |
100 |
|
100 | |||
101 | <entry> |
|
101 | <entry> | |
102 | <title>branch</title> |
|
102 | <title>branch</title> | |
103 | <id>http://*/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob) |
|
103 | <id>http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob) | |
104 | <link href="http://*/rev/1d22e65f027e"/> (glob) |
|
104 | <link href="http://*:$HGPORT/rev/1d22e65f027e"/> (glob) | |
105 | <author> |
|
105 | <author> | |
106 | <name>test</name> |
|
106 | <name>test</name> | |
107 | <email>test</email> |
|
107 | <email>test</email> | |
@@ -116,8 +116,8 b' Logs and changes' | |||||
116 | </entry> |
|
116 | </entry> | |
117 | <entry> |
|
117 | <entry> | |
118 | <title>Added tag 1.0 for changeset 2ef0ac749a14</title> |
|
118 | <title>Added tag 1.0 for changeset 2ef0ac749a14</title> | |
119 | <id>http://*/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) |
|
119 | <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) | |
120 | <link href="http://*/rev/a4f92ed23982"/> (glob) |
|
120 | <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob) | |
121 | <author> |
|
121 | <author> | |
122 | <name>test</name> |
|
122 | <name>test</name> | |
123 | <email>test</email> |
|
123 | <email>test</email> | |
@@ -132,8 +132,8 b' Logs and changes' | |||||
132 | </entry> |
|
132 | </entry> | |
133 | <entry> |
|
133 | <entry> | |
134 | <title>base</title> |
|
134 | <title>base</title> | |
135 | <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) |
|
135 | <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) | |
136 | <link href="http://*/rev/2ef0ac749a14"/> (glob) |
|
136 | <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob) | |
137 | <author> |
|
137 | <author> | |
138 | <name>test</name> |
|
138 | <name>test</name> | |
139 | <email>test</email> |
|
139 | <email>test</email> | |
@@ -153,15 +153,15 b' Logs and changes' | |||||
153 |
|
153 | |||
154 | <?xml version="1.0" encoding="ascii"?> |
|
154 | <?xml version="1.0" encoding="ascii"?> | |
155 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
155 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
156 | <id>http://*/atom-log/tip/foo</id> (glob) |
|
156 | <id>http://*:$HGPORT/atom-log/tip/foo</id> (glob) | |
157 | <link rel="self" href="http://*/atom-log/tip/foo"/> (glob) |
|
157 | <link rel="self" href="http://*:$HGPORT/atom-log/tip/foo"/> (glob) | |
158 | <title>test: foo history</title> |
|
158 | <title>test: foo history</title> | |
159 | <updated>1970-01-01T00:00:00+00:00</updated> |
|
159 | <updated>1970-01-01T00:00:00+00:00</updated> | |
160 |
|
160 | |||
161 | <entry> |
|
161 | <entry> | |
162 | <title>base</title> |
|
162 | <title>base</title> | |
163 | <id>http://*/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) |
|
163 | <id>http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id> (glob) | |
164 | <link href="http://*/rev/2ef0ac749a14"/> (glob) |
|
164 | <link href="http://*:$HGPORT/rev/2ef0ac749a14"/> (glob) | |
165 | <author> |
|
165 | <author> | |
166 | <name>test</name> |
|
166 | <name>test</name> | |
167 | <email>test</email> |
|
167 | <email>test</email> |
@@ -70,16 +70,16 b' should be used from d74fc8dec2b4 onward ' | |||||
70 | <?xml version="1.0" encoding="ascii"?> |
|
70 | <?xml version="1.0" encoding="ascii"?> | |
71 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
71 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
72 | <!-- Changelog --> |
|
72 | <!-- Changelog --> | |
73 |
<id>http://127.0.0.1: |
|
73 | <id>http://127.0.0.1:$HGPORT/</id> | |
74 |
<link rel="self" href="http://127.0.0.1: |
|
74 | <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/> | |
75 |
<link rel="alternate" href="http://127.0.0.1: |
|
75 | <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/> | |
76 | <title>repo Changelog</title> |
|
76 | <title>repo Changelog</title> | |
77 | <updated>1970-01-01T00:00:00+00:00</updated> |
|
77 | <updated>1970-01-01T00:00:00+00:00</updated> | |
78 |
|
78 | |||
79 | <entry> |
|
79 | <entry> | |
80 | <title>test</title> |
|
80 | <title>test</title> | |
81 |
<id>http://127.0.0.1: |
|
81 | <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> | |
82 |
<link href="http://127.0.0.1: |
|
82 | <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> | |
83 | <author> |
|
83 | <author> | |
84 | <name>test</name> |
|
84 | <name>test</name> | |
85 | <email>test</email> |
|
85 | <email>test</email> |
@@ -83,16 +83,16 b' should be used from d74fc8dec2b4 onward ' | |||||
83 | <?xml version="1.0" encoding="ascii"?> |
|
83 | <?xml version="1.0" encoding="ascii"?> | |
84 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
84 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
85 | <!-- Changelog --> |
|
85 | <!-- Changelog --> | |
86 |
<id>http://127.0.0.1: |
|
86 | <id>http://127.0.0.1:$HGPORT/</id> | |
87 |
<link rel="self" href="http://127.0.0.1: |
|
87 | <link rel="self" href="http://127.0.0.1:$HGPORT/atom-log"/> | |
88 |
<link rel="alternate" href="http://127.0.0.1: |
|
88 | <link rel="alternate" href="http://127.0.0.1:$HGPORT/"/> | |
89 | <title>repo Changelog</title> |
|
89 | <title>repo Changelog</title> | |
90 | <updated>1970-01-01T00:00:00+00:00</updated> |
|
90 | <updated>1970-01-01T00:00:00+00:00</updated> | |
91 |
|
91 | |||
92 | <entry> |
|
92 | <entry> | |
93 | <title>test</title> |
|
93 | <title>test</title> | |
94 |
<id>http://127.0.0.1: |
|
94 | <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> | |
95 |
<link href="http://127.0.0.1: |
|
95 | <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> | |
96 | <author> |
|
96 | <author> | |
97 | <name>test</name> |
|
97 | <name>test</name> | |
98 | <email>test</email> |
|
98 | <email>test</email> |
@@ -83,14 +83,14 b' should give a 404 - repo is not publishe' | |||||
83 | atom-log without basedir |
|
83 | atom-log without basedir | |
84 |
|
84 | |||
85 | $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/atom-log' | grep '<link' |
|
85 | $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/atom-log' | grep '<link' | |
86 | <link rel="self" href="http://*/a/atom-log"/> (glob) |
|
86 | <link rel="self" href="http://*:$HGPORT/a/atom-log"/> (glob) | |
87 | <link rel="alternate" href="http://*/a/"/> (glob) |
|
87 | <link rel="alternate" href="http://*:$HGPORT/a/"/> (glob) | |
88 | <link href="http://*/a/rev/8580ff50825a"/> (glob) |
|
88 | <link href="http://*:$HGPORT/a/rev/8580ff50825a"/> (glob) | |
89 |
|
89 | |||
90 | rss-log without basedir |
|
90 | rss-log without basedir | |
91 |
|
91 | |||
92 | $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/rss-log' | grep '<guid' |
|
92 | $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/rss-log' | grep '<guid' | |
93 | <guid isPermaLink="true">http://*/a/rev/8580ff50825a</guid> (glob) |
|
93 | <guid isPermaLink="true">http://*:$HGPORT/a/rev/8580ff50825a</guid> (glob) | |
94 | $ cat > paths.conf <<EOF |
|
94 | $ cat > paths.conf <<EOF | |
95 | > [paths] |
|
95 | > [paths] | |
96 | > t/a/=$root/a |
|
96 | > t/a/=$root/a | |
@@ -395,16 +395,16 b' should succeed, slashy names' | |||||
395 | <?xml version="1.0" encoding="ascii"?> |
|
395 | <?xml version="1.0" encoding="ascii"?> | |
396 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
396 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
397 | <!-- Changelog --> |
|
397 | <!-- Changelog --> | |
398 |
|
|
398 | <id>http://*:$HGPORT1/t/a/</id> (glob) | |
399 | <link rel="self" href="http://*/t/a/atom-log"/> (glob) |
|
399 | <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob) | |
400 | <link rel="alternate" href="http://*/t/a/"/> (glob) |
|
400 | <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob) | |
401 | <title>t/a Changelog</title> |
|
401 | <title>t/a Changelog</title> | |
402 | <updated>1970-01-01T00:00:01+00:00</updated> |
|
402 | <updated>1970-01-01T00:00:01+00:00</updated> | |
403 |
|
403 | |||
404 | <entry> |
|
404 | <entry> | |
405 | <title>a</title> |
|
405 | <title>a</title> | |
406 | <id>http://*/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) |
|
406 | <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) | |
407 | <link href="http://*/t/a/rev/8580ff50825a"/> (glob) |
|
407 | <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) | |
408 | <author> |
|
408 | <author> | |
409 | <name>test</name> |
|
409 | <name>test</name> | |
410 | <email>test</email> |
|
410 | <email>test</email> | |
@@ -425,16 +425,16 b' should succeed, slashy names' | |||||
425 | <?xml version="1.0" encoding="ascii"?> |
|
425 | <?xml version="1.0" encoding="ascii"?> | |
426 | <feed xmlns="http://www.w3.org/2005/Atom"> |
|
426 | <feed xmlns="http://www.w3.org/2005/Atom"> | |
427 | <!-- Changelog --> |
|
427 | <!-- Changelog --> | |
428 | <id>http://*/t/a/</id> (glob) |
|
428 | <id>http://*:$HGPORT1/t/a/</id> (glob) | |
429 | <link rel="self" href="http://*/t/a/atom-log"/> (glob) |
|
429 | <link rel="self" href="http://*:$HGPORT1/t/a/atom-log"/> (glob) | |
430 | <link rel="alternate" href="http://*/t/a/"/> (glob) |
|
430 | <link rel="alternate" href="http://*:$HGPORT1/t/a/"/> (glob) | |
431 | <title>t/a Changelog</title> |
|
431 | <title>t/a Changelog</title> | |
432 | <updated>1970-01-01T00:00:01+00:00</updated> |
|
432 | <updated>1970-01-01T00:00:01+00:00</updated> | |
433 |
|
433 | |||
434 | <entry> |
|
434 | <entry> | |
435 | <title>a</title> |
|
435 | <title>a</title> | |
436 | <id>http://*/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) |
|
436 | <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) | |
437 | <link href="http://*/t/a/rev/8580ff50825a"/> (glob) |
|
437 | <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) | |
438 | <author> |
|
438 | <author> | |
439 | <name>test</name> |
|
439 | <name>test</name> | |
440 | <email>test</email> |
|
440 | <email>test</email> |
@@ -10,7 +10,7 b'' | |||||
10 | $ hg -R a ci -Am foo |
|
10 | $ hg -R a ci -Am foo | |
11 | adding foo |
|
11 | adding foo | |
12 | $ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1 |
|
12 | $ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1 | |
13 |
listening at http://localhost*/ (bound to 127.0.0.1: |
|
13 | listening at http://localhost*:$HGPORT1/ (bound to 127.0.0.1:$HGPORT1) (glob) | |
14 | $ hg --encoding utf-8 clone http://localhost:$HGPORT1 b |
|
14 | $ hg --encoding utf-8 clone http://localhost:$HGPORT1 b | |
15 | requesting all changes |
|
15 | requesting all changes | |
16 | adding changesets |
|
16 | adding changesets | |
@@ -30,7 +30,7 b'' | |||||
30 | $ echo bar >> b/foo |
|
30 | $ echo bar >> b/foo | |
31 | $ hg -R b ci -m bar |
|
31 | $ hg -R b ci -m bar | |
32 | $ hg --encoding utf-8 -R b push |
|
32 | $ hg --encoding utf-8 -R b push | |
33 |
pushing to http://localhost: |
|
33 | pushing to http://localhost:$HGPORT1 | |
34 | searching for changes |
|
34 | searching for changes | |
35 | remote: adding changesets |
|
35 | remote: adding changesets | |
36 | remote: adding manifests |
|
36 | remote: adding manifests |
@@ -218,7 +218,7 b' clone remote via stream' | |||||
218 | $ cd .. |
|
218 | $ cd .. | |
219 | $ cd test-1 |
|
219 | $ cd test-1 | |
220 | $ hg pull -r 4 http://localhost:$HGPORT/ |
|
220 | $ hg pull -r 4 http://localhost:$HGPORT/ | |
221 |
pulling from http://localhost: |
|
221 | pulling from http://localhost:$HGPORT/ | |
222 | searching for changes |
|
222 | searching for changes | |
223 | adding changesets |
|
223 | adding changesets | |
224 | adding manifests |
|
224 | adding manifests | |
@@ -232,7 +232,7 b' clone remote via stream' | |||||
232 | checking files |
|
232 | checking files | |
233 | 1 files, 3 changesets, 2 total revisions |
|
233 | 1 files, 3 changesets, 2 total revisions | |
234 | $ hg pull http://localhost:$HGPORT/ |
|
234 | $ hg pull http://localhost:$HGPORT/ | |
235 |
pulling from http://localhost: |
|
235 | pulling from http://localhost:$HGPORT/ | |
236 | searching for changes |
|
236 | searching for changes | |
237 | adding changesets |
|
237 | adding changesets | |
238 | adding manifests |
|
238 | adding manifests | |
@@ -242,7 +242,7 b' clone remote via stream' | |||||
242 | $ cd .. |
|
242 | $ cd .. | |
243 | $ cd test-2 |
|
243 | $ cd test-2 | |
244 | $ hg pull -r 5 http://localhost:$HGPORT/ |
|
244 | $ hg pull -r 5 http://localhost:$HGPORT/ | |
245 |
pulling from http://localhost: |
|
245 | pulling from http://localhost:$HGPORT/ | |
246 | searching for changes |
|
246 | searching for changes | |
247 | adding changesets |
|
247 | adding changesets | |
248 | adding manifests |
|
248 | adding manifests | |
@@ -256,7 +256,7 b' clone remote via stream' | |||||
256 | checking files |
|
256 | checking files | |
257 | 1 files, 5 changesets, 3 total revisions |
|
257 | 1 files, 5 changesets, 3 total revisions | |
258 | $ hg pull http://localhost:$HGPORT/ |
|
258 | $ hg pull http://localhost:$HGPORT/ | |
259 |
pulling from http://localhost: |
|
259 | pulling from http://localhost:$HGPORT/ | |
260 | searching for changes |
|
260 | searching for changes | |
261 | adding changesets |
|
261 | adding changesets | |
262 | adding manifests |
|
262 | adding manifests |
@@ -98,19 +98,19 b' do not use the proxy if it is in the no ' | |||||
98 | updating to branch default |
|
98 | updating to branch default | |
99 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
99 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
100 | $ cat proxy.log |
|
100 | $ cat proxy.log | |
101 |
* - - [*] "GET http://localhost: |
|
101 | * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob) | |
102 |
* - - [*] "GET http://localhost: |
|
102 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) | |
103 |
* - - [*] "GET http://localhost: |
|
103 | * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob) | |
104 |
* - - [*] "GET http://localhost: |
|
104 | * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob) | |
105 |
* - - [*] "GET http://localhost: |
|
105 | * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob) | |
106 |
* - - [*] "GET http://localhost: |
|
106 | * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob) | |
107 |
* - - [*] "GET http://localhost: |
|
107 | * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob) | |
108 |
* - - [*] "GET http://localhost: |
|
108 | * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob) | |
109 |
* - - [*] "GET http://localhost: |
|
109 | * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob) | |
110 |
* - - [*] "GET http://localhost: |
|
110 | * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob) | |
111 |
* - - [*] "GET http://localhost: |
|
111 | * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob) | |
112 |
* - - [*] "GET http://localhost: |
|
112 | * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob) | |
113 |
* - - [*] "GET http://localhost: |
|
113 | * - - [*] "GET http://localhost:$HGPORT/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - (glob) | |
114 |
* - - [*] "GET http://localhost: |
|
114 | * - - [*] "GET http://localhost:$HGPORT/?cmd=heads HTTP/1.1" - - (glob) | |
115 |
* - - [*] "GET http://localhost: |
|
115 | * - - [*] "GET http://localhost:$HGPORT/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - (glob) | |
116 |
|
116 |
@@ -18,7 +18,7 b'' | |||||
18 | Test server address cannot be reused |
|
18 | Test server address cannot be reused | |
19 |
|
19 | |||
20 | $ hg serve -p $HGPORT1 2>&1 |
|
20 | $ hg serve -p $HGPORT1 2>&1 | |
21 |
abort: cannot start server at ': |
|
21 | abort: cannot start server at ':$HGPORT1': Address already in use | |
22 | [255] |
|
22 | [255] | |
23 | $ cd .. |
|
23 | $ cd .. | |
24 | $ cat hg1.pid hg2.pid >> $DAEMON_PIDS |
|
24 | $ cat hg1.pid hg2.pid >> $DAEMON_PIDS | |
@@ -77,8 +77,8 b' pull' | |||||
77 | $ echo '[hooks]' >> .hg/hgrc |
|
77 | $ echo '[hooks]' >> .hg/hgrc | |
78 | $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc |
|
78 | $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc | |
79 | $ hg pull |
|
79 | $ hg pull | |
80 |
changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost: |
|
80 | changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/ | |
81 |
pulling from http://localhost: |
|
81 | pulling from http://localhost:$HGPORT1/ | |
82 | searching for changes |
|
82 | searching for changes | |
83 | adding changesets |
|
83 | adding changesets | |
84 | adding manifests |
|
84 | adding manifests |
@@ -21,7 +21,7 b'' | |||||
21 | http incoming |
|
21 | http incoming | |
22 |
|
22 | |||
23 | $ hg -R new incoming http://localhost:$HGPORT/ |
|
23 | $ hg -R new incoming http://localhost:$HGPORT/ | |
24 |
comparing with http://localhost: |
|
24 | comparing with http://localhost:$HGPORT/ | |
25 | changeset: 0:00a43fa82f62 |
|
25 | changeset: 0:00a43fa82f62 | |
26 | user: test |
|
26 | user: test | |
27 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
27 | date: Thu Jan 01 00:00:00 1970 +0000 | |
@@ -69,7 +69,7 b' http incoming' | |||||
69 | summary: 8 |
|
69 | summary: 8 | |
70 |
|
70 | |||
71 | $ hg -R new incoming -r 4 http://localhost:$HGPORT/ |
|
71 | $ hg -R new incoming -r 4 http://localhost:$HGPORT/ | |
72 |
comparing with http://localhost: |
|
72 | comparing with http://localhost:$HGPORT/ | |
73 | changeset: 0:00a43fa82f62 |
|
73 | changeset: 0:00a43fa82f62 | |
74 | user: test |
|
74 | user: test | |
75 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
75 | date: Thu Jan 01 00:00:00 1970 +0000 | |
@@ -222,7 +222,7 b' limit to 2 changesets, test with -p --gi' | |||||
222 | test with --bundle |
|
222 | test with --bundle | |
223 |
|
223 | |||
224 | $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ |
|
224 | $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | |
225 |
comparing with http://localhost: |
|
225 | comparing with http://localhost:$HGPORT/ | |
226 | changeset: 0:00a43fa82f62 |
|
226 | changeset: 0:00a43fa82f62 | |
227 | user: test |
|
227 | user: test | |
228 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
228 | date: Thu Jan 01 00:00:00 1970 +0000 | |
@@ -420,7 +420,7 b' limit to 3 changesets' | |||||
420 | summary: 11 |
|
420 | summary: 11 | |
421 |
|
421 | |||
422 | $ hg -R test-dev outgoing http://localhost:$HGPORT/ |
|
422 | $ hg -R test-dev outgoing http://localhost:$HGPORT/ | |
423 |
comparing with http://localhost: |
|
423 | comparing with http://localhost:$HGPORT/ | |
424 | searching for changes |
|
424 | searching for changes | |
425 | changeset: 9:d89d4abea5bc |
|
425 | changeset: 9:d89d4abea5bc | |
426 | user: test |
|
426 | user: test | |
@@ -449,7 +449,7 b' limit to 3 changesets' | |||||
449 | summary: 13 |
|
449 | summary: 13 | |
450 |
|
450 | |||
451 | $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ |
|
451 | $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | |
452 |
comparing with http://localhost: |
|
452 | comparing with http://localhost:$HGPORT/ | |
453 | searching for changes |
|
453 | searching for changes | |
454 | changeset: 9:d89d4abea5bc |
|
454 | changeset: 9:d89d4abea5bc | |
455 | user: test |
|
455 | user: test |
@@ -141,7 +141,7 b' test with old-style collection' | |||||
141 | test --mq works and uses correct repository config |
|
141 | test --mq works and uses correct repository config | |
142 |
|
142 | |||
143 | $ hg --cwd d outgoing --mq |
|
143 | $ hg --cwd d outgoing --mq | |
144 |
comparing |
|
144 | comparing with http://localhost:$HGPORT2/a/.hg/patches | |
145 | searching for changes |
|
145 | searching for changes | |
146 | no changes found |
|
146 | no changes found | |
147 | [1] |
|
147 | [1] |
@@ -40,7 +40,7 b' serve errors' | |||||
40 | expect error, pulling not allowed |
|
40 | expect error, pulling not allowed | |
41 |
|
41 | |||
42 | $ req |
|
42 | $ req | |
43 |
pulling from http://localhost: |
|
43 | pulling from http://localhost:$HGPORT/ | |
44 | searching for changes |
|
44 | searching for changes | |
45 | abort: authorization failed |
|
45 | abort: authorization failed | |
46 | % serve errors |
|
46 | % serve errors |
@@ -44,12 +44,12 b'' | |||||
44 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
44 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | |
45 |
|
45 | |||
46 | $ hg pull |
|
46 | $ hg pull | |
47 |
pulling from http://foo: |
|
47 | pulling from http://foo:***@localhost:$HGPORT/ | |
48 | searching for changes |
|
48 | searching for changes | |
49 | no changes found |
|
49 | no changes found | |
50 |
|
50 | |||
51 | $ hg rollback --dry-run --verbose |
|
51 | $ hg rollback --dry-run --verbose | |
52 |
rolling back to revision -1 (undo pull: http://foo: |
|
52 | rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) | |
53 |
|
53 | |||
54 | Issue622: hg init && hg pull -u URL doesn't checkout default branch |
|
54 | Issue622: hg init && hg pull -u URL doesn't checkout default branch | |
55 |
|
55 |
@@ -25,7 +25,7 b'' | |||||
25 | expect ssl error |
|
25 | expect ssl error | |
26 |
|
26 | |||
27 | $ req |
|
27 | $ req | |
28 |
pushing to http://localhost: |
|
28 | pushing to http://localhost:$HGPORT/ | |
29 | searching for changes |
|
29 | searching for changes | |
30 | remote: ssl required |
|
30 | remote: ssl required | |
31 | % serve errors |
|
31 | % serve errors | |
@@ -35,7 +35,7 b' expect authorization error' | |||||
35 | $ echo '[web]' > .hg/hgrc |
|
35 | $ echo '[web]' > .hg/hgrc | |
36 | $ echo 'push_ssl = false' >> .hg/hgrc |
|
36 | $ echo 'push_ssl = false' >> .hg/hgrc | |
37 | $ req |
|
37 | $ req | |
38 |
pushing to http://localhost: |
|
38 | pushing to http://localhost:$HGPORT/ | |
39 | searching for changes |
|
39 | searching for changes | |
40 | abort: authorization failed |
|
40 | abort: authorization failed | |
41 | % serve errors |
|
41 | % serve errors | |
@@ -44,7 +44,7 b' expect authorization error: must have au' | |||||
44 |
|
44 | |||
45 | $ echo 'allow_push = unperson' >> .hg/hgrc |
|
45 | $ echo 'allow_push = unperson' >> .hg/hgrc | |
46 | $ req |
|
46 | $ req | |
47 |
pushing to http://localhost: |
|
47 | pushing to http://localhost:$HGPORT/ | |
48 | searching for changes |
|
48 | searching for changes | |
49 | abort: authorization failed |
|
49 | abort: authorization failed | |
50 | % serve errors |
|
50 | % serve errors | |
@@ -55,7 +55,7 b' expect success' | |||||
55 | $ echo '[hooks]' >> .hg/hgrc |
|
55 | $ echo '[hooks]' >> .hg/hgrc | |
56 | $ echo 'changegroup = python ../printenv.py changegroup 0' >> .hg/hgrc |
|
56 | $ echo 'changegroup = python ../printenv.py changegroup 0' >> .hg/hgrc | |
57 | $ req |
|
57 | $ req | |
58 |
pushing to http://localhost: |
|
58 | pushing to http://localhost:$HGPORT/ | |
59 | searching for changes |
|
59 | searching for changes | |
60 | remote: adding changesets |
|
60 | remote: adding changesets | |
61 | remote: adding manifests |
|
61 | remote: adding manifests | |
@@ -72,7 +72,7 b' expect authorization error: all users de' | |||||
72 | $ echo 'push_ssl = false' >> .hg/hgrc |
|
72 | $ echo 'push_ssl = false' >> .hg/hgrc | |
73 | $ echo 'deny_push = *' >> .hg/hgrc |
|
73 | $ echo 'deny_push = *' >> .hg/hgrc | |
74 | $ req |
|
74 | $ req | |
75 |
pushing to http://localhost: |
|
75 | pushing to http://localhost:$HGPORT/ | |
76 | searching for changes |
|
76 | searching for changes | |
77 | abort: authorization failed |
|
77 | abort: authorization failed | |
78 | % serve errors |
|
78 | % serve errors | |
@@ -81,7 +81,7 b' expect authorization error: some users d' | |||||
81 |
|
81 | |||
82 | $ echo 'deny_push = unperson' >> .hg/hgrc |
|
82 | $ echo 'deny_push = unperson' >> .hg/hgrc | |
83 | $ req |
|
83 | $ req | |
84 |
pushing to http://localhost: |
|
84 | pushing to http://localhost:$HGPORT/ | |
85 | searching for changes |
|
85 | searching for changes | |
86 | abort: authorization failed |
|
86 | abort: authorization failed | |
87 | % serve errors |
|
87 | % serve errors |
@@ -24,7 +24,7 b'' | |||||
24 | check that {1} syntax works |
|
24 | check that {1} syntax works | |
25 |
|
25 | |||
26 | $ hg incoming --debug parts://localhost |
|
26 | $ hg incoming --debug parts://localhost | |
27 |
using http://localhost: |
|
27 | using http://localhost:$HGPORT/ | |
28 | sending between command |
|
28 | sending between command | |
29 | comparing with parts://localhost |
|
29 | comparing with parts://localhost | |
30 | sending heads command |
|
30 | sending heads command |
@@ -66,8 +66,8 b' check for HTTP opener failures when cach' | |||||
66 | $ echo '[hooks]' >> .hg/hgrc |
|
66 | $ echo '[hooks]' >> .hg/hgrc | |
67 | $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc |
|
67 | $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc | |
68 | $ hg pull |
|
68 | $ hg pull | |
69 |
|
|
69 | changegroup hook: HG_NODE=822d6e31f08b9d6e3b898ce5e52efc0a4bf4905a HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote | |
70 |
pulling from static |
|
70 | pulling from static-http://localhost:$HGPORT/remote | |
71 | searching for changes |
|
71 | searching for changes | |
72 | adding changesets |
|
72 | adding changesets | |
73 | adding manifests |
|
73 | adding manifests | |
@@ -82,7 +82,7 b' trying to push' | |||||
82 | $ echo more foo >> bar |
|
82 | $ echo more foo >> bar | |
83 | $ hg commit -m"test" |
|
83 | $ hg commit -m"test" | |
84 | $ hg push |
|
84 | $ hg push | |
85 |
pushing to static-http://localhost: |
|
85 | pushing to static-http://localhost:$HGPORT/remote | |
86 | abort: cannot lock static-http repository |
|
86 | abort: cannot lock static-http repository | |
87 | [255] |
|
87 | [255] | |
88 |
|
88 | |||
@@ -125,7 +125,7 b' test with "/" URI (issue 747)' | |||||
125 | $ cat a |
|
125 | $ cat a | |
126 | a |
|
126 | a | |
127 | $ hg paths |
|
127 | $ hg paths | |
128 |
default = static-http://localhost: |
|
128 | default = static-http://localhost:$HGPORT/ | |
129 |
|
129 | |||
130 | test with empty repo (issue965) |
|
130 | test with empty repo (issue965) | |
131 |
|
131 | |||
@@ -143,13 +143,13 b' test with empty repo (issue965)' | |||||
143 | checking files |
|
143 | checking files | |
144 | 0 files, 0 changesets, 0 total revisions |
|
144 | 0 files, 0 changesets, 0 total revisions | |
145 | $ hg paths |
|
145 | $ hg paths | |
146 |
default = static-http://localhost: |
|
146 | default = static-http://localhost:$HGPORT/remotempty | |
147 |
|
147 | |||
148 | test with non-repo |
|
148 | test with non-repo | |
149 |
|
149 | |||
150 | $ cd .. |
|
150 | $ cd .. | |
151 | $ mkdir notarepo |
|
151 | $ mkdir notarepo | |
152 | $ hg clone static-http://localhost:$HGPORT/notarepo local3 |
|
152 | $ hg clone static-http://localhost:$HGPORT/notarepo local3 | |
153 |
abort: 'http://localhost: |
|
153 | abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository! | |
154 | [255] |
|
154 | [255] | |
155 | $ kill $! |
|
155 | $ kill $! |
@@ -44,7 +44,7 b' Clone main from hgweb' | |||||
44 | adding file changes |
|
44 | adding file changes | |
45 | added 1 changesets with 3 changes to 3 files |
|
45 | added 1 changesets with 3 changes to 3 files | |
46 | updating to branch default |
|
46 | updating to branch default | |
47 |
pulling subrepo sub from http://localhost: |
|
47 | pulling subrepo sub from http://localhost:$HGPORT/sub | |
48 | requesting all changes |
|
48 | requesting all changes | |
49 | adding changesets |
|
49 | adding changesets | |
50 | adding manifests |
|
50 | adding manifests |
General Comments 0
You need to be logged in to leave comments.
Login now