Mercurial > evolve

changeset 5201:7c6d08cd1221 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsexchange: swap the 'common' and 'missing' clause
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 06 Mar 2020 02:46:51 +0100
parents a60a478ee2fa
children c0b8804066dc
files hgext3rd/evolve/obsexchange.py
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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):