Show More
@@ -401,6 +401,8 b' class pulloperation(object):' | |||||
401 | self.rheads = None |
|
401 | self.rheads = None | |
402 | # list of missing changeset to fetch remotly |
|
402 | # list of missing changeset to fetch remotly | |
403 | self.fetch = None |
|
403 | self.fetch = None | |
|
404 | # result of changegroup pulling (used as returng code by pull) | |||
|
405 | self.cgresult = None | |||
404 |
|
406 | |||
405 | @util.propertycache |
|
407 | @util.propertycache | |
406 | def pulledsubset(self): |
|
408 | def pulledsubset(self): | |
@@ -455,9 +457,9 b' def pull(repo, remote, heads=None, force' | |||||
455 | pullop.common, pullop.fetch, pullop.rheads = tmp |
|
457 | pullop.common, pullop.fetch, pullop.rheads = tmp | |
456 | if not pullop.fetch: |
|
458 | if not pullop.fetch: | |
457 | pullop.repo.ui.status(_("no changes found\n")) |
|
459 | pullop.repo.ui.status(_("no changes found\n")) | |
458 | result = 0 |
|
460 | pullop.cgresult = 0 | |
459 | else: |
|
461 | else: | |
460 | result = _pullchangeset(pullop) |
|
462 | pullop.cgresult = _pullchangeset(pullop) | |
461 |
|
463 | |||
462 | _pullphase(pullop) |
|
464 | _pullphase(pullop) | |
463 | _pullobsolete(pullop) |
|
465 | _pullobsolete(pullop) | |
@@ -466,7 +468,7 b' def pull(repo, remote, heads=None, force' | |||||
466 | pullop.releasetransaction() |
|
468 | pullop.releasetransaction() | |
467 | lock.release() |
|
469 | lock.release() | |
468 |
|
470 | |||
469 | return result |
|
471 | return pullop.cgresult | |
470 |
|
472 | |||
471 | def _pullchangeset(pullop): |
|
473 | def _pullchangeset(pullop): | |
472 | """pull changeset from unbundle into the local repo""" |
|
474 | """pull changeset from unbundle into the local repo""" |
General Comments 0
You need to be logged in to leave comments.
Login now