Show More
@@ -455,12 +455,7 b' def pull(repo, remote, heads=None, force' | |||||
455 | heads=pullop.heads, |
|
455 | heads=pullop.heads, | |
456 | force=force) |
|
456 | force=force) | |
457 | pullop.common, pullop.fetch, pullop.rheads = tmp |
|
457 | pullop.common, pullop.fetch, pullop.rheads = tmp | |
458 | if not pullop.fetch: |
|
458 | _pullchangeset(pullop) | |
459 | pullop.repo.ui.status(_("no changes found\n")) |
|
|||
460 | pullop.cgresult = 0 |
|
|||
461 | else: |
|
|||
462 | pullop.cgresult = _pullchangeset(pullop) |
|
|||
463 |
|
||||
464 | _pullphase(pullop) |
|
459 | _pullphase(pullop) | |
465 | _pullobsolete(pullop) |
|
460 | _pullobsolete(pullop) | |
466 | pullop.closetransaction() |
|
461 | pullop.closetransaction() | |
@@ -475,6 +470,10 b' def _pullchangeset(pullop):' | |||||
475 | # We delay the open of the transaction as late as possible so we |
|
470 | # We delay the open of the transaction as late as possible so we | |
476 | # don't open transaction for nothing or you break future useful |
|
471 | # don't open transaction for nothing or you break future useful | |
477 | # rollback call |
|
472 | # rollback call | |
|
473 | if not pullop.fetch: | |||
|
474 | pullop.repo.ui.status(_("no changes found\n")) | |||
|
475 | pullop.cgresult = 0 | |||
|
476 | return | |||
478 | pullop.gettransaction() |
|
477 | pullop.gettransaction() | |
479 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
478 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
480 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
479 | pullop.repo.ui.status(_("requesting all changes\n")) | |
@@ -494,7 +493,8 b' def _pullchangeset(pullop):' | |||||
494 | "changegroupsubset.")) |
|
493 | "changegroupsubset.")) | |
495 | else: |
|
494 | else: | |
496 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') |
|
495 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') | |
497 |
|
|
496 | pullop.cgresult = pullop.repo.addchangegroup(cg, 'pull', | |
|
497 | pullop.remote.url()) | |||
498 |
|
498 | |||
499 | def _pullphase(pullop): |
|
499 | def _pullphase(pullop): | |
500 | # Get remote phases data from remote |
|
500 | # Get remote phases data from remote |
General Comments 0
You need to be logged in to leave comments.
Login now