Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: run obsmarker discovery only on the common set
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 29 Aug 2014 16:13:01 +0200
changeset 1096 661f3a112f7a
parent 1095 26334cfd4e95
child 1097 580a2d838996
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.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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
evolve