Mercurial > evolve
comparison hgext/evolve.py @ 824:fed090e07621
exchange: pull markers relevant to the pulled subset only
With the command recently introduced we can select to pull only markers relevant
to some nodes. We are now pull all markers for all node in the relevant subset.
We'll try to pull less (just markers for node where local and remote marker
diverge) later, but we need some marker discovery mechanism for that. which are
not easy.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 28 Feb 2014 13:38:19 -0800 |
parents | 9aa20585e158 |
children | 7671717afef8 |
comparison
equal
deleted
inserted
replaced
823:9aa20585e158 | 824:fed090e07621 |
---|---|
2191 if not pullop.remote.capable('_evoext_pullobsmarkers_0'): | 2191 if not pullop.remote.capable('_evoext_pullobsmarkers_0'): |
2192 return orig(pullop) | 2192 return orig(pullop) |
2193 tr = None | 2193 tr = None |
2194 ui = pullop.repo.ui | 2194 ui = pullop.repo.ui |
2195 ui.status("OBSEXC: pull obsolescence markers\n") | 2195 ui.status("OBSEXC: pull obsolescence markers\n") |
2196 obsdata = pullop.remote.evoext_pullobsmarkers_0() | 2196 obsdata = pullop.remote.evoext_pullobsmarkers_0(heads=pullop.pulledsubset) |
2197 obsdata = obsdata.read() | 2197 obsdata = obsdata.read() |
2198 if len(obsdata) > 5: | 2198 if len(obsdata) > 5: |
2199 ui.status("OBSEXC: merging obsolescence markers (%i bytes)\n" | 2199 ui.status("OBSEXC: merging obsolescence markers (%i bytes)\n" |
2200 % len(obsdata)) | 2200 % len(obsdata)) |
2201 tr = pullop.gettransaction() | 2201 tr = pullop.gettransaction() |