# HG changeset patch # User Pierre-Yves David # Date 2014-09-27 07:29:06 # Node ID dae236906fb2f091c834547213ad6701b3e20353 # Parent ee297602a20893f456bf329511d0122c1dab6d86 pull: make discovery phase extensible We apply the same approach as for push and make the discovery extensible. There is only one user in core right now, but we already know we'll need something smarter for obsmarkers. In fact the evolve extension could use this to cleanly extend discovery. The main motivation for this change is consistency between push and pull. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -868,7 +868,38 @@ def pull(repo, remote, heads=None, force return pullop +# list of steps to perform discovery before pull +pulldiscoveryorder = [] + +# Mapping between step name and function +# +# This exists to help extensions wrap steps if necessary +pulldiscoverymapping = {} + +def pulldiscovery(stepname): + """decorator for function performing discovery before pull + + The function is added to the step -> function mapping and appended to the + list of steps. Beware that decorated function will be added in order (this + may matter). + + You can only use this decorator for a new step, if you want to wrap a step + from an extension, change the pulldiscovery dictionary directly.""" + def dec(func): + assert stepname not in pulldiscoverymapping + pulldiscoverymapping[stepname] = func + pulldiscoveryorder.append(stepname) + return func + return dec + def _pulldiscovery(pullop): + """Run all discovery steps""" + for stepname in pulldiscoveryorder: + step = pulldiscoverymapping[stepname] + step(pullop) + +@pulldiscovery('changegroup') +def _pulldiscoverychangegroup(pullop): """discovery phase for the pull Current handle changeset discovery only, will change handle all discovery