# HG changeset patch # User Pierre-Yves David # Date 1583459211 -3600 # Node ID 7c6d08cd12211c15b40581ab0bd3641676f4b250 # Parent a60a478ee2fa02096b58aa6090942f5d823ac724 obsexchange: swap the 'common' and 'missing' clause diff -r a60a478ee2fa -r 7c6d08cd1221 hgext3rd/evolve/obsexchange.py --- a/hgext3rd/evolve/obsexchange.py Fri Mar 06 02:41:53 2020 +0100 +++ b/hgext3rd/evolve/obsexchange.py Fri Mar 06 02:46:51 2020 +0100 @@ -61,18 +61,18 @@ if (b'obsmarkers' in kwargs and pullop.remote.capable(b'_evoext_getbundle_obscommon')): boundaries = obsdiscovery.buildpullobsmarkersboundaries(pullop) - if b'common' in boundaries: + if b'missing' in boundaries: + missing = boundaries[b'missing'] + if missing: + obsexcmsg(ui, b'request obsmarkers for %d common nodes\n' + % len(missing)) + kwargs[b'evo_missing_nodes'] = missing + elif b'common' in boundaries: common = boundaries[b'common'] if common != pullop.common: obsexcmsg(ui, b'request obsmarkers for some common nodes\n') if common != [node.nullid]: kwargs[b'evo_obscommon'] = common - elif b'missing' in boundaries: - missing = boundaries[b'missing'] - if missing: - obsexcmsg(ui, b'request obsmarkers for %d common nodes\n' - % len(missing)) - kwargs[b'evo_missing_nodes'] = missing return ret def _getbundleobsmarkerpart(orig, bundler, repo, source, **kwargs):