# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1409321581 -7200
# Node ID 661f3a112f7a90b21c6e8089035ce38496a7471d
# Parent  26334cfd4e958140cacefb5c5452ee1255caf43c
pull: run obsmarker discovery only on the common set

If the discovery is run before the obsmarker push, pulled revs does not exist in
the repository yet.

diff -r 26334cfd4e95 -r 661f3a112f7a hgext/evolve.py
--- a/hgext/evolve.py	Fri Aug 29 16:11:22 2014 +0200
+++ b/hgext/evolve.py	Fri Aug 29 16:13:01 2014 +0200
@@ -2484,7 +2484,7 @@
     cl = pullop.repo.changelog
     remote = pullop.remote
     unfi = repo.unfiltered()
-    revs = unfi.revs('::%ln', pullop.pulledsubset)
+    revs = unfi.revs('::%ln', pullop.common)
     common = [nullid]
     if remote.capable('_evoext_obshash_0'):
         obsexcmsg(repo.ui, "looking for common markers in %i nodes\n"
@@ -2652,6 +2652,7 @@
         caps += ' _evoext_pushobsmarkers_0'
         caps += ' _evoext_pullobsmarkers_0'
         caps += ' _evoext_obshash_0'
+        caps += ' _evoext_getbundle_obscommon'
     return caps