Show More
@@ -788,7 +788,7 b' def getrepocaps(repo):' | |||||
788 | Exists to allow extensions (like evolution) to mutate the capabilities. |
|
788 | Exists to allow extensions (like evolution) to mutate the capabilities. | |
789 | """ |
|
789 | """ | |
790 | caps = capabilities.copy() |
|
790 | caps = capabilities.copy() | |
791 |
if obsolete. |
|
791 | if obsolete.isenabled(repo, obsolete.exchangeopt): | |
792 | supportedformat = tuple('V%i' % v for v in obsolete.formats) |
|
792 | supportedformat = tuple('V%i' % v for v in obsolete.formats) | |
793 | caps['b2x:obsmarkers'] = supportedformat |
|
793 | caps['b2x:obsmarkers'] = supportedformat | |
794 | return caps |
|
794 | return caps |
@@ -309,7 +309,7 b' def _pushdiscoveryphase(pushop):' | |||||
309 |
|
309 | |||
310 | @pushdiscovery('obsmarker') |
|
310 | @pushdiscovery('obsmarker') | |
311 | def _pushdiscoveryobsmarkers(pushop): |
|
311 | def _pushdiscoveryobsmarkers(pushop): | |
312 | if (obsolete._enabled |
|
312 | if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt) | |
313 | and pushop.repo.obsstore |
|
313 | and pushop.repo.obsstore | |
314 | and 'obsolete' in pushop.remote.listkeys('namespaces')): |
|
314 | and 'obsolete' in pushop.remote.listkeys('namespaces')): | |
315 | repo = pushop.repo |
|
315 | repo = pushop.repo | |
@@ -929,7 +929,7 b' def _pullbundle2(pullop):' | |||||
929 | else: |
|
929 | else: | |
930 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
930 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
931 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
931 | pullop.repo.ui.status(_("requesting all changes\n")) | |
932 | if obsolete._enabled: |
|
932 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
933 | remoteversions = bundle2.obsmarkersversion(remotecaps) |
|
933 | remoteversions = bundle2.obsmarkersversion(remotecaps) | |
934 | if obsolete.commonversion(remoteversions) is not None: |
|
934 | if obsolete.commonversion(remoteversions) is not None: | |
935 | kwargs['obsmarkers'] = True |
|
935 | kwargs['obsmarkers'] = True | |
@@ -1062,7 +1062,7 b' def _pullobsolete(pullop):' | |||||
1062 | return |
|
1062 | return | |
1063 | pullop.stepsdone.add('obsmarkers') |
|
1063 | pullop.stepsdone.add('obsmarkers') | |
1064 | tr = None |
|
1064 | tr = None | |
1065 | if obsolete._enabled: |
|
1065 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
1066 | pullop.repo.ui.debug('fetching remote obsolete markers\n') |
|
1066 | pullop.repo.ui.debug('fetching remote obsolete markers\n') | |
1067 | remoteobs = pullop.remote.listkeys('obsolete') |
|
1067 | remoteobs = pullop.remote.listkeys('obsolete') | |
1068 | if 'dump0' in remoteobs: |
|
1068 | if 'dump0' in remoteobs: |
@@ -84,6 +84,7 b' from i18n import _' | |||||
84 | # Options for obsolescence |
|
84 | # Options for obsolescence | |
85 | createmarkersopt = 'createmarkers' |
|
85 | createmarkersopt = 'createmarkers' | |
86 | allowunstableopt = 'allowunstable' |
|
86 | allowunstableopt = 'allowunstable' | |
|
87 | exchangeopt = 'exchange' | |||
87 |
|
88 | |||
88 | ### obsolescence marker flag |
|
89 | ### obsolescence marker flag | |
89 |
|
90 |
General Comments 0
You need to be logged in to leave comments.
Login now