Show More
@@ -473,6 +473,16 b' def pull(repo, remote, heads=None, force' | |||||
473 | subset = pullop.heads |
|
473 | subset = pullop.heads | |
474 | pullop.pulledsubset = subset |
|
474 | pullop.pulledsubset = subset | |
475 |
|
475 | |||
|
476 | _pullphase(pullop) | |||
|
477 | _pullobsolete(pullop) | |||
|
478 | pullop.closetransaction() | |||
|
479 | finally: | |||
|
480 | pullop.releasetransaction() | |||
|
481 | lock.release() | |||
|
482 | ||||
|
483 | return result | |||
|
484 | ||||
|
485 | def _pullphase(pullop): | |||
476 |
|
|
486 | # Get remote phases data from remote | |
477 |
|
|
487 | remotephases = pullop.remote.listkeys('phases') | |
478 |
|
|
488 | publishing = bool(remotephases.get('publishing', False)) | |
@@ -490,14 +500,6 b' def pull(repo, remote, heads=None, force' | |||||
490 |
|
|
500 | phases.advanceboundary(pullop.repo, phases.public, | |
491 |
|
|
501 | pullop.pulledsubset) | |
492 |
|
502 | |||
493 | _pullobsolete(pullop) |
|
|||
494 | pullop.closetransaction() |
|
|||
495 | finally: |
|
|||
496 | pullop.releasetransaction() |
|
|||
497 | lock.release() |
|
|||
498 |
|
||||
499 | return result |
|
|||
500 |
|
||||
501 | def _pullobsolete(pullop): |
|
503 | def _pullobsolete(pullop): | |
502 | """utility function to pull obsolete markers from a remote |
|
504 | """utility function to pull obsolete markers from a remote | |
503 |
|
505 |
General Comments 0
You need to be logged in to leave comments.
Login now