Show More
@@ -4261,7 +4261,7 b' def phase(ui, repo, *revs, **opts):' | |||||
4261 |
|
4261 | |||
4262 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
4262 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
4263 | if modheads == 0: |
|
4263 | if modheads == 0: | |
4264 |
return |
|
4264 | return | |
4265 | if optupdate: |
|
4265 | if optupdate: | |
4266 | movemarkfrom = repo['.'].node() |
|
4266 | movemarkfrom = repo['.'].node() | |
4267 | try: |
|
4267 | try: | |
@@ -4312,8 +4312,7 b' def pull(ui, repo, source="default", **o' | |||||
4312 | If SOURCE is omitted, the 'default' path will be used. |
|
4312 | If SOURCE is omitted, the 'default' path will be used. | |
4313 | See :hg:`help urls` for more information. |
|
4313 | See :hg:`help urls` for more information. | |
4314 |
|
4314 | |||
4315 |
Returns 0 on success, 1 if |
|
4315 | Returns 0 on success, 1 if an update had unresolved files. | |
4316 | unresolved files. |
|
|||
4317 | """ |
|
4316 | """ | |
4318 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4317 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
4319 | other = hg.peer(repo, opts, source) |
|
4318 | other = hg.peer(repo, opts, source) |
@@ -44,7 +44,6 b' import bookmark by name' | |||||
44 | pulling from ../a |
|
44 | pulling from ../a | |
45 | no changes found |
|
45 | no changes found | |
46 | importing bookmark X |
|
46 | importing bookmark X | |
47 | [1] |
|
|||
48 | $ hg bookmark |
|
47 | $ hg bookmark | |
49 | X 0:4e3505fd9583 |
|
48 | X 0:4e3505fd9583 | |
50 | Y 0:4e3505fd9583 |
|
49 | Y 0:4e3505fd9583 | |
@@ -185,7 +184,6 b' hgweb' | |||||
185 | no changes found |
|
184 | no changes found | |
186 | divergent bookmark X stored as X@1 |
|
185 | divergent bookmark X stored as X@1 | |
187 | importing bookmark Z |
|
186 | importing bookmark Z | |
188 | [1] |
|
|||
189 | $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
|
187 | $ hg clone http://localhost:$HGPORT/ cloned-bookmarks | |
190 | requesting all changes |
|
188 | requesting all changes | |
191 | adding changesets |
|
189 | adding changesets |
@@ -85,7 +85,6 b' Pull full.hg into test (using --cwd)' | |||||
85 | pulling from ../full.hg |
|
85 | pulling from ../full.hg | |
86 | searching for changes |
|
86 | searching for changes | |
87 | no changes found |
|
87 | no changes found | |
88 | [1] |
|
|||
89 |
|
88 | |||
90 | Pull full.hg into empty (using --cwd) |
|
89 | Pull full.hg into empty (using --cwd) | |
91 |
|
90 | |||
@@ -120,7 +119,6 b' Pull full.hg into test (using -R)' | |||||
120 | pulling from full.hg |
|
119 | pulling from full.hg | |
121 | searching for changes |
|
120 | searching for changes | |
122 | no changes found |
|
121 | no changes found | |
123 | [1] |
|
|||
124 |
|
122 | |||
125 | Pull full.hg into empty (using -R) |
|
123 | Pull full.hg into empty (using -R) | |
126 |
|
124 | |||
@@ -128,7 +126,6 b' Pull full.hg into empty (using -R)' | |||||
128 | pulling from full.hg |
|
126 | pulling from full.hg | |
129 | searching for changes |
|
127 | searching for changes | |
130 | no changes found |
|
128 | no changes found | |
131 | [1] |
|
|||
132 |
|
129 | |||
133 | Rollback empty |
|
130 | Rollback empty | |
134 |
|
131 |
@@ -293,7 +293,6 b'' | |||||
293 | pulling from ../a |
|
293 | pulling from ../a | |
294 | searching for changes |
|
294 | searching for changes | |
295 | no changes found |
|
295 | no changes found | |
296 | [1] |
|
|||
297 | $ touch bogusfile |
|
296 | $ touch bogusfile | |
298 |
|
297 | |||
299 | should fail |
|
298 | should fail |
@@ -196,7 +196,6 b' listkeys hook' | |||||
196 | listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} |
|
196 | listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} | |
197 | listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} |
|
197 | listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} | |
198 | importing bookmark bar |
|
198 | importing bookmark bar | |
199 | [1] |
|
|||
200 | $ cd ../a |
|
199 | $ cd ../a | |
201 |
|
200 | |||
202 | test that prepushkey can prevent incoming keys |
|
201 | test that prepushkey can prevent incoming keys |
@@ -160,7 +160,6 b' cacert configured in local repo' | |||||
160 | pulling from https://localhost:$HGPORT/ |
|
160 | pulling from https://localhost:$HGPORT/ | |
161 | searching for changes |
|
161 | searching for changes | |
162 | no changes found |
|
162 | no changes found | |
163 | [1] |
|
|||
164 | $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc |
|
163 | $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc | |
165 |
|
164 | |||
166 | cacert configured globally, also testing expansion of environment |
|
165 | cacert configured globally, also testing expansion of environment | |
@@ -172,13 +171,11 b' variables in the filename' | |||||
172 | pulling from https://localhost:$HGPORT/ |
|
171 | pulling from https://localhost:$HGPORT/ | |
173 | searching for changes |
|
172 | searching for changes | |
174 | no changes found |
|
173 | no changes found | |
175 | [1] |
|
|||
176 | $ P=`pwd` hg -R copy-pull pull --insecure |
|
174 | $ P=`pwd` hg -R copy-pull pull --insecure | |
177 | warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting) |
|
175 | warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting) | |
178 | pulling from https://localhost:$HGPORT/ |
|
176 | pulling from https://localhost:$HGPORT/ | |
179 | searching for changes |
|
177 | searching for changes | |
180 | no changes found |
|
178 | no changes found | |
181 | [1] |
|
|||
182 |
|
179 | |||
183 | cacert mismatch |
|
180 | cacert mismatch | |
184 |
|
181 | |||
@@ -191,7 +188,6 b' cacert mismatch' | |||||
191 | pulling from https://127.0.0.1:$HGPORT/ |
|
188 | pulling from https://127.0.0.1:$HGPORT/ | |
192 | searching for changes |
|
189 | searching for changes | |
193 | no changes found |
|
190 | no changes found | |
194 | [1] |
|
|||
195 | $ hg -R copy-pull pull --config web.cacerts=pub-other.pem |
|
191 | $ hg -R copy-pull pull --config web.cacerts=pub-other.pem | |
196 | abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) |
|
192 | abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) | |
197 | [255] |
|
193 | [255] | |
@@ -200,7 +196,6 b' cacert mismatch' | |||||
200 | pulling from https://localhost:$HGPORT/ |
|
196 | pulling from https://localhost:$HGPORT/ | |
201 | searching for changes |
|
197 | searching for changes | |
202 | no changes found |
|
198 | no changes found | |
203 | [1] |
|
|||
204 |
|
199 | |||
205 | Test server cert which isn't valid yet |
|
200 | Test server cert which isn't valid yet | |
206 |
|
201 | |||
@@ -260,7 +255,6 b' Test unvalidated https through proxy' | |||||
260 | pulling from https://localhost:$HGPORT/ |
|
255 | pulling from https://localhost:$HGPORT/ | |
261 | searching for changes |
|
256 | searching for changes | |
262 | no changes found |
|
257 | no changes found | |
263 | [1] |
|
|||
264 |
|
258 | |||
265 | Test https with cacert and fingerprint through proxy |
|
259 | Test https with cacert and fingerprint through proxy | |
266 |
|
260 | |||
@@ -268,12 +262,10 b' Test https with cacert and fingerprint t' | |||||
268 | pulling from https://localhost:$HGPORT/ |
|
262 | pulling from https://localhost:$HGPORT/ | |
269 | searching for changes |
|
263 | searching for changes | |
270 | no changes found |
|
264 | no changes found | |
271 | [1] |
|
|||
272 | $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/ |
|
265 | $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/ | |
273 | pulling from https://127.0.0.1:$HGPORT/ |
|
266 | pulling from https://127.0.0.1:$HGPORT/ | |
274 | searching for changes |
|
267 | searching for changes | |
275 | no changes found |
|
268 | no changes found | |
276 | [1] |
|
|||
277 |
|
269 | |||
278 | Test https with cert problems through proxy |
|
270 | Test https with cert problems through proxy | |
279 |
|
271 |
@@ -34,7 +34,6 b' valid patches before fail added to serie' | |||||
34 | b.patch |
|
34 | b.patch | |
35 |
|
35 | |||
36 | $ hg pull -q -r 0 . # update phase |
|
36 | $ hg pull -q -r 0 . # update phase | |
37 | [1] |
|
|||
38 | $ hg qimport -r 0 |
|
37 | $ hg qimport -r 0 | |
39 | abort: revision 0 is not mutable |
|
38 | abort: revision 0 is not mutable | |
40 | (see "hg help phases" for details) |
|
39 | (see "hg help phases" for details) |
@@ -102,7 +102,6 b' test python hook' | |||||
102 | rollback completed |
|
102 | rollback completed | |
103 | abort: pretxnchangegroup hook failed |
|
103 | abort: pretxnchangegroup hook failed | |
104 | pull 0000000000000000000000000000000000000000 |
|
104 | pull 0000000000000000000000000000000000000000 | |
105 | [1] |
|
|||
106 |
|
105 | |||
107 | test external hook |
|
106 | test external hook | |
108 |
|
107 | |||
@@ -118,4 +117,3 b' test external hook' | |||||
118 | rollback completed |
|
117 | rollback completed | |
119 | abort: pretxnchangegroup hook exited with status 1 |
|
118 | abort: pretxnchangegroup hook exited with status 1 | |
120 | pull 0000000000000000000000000000000000000000 |
|
119 | pull 0000000000000000000000000000000000000000 | |
121 | [1] |
|
@@ -136,7 +136,6 b' update must update phase of common chang' | |||||
136 | pulling from ../alpha |
|
136 | pulling from ../alpha | |
137 | searching for changes |
|
137 | searching for changes | |
138 | no changes found |
|
138 | no changes found | |
139 | [1] |
|
|||
140 | $ hgph |
|
139 | $ hgph | |
141 | o 4 public a-D - b555f63b6063 |
|
140 | o 4 public a-D - b555f63b6063 | |
142 | | |
|
141 | | | |
@@ -344,7 +343,6 b' pulling back into original repo' | |||||
344 | pulling from ../alpha |
|
343 | pulling from ../alpha | |
345 | searching for changes |
|
344 | searching for changes | |
346 | no changes found |
|
345 | no changes found | |
347 | [1] |
|
|||
348 | $ hgph |
|
346 | $ hgph | |
349 | @ 6 public n-B - 145e75495359 |
|
347 | @ 6 public n-B - 145e75495359 | |
350 | | |
|
348 | | | |
@@ -777,7 +775,6 b' Discovery locally secret changeset on a ' | |||||
777 | pulling from ../mu |
|
775 | pulling from ../mu | |
778 | searching for changes |
|
776 | searching for changes | |
779 | no changes found |
|
777 | no changes found | |
780 | [1] |
|
|||
781 | $ hgph |
|
778 | $ hgph | |
782 | @ 11 draft A-secret - 435b5d83910c |
|
779 | @ 11 draft A-secret - 435b5d83910c | |
783 | | |
|
780 | | | |
@@ -930,7 +927,6 b' same over the wire' | |||||
930 | pulling from http://localhost:$HGPORT/ |
|
927 | pulling from http://localhost:$HGPORT/ | |
931 | searching for changes |
|
928 | searching for changes | |
932 | no changes found |
|
929 | no changes found | |
933 | [1] |
|
|||
934 | $ hg phase f54f1bb90ff3 |
|
930 | $ hg phase f54f1bb90ff3 | |
935 | 2: draft |
|
931 | 2: draft | |
936 |
|
932 |
@@ -100,5 +100,4 b' Pull multiple revisions with update:' | |||||
100 | This used to abort: received changelog group is empty: |
|
100 | This used to abort: received changelog group is empty: | |
101 |
|
101 | |||
102 | $ hg pull -qr 1 ../repo |
|
102 | $ hg pull -qr 1 ../repo | |
103 | [1] |
|
|||
104 |
|
103 |
@@ -48,7 +48,6 b'' | |||||
48 | pulling from http://foo@localhost:$HGPORT/ |
|
48 | pulling from http://foo@localhost:$HGPORT/ | |
49 | searching for changes |
|
49 | searching for changes | |
50 | no changes found |
|
50 | no changes found | |
51 | [1] |
|
|||
52 |
|
51 | |||
53 | $ hg rollback --dry-run --verbose |
|
52 | $ hg rollback --dry-run --verbose | |
54 | repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) |
|
53 | repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) | |
@@ -78,7 +77,6 b" Test 'file:' uri handling:" | |||||
78 | [255] |
|
77 | [255] | |
79 |
|
78 | |||
80 | $ hg pull -q file:../test |
|
79 | $ hg pull -q file:../test | |
81 | [1] |
|
|||
82 |
|
80 | |||
83 | It's tricky to make file:// URLs working on every platform with |
|
81 | It's tricky to make file:// URLs working on every platform with | |
84 | regular shell commands. |
|
82 | regular shell commands. | |
@@ -90,4 +88,3 b' regular shell commands.' | |||||
90 |
|
88 | |||
91 | $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` |
|
89 | $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` | |
92 | $ hg pull -q "$URL" |
|
90 | $ hg pull -q "$URL" | |
93 | [1] |
|
@@ -80,7 +80,6 b' empty default pull' | |||||
80 | pulling from ssh://user@dummy/remote |
|
80 | pulling from ssh://user@dummy/remote | |
81 | searching for changes |
|
81 | searching for changes | |
82 | no changes found |
|
82 | no changes found | |
83 | [1] |
|
|||
84 |
|
83 | |||
85 | local change |
|
84 | local change | |
86 |
|
85 | |||
@@ -199,7 +198,6 b' test pushkeys and bookmarks' | |||||
199 | no changes found |
|
198 | no changes found | |
200 | updating bookmark foo |
|
199 | updating bookmark foo | |
201 | importing bookmark foo |
|
200 | importing bookmark foo | |
202 | [1] |
|
|||
203 | $ hg book -d foo |
|
201 | $ hg book -d foo | |
204 | $ hg push -B foo |
|
202 | $ hg push -B foo | |
205 | pushing to ssh://user@dummy/remote |
|
203 | pushing to ssh://user@dummy/remote |
@@ -580,7 +580,6 b' Issue1977: multirepo push should fail if' | |||||
580 | cloning subrepo s from $TESTTMP/sub/repo/s (glob) |
|
580 | cloning subrepo s from $TESTTMP/sub/repo/s (glob) | |
581 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
581 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
582 | $ hg -q -R repo2 pull -u |
|
582 | $ hg -q -R repo2 pull -u | |
583 | [1] |
|
|||
584 | $ echo 1 > repo2/s/a |
|
583 | $ echo 1 > repo2/s/a | |
585 | $ hg -R repo2/s ci -m2 |
|
584 | $ hg -R repo2/s ci -m2 | |
586 | $ hg -q -R repo2/s push |
|
585 | $ hg -q -R repo2/s push | |
@@ -639,7 +638,6 b" Pull -u now doesn't help" | |||||
639 | pulling from issue1852a |
|
638 | pulling from issue1852a | |
640 | searching for changes |
|
639 | searching for changes | |
641 | no changes found |
|
640 | no changes found | |
642 | [1] |
|
|||
643 |
|
641 | |||
644 | Try the same, but with pull -u |
|
642 | Try the same, but with pull -u | |
645 |
|
643 |
@@ -48,7 +48,6 b' Both are empty:' | |||||
48 | $ hg pull -R empty1 $remote |
|
48 | $ hg pull -R empty1 $remote | |
49 | pulling from http://localhost:$HGPORT/ |
|
49 | pulling from http://localhost:$HGPORT/ | |
50 | no changes found |
|
50 | no changes found | |
51 | [1] |
|
|||
52 | $ hg push -R empty1 $remote |
|
51 | $ hg push -R empty1 $remote | |
53 | pushing to http://localhost:$HGPORT/ |
|
52 | pushing to http://localhost:$HGPORT/ | |
54 | no changes found |
|
53 | no changes found | |
@@ -108,7 +107,6 b' Full clone:' | |||||
108 | pulling from http://localhost:$HGPORT/ |
|
107 | pulling from http://localhost:$HGPORT/ | |
109 | searching for changes |
|
108 | searching for changes | |
110 | no changes found |
|
109 | no changes found | |
111 | [1] |
|
|||
112 | $ hg push $remote |
|
110 | $ hg push $remote | |
113 | pushing to http://localhost:$HGPORT/ |
|
111 | pushing to http://localhost:$HGPORT/ | |
114 | searching for changes |
|
112 | searching for changes | |
@@ -233,7 +231,6 b' Remote is empty:' | |||||
233 | pulling from http://localhost:$HGPORT/ |
|
231 | pulling from http://localhost:$HGPORT/ | |
234 | searching for changes |
|
232 | searching for changes | |
235 | no changes found |
|
233 | no changes found | |
236 | [1] |
|
|||
237 | $ hg push $remote |
|
234 | $ hg push $remote | |
238 | pushing to http://localhost:$HGPORT/ |
|
235 | pushing to http://localhost:$HGPORT/ | |
239 | searching for changes |
|
236 | searching for changes | |
@@ -278,7 +275,6 b' Local is superset:' | |||||
278 | pulling from http://localhost:$HGPORT/ |
|
275 | pulling from http://localhost:$HGPORT/ | |
279 | searching for changes |
|
276 | searching for changes | |
280 | no changes found |
|
277 | no changes found | |
281 | [1] |
|
|||
282 | $ hg push $remote |
|
278 | $ hg push $remote | |
283 | pushing to http://localhost:$HGPORT/ |
|
279 | pushing to http://localhost:$HGPORT/ | |
284 | searching for changes |
|
280 | searching for changes |
@@ -42,7 +42,6 b' Both are empty:' | |||||
42 | $ hg pull -R empty1 $remote |
|
42 | $ hg pull -R empty1 $remote | |
43 | pulling from http://localhost:$HGPORT/ |
|
43 | pulling from http://localhost:$HGPORT/ | |
44 | no changes found |
|
44 | no changes found | |
45 | [1] |
|
|||
46 | $ hg push -R empty1 $remote |
|
45 | $ hg push -R empty1 $remote | |
47 | pushing to http://localhost:$HGPORT/ |
|
46 | pushing to http://localhost:$HGPORT/ | |
48 | no changes found |
|
47 | no changes found | |
@@ -102,7 +101,6 b' Full clone:' | |||||
102 | pulling from http://localhost:$HGPORT/ |
|
101 | pulling from http://localhost:$HGPORT/ | |
103 | searching for changes |
|
102 | searching for changes | |
104 | no changes found |
|
103 | no changes found | |
105 | [1] |
|
|||
106 | $ hg push $remote |
|
104 | $ hg push $remote | |
107 | pushing to http://localhost:$HGPORT/ |
|
105 | pushing to http://localhost:$HGPORT/ | |
108 | searching for changes |
|
106 | searching for changes | |
@@ -221,7 +219,6 b' Remote is empty:' | |||||
221 | pulling from http://localhost:$HGPORT/ |
|
219 | pulling from http://localhost:$HGPORT/ | |
222 | searching for changes |
|
220 | searching for changes | |
223 | no changes found |
|
221 | no changes found | |
224 | [1] |
|
|||
225 | $ hg push $remote |
|
222 | $ hg push $remote | |
226 | pushing to http://localhost:$HGPORT/ |
|
223 | pushing to http://localhost:$HGPORT/ | |
227 | searching for changes |
|
224 | searching for changes | |
@@ -266,7 +263,6 b' Local is superset:' | |||||
266 | pulling from http://localhost:$HGPORT/ |
|
263 | pulling from http://localhost:$HGPORT/ | |
267 | searching for changes |
|
264 | searching for changes | |
268 | no changes found |
|
265 | no changes found | |
269 | [1] |
|
|||
270 | $ hg push $remote |
|
266 | $ hg push $remote | |
271 | pushing to http://localhost:$HGPORT/ |
|
267 | pushing to http://localhost:$HGPORT/ | |
272 | searching for changes |
|
268 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now