Comments
Patch
@@ -443,25 +443,33 @@ def pull(repo, remote, heads=None, force
" %s") % (', '.join(sorted(missing)))
raise util.Abort(msg)
lock = pullop.repo.lock()
try:
- tmp = discovery.findcommonincoming(pullop.repo.unfiltered(),
- pullop.remote,
- heads=pullop.heads,
- force=force)
- pullop.common, pullop.fetch, pullop.rheads = tmp
+ _pulldiscovery(pullop)
_pullchangeset(pullop)
_pullphase(pullop)
_pullobsolete(pullop)
pullop.closetransaction()
finally:
pullop.releasetransaction()
lock.release()
return pullop.cgresult
+def _pulldiscovery(pullop):
+ """discovery phase for the pull
+
+ Current handle changeset discovery only, will change handle all discovery
+ at some point."""
+ tmp = discovery.findcommonincoming(pullop.repo.unfiltered(),
+ pullop.remote,
+ heads=pullop.heads,
+ force=pullop.force)
+ pullop.common, pullop.fetch, pullop.rheads = tmp
+
+
def _pullchangeset(pullop):
"""pull changeset from unbundle into the local repo"""
# We delay the open of the transaction as late as possible so we
# don't open transaction for nothing or you break future useful
# rollback call