equal
deleted
inserted
replaced
62 @eh.wrapfunction(exchange, '_pullbundle2extraprepare') |
62 @eh.wrapfunction(exchange, '_pullbundle2extraprepare') |
63 def _addobscommontob2pull(orig, pullop, kwargs): |
63 def _addobscommontob2pull(orig, pullop, kwargs): |
64 ret = orig(pullop, kwargs) |
64 ret = orig(pullop, kwargs) |
65 if ('obsmarkers' in kwargs and |
65 if ('obsmarkers' in kwargs and |
66 pullop.remote.capable('_evoext_getbundle_obscommon')): |
66 pullop.remote.capable('_evoext_getbundle_obscommon')): |
67 boundaries = obsdiscovery._buildpullobsmarkersboundaries(pullop) |
67 boundaries = obsdiscovery.buildpullobsmarkersboundaries(pullop) |
68 common = boundaries['common'] |
68 common = boundaries['common'] |
69 if common != [node.nullid]: |
69 if common != [node.nullid]: |
70 kwargs['evo_obscommon'] = common |
70 kwargs['evo_obscommon'] = common |
71 return ret |
71 return ret |
72 |
72 |
341 return None # remote opted out of obsolescence marker exchange |
341 return None # remote opted out of obsolescence marker exchange |
342 if not wirepull: |
342 if not wirepull: |
343 return orig(pullop) |
343 return orig(pullop) |
344 tr = None |
344 tr = None |
345 ui = pullop.repo.ui |
345 ui = pullop.repo.ui |
346 boundaries = obsdiscovery._buildpullobsmarkersboundaries(pullop) |
346 boundaries = obsdiscovery.buildpullobsmarkersboundaries(pullop) |
347 if not set(boundaries['heads']) - set(boundaries['common']): |
347 if not set(boundaries['heads']) - set(boundaries['common']): |
348 obsexcmsg(ui, "nothing to pull\n") |
348 obsexcmsg(ui, "nothing to pull\n") |
349 return None |
349 return None |
350 |
350 |
351 obsexcmsg(ui, "pull obsolescence markers\n", True) |
351 obsexcmsg(ui, "pull obsolescence markers\n", True) |