##// END OF EJS Templates
check-concurrency: expose the feature as 'concurrent-push-mode'...
marmoute -
r32892:a7851519 default
parent child Browse files
Show More
@@ -1323,7 +1323,8 b' def getrepocaps(repo, allowpushback=Fals'
1323 caps['obsmarkers'] = supportedformat
1323 caps['obsmarkers'] = supportedformat
1324 if allowpushback:
1324 if allowpushback:
1325 caps['pushback'] = ()
1325 caps['pushback'] = ()
1326 if not repo.ui.configbool('experimental', 'checkheads-strict', True):
1326 cpmode = repo.ui.config('server', 'concurrent-push-mode', 'strict')
1327 if cpmode == 'check-related':
1327 caps['checkheads'] = ('related',)
1328 caps['checkheads'] = ('related',)
1328 return caps
1329 return caps
1329
1330
@@ -1694,6 +1694,17 b' Controls generic server settings.'
1694 are highly recommended. Partial clones will still be allowed.
1694 are highly recommended. Partial clones will still be allowed.
1695 (default: False)
1695 (default: False)
1696
1696
1697 ``concurrent-push-mode``
1698 Level of allowed race condition between two pushing clients.
1699
1700 - 'strict': push is abort if another client touched the repository
1701 while the push was preparing. (default)
1702 - 'check-related': push is only aborted if it affects head that got also
1703 affected while the push was preparing.
1704
1705 This requires compatible client (version 4.3 and later). Old client will
1706 use 'strict'.
1707
1697 ``validate``
1708 ``validate``
1698 Whether to validate the completeness of pushed changesets by
1709 Whether to validate the completeness of pushed changesets by
1699 checking that all new file revisions specified in manifests are
1710 checking that all new file revisions specified in manifests are
@@ -111,8 +111,8 b' We tests multiple cases:'
111 #if unrelated
111 #if unrelated
112
112
113 $ cat >> $HGRCPATH << EOF
113 $ cat >> $HGRCPATH << EOF
114 > [experimental]
114 > [server]
115 > checkheads-strict = no
115 > concurrent-push-mode = check-related
116 > EOF
116 > EOF
117
117
118 #endif
118 #endif
General Comments 0
You need to be logged in to leave comments. Login now