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