##// END OF EJS Templates
pushrace: avoid crash on bare push when using concurrent push mode...
marmoute -
r33133:78fc540c default
parent child Browse files
Show More
@@ -730,7 +730,8 b' def _pushb2ctxcheckheads(pushop, bundler'
730 # * if we don't push anything, there are nothing to check.
730 # * if we don't push anything, there are nothing to check.
731 if not pushop.force and pushop.outgoing.missingheads:
731 if not pushop.force and pushop.outgoing.missingheads:
732 allowunrelated = 'related' in bundler.capabilities.get('checkheads', ())
732 allowunrelated = 'related' in bundler.capabilities.get('checkheads', ())
733 if not allowunrelated:
733 emptyremote = pushop.pushbranchmap is None
734 if not allowunrelated or emptyremote:
734 bundler.newpart('check:heads', data=iter(pushop.remoteheads))
735 bundler.newpart('check:heads', data=iter(pushop.remoteheads))
735 else:
736 else:
736 affected = set()
737 affected = set()
@@ -297,3 +297,22 b' Test push hook locking'
297 lock: user *, process * (*s) (glob)
297 lock: user *, process * (*s) (glob)
298 wlock: user *, process * (*s) (glob)
298 wlock: user *, process * (*s) (glob)
299
299
300 Test bare push with multiple race checking options
301 --------------------------------------------------
302
303 $ hg init test-bare-push-no-concurrency
304 $ hg init test-bare-push-unrelated-concurrency
305 $ hg -R test-revflag push -r 0 test-bare-push-no-concurrency --config server.concurrent-push-mode=strict
306 pushing to test-bare-push-no-concurrency
307 searching for changes
308 adding changesets
309 adding manifests
310 adding file changes
311 added 1 changesets with 1 changes to 1 files
312 $ hg -R test-revflag push -r 0 test-bare-push-unrelated-concurrency --config server.concurrent-push-mode=check-related
313 pushing to test-bare-push-unrelated-concurrency
314 searching for changes
315 adding changesets
316 adding manifests
317 adding file changes
318 added 1 changesets with 1 changes to 1 files
General Comments 0
You need to be logged in to leave comments. Login now