Show More
@@ -399,6 +399,8 b' class pulloperation(object):' | |||||
399 | self.common = None |
|
399 | self.common = None | |
400 | # set of pulled head |
|
400 | # set of pulled head | |
401 | self.rheads = None |
|
401 | self.rheads = None | |
|
402 | # list of missing changeset to fetch remotly | |||
|
403 | self.fetch = None | |||
402 |
|
404 | |||
403 | @util.propertycache |
|
405 | @util.propertycache | |
404 | def pulledsubset(self): |
|
406 | def pulledsubset(self): | |
@@ -445,8 +447,8 b' def pull(repo, remote, heads=None, force' | |||||
445 | pullop.remote, |
|
447 | pullop.remote, | |
446 | heads=pullop.heads, |
|
448 | heads=pullop.heads, | |
447 | force=force) |
|
449 | force=force) | |
448 | pullop.common, fetch, pullop.rheads = tmp |
|
450 | pullop.common, pullop.fetch, pullop.rheads = tmp | |
449 | if not fetch: |
|
451 | if not pullop.fetch: | |
450 | pullop.repo.ui.status(_("no changes found\n")) |
|
452 | pullop.repo.ui.status(_("no changes found\n")) | |
451 | result = 0 |
|
453 | result = 0 | |
452 | else: |
|
454 | else: | |
@@ -468,13 +470,14 b' def pull(repo, remote, heads=None, force' | |||||
468 | heads=(pullop.heads |
|
470 | heads=(pullop.heads | |
469 | or pullop.rheads)) |
|
471 | or pullop.rheads)) | |
470 | elif pullop.heads is None: |
|
472 | elif pullop.heads is None: | |
471 | cg = pullop.remote.changegroup(fetch, 'pull') |
|
473 | cg = pullop.remote.changegroup(pullop.fetch, 'pull') | |
472 | elif not pullop.remote.capable('changegroupsubset'): |
|
474 | elif not pullop.remote.capable('changegroupsubset'): | |
473 | raise util.Abort(_("partial pull cannot be done because " |
|
475 | raise util.Abort(_("partial pull cannot be done because " | |
474 | "other repository doesn't support " |
|
476 | "other repository doesn't support " | |
475 | "changegroupsubset.")) |
|
477 | "changegroupsubset.")) | |
476 | else: |
|
478 | else: | |
477 |
cg = pullop.remote.changegroupsubset(fetch, |
|
479 | cg = pullop.remote.changegroupsubset(pullop.fetch, | |
|
480 | pullop.heads, | |||
478 | 'pull') |
|
481 | 'pull') | |
479 | result = pullop.repo.addchangegroup(cg, 'pull', |
|
482 | result = pullop.repo.addchangegroup(cg, 'pull', | |
480 | pullop.remote.url()) |
|
483 | pullop.remote.url()) |
General Comments 0
You need to be logged in to leave comments.
Login now