Show More
@@ -450,11 +450,7 b' def pull(repo, remote, heads=None, force' | |||||
450 |
|
450 | |||
451 | lock = pullop.repo.lock() |
|
451 | lock = pullop.repo.lock() | |
452 | try: |
|
452 | try: | |
453 | tmp = discovery.findcommonincoming(pullop.repo.unfiltered(), |
|
453 | _pulldiscovery(pullop) | |
454 | pullop.remote, |
|
|||
455 | heads=pullop.heads, |
|
|||
456 | force=force) |
|
|||
457 | pullop.common, pullop.fetch, pullop.rheads = tmp |
|
|||
458 | _pullchangeset(pullop) |
|
454 | _pullchangeset(pullop) | |
459 | _pullphase(pullop) |
|
455 | _pullphase(pullop) | |
460 | _pullobsolete(pullop) |
|
456 | _pullobsolete(pullop) | |
@@ -465,6 +461,17 b' def pull(repo, remote, heads=None, force' | |||||
465 |
|
461 | |||
466 | return pullop.cgresult |
|
462 | return pullop.cgresult | |
467 |
|
463 | |||
|
464 | def _pulldiscovery(pullop): | |||
|
465 | """discovery phase for the pull | |||
|
466 | ||||
|
467 | Current handle changeset discovery only, will change handle all discovery | |||
|
468 | at some point.""" | |||
|
469 | tmp = discovery.findcommonincoming(pullop.repo.unfiltered(), | |||
|
470 | pullop.remote, | |||
|
471 | heads=pullop.heads, | |||
|
472 | force=pullop.force) | |||
|
473 | pullop.common, pullop.fetch, pullop.rheads = tmp | |||
|
474 | ||||
468 | def _pullchangeset(pullop): |
|
475 | def _pullchangeset(pullop): | |
469 | """pull changeset from unbundle into the local repo""" |
|
476 | """pull changeset from unbundle into the local repo""" | |
470 | # We delay the open of the transaction as late as possible so we |
|
477 | # We delay the open of the transaction as late as possible so we |
General Comments 0
You need to be logged in to leave comments.
Login now