equal
deleted
inserted
replaced
956 self.remotebookmarks = remotebookmarks |
956 self.remotebookmarks = remotebookmarks |
957 # result of changegroup pulling (used as return code by pull) |
957 # result of changegroup pulling (used as return code by pull) |
958 self.cgresult = None |
958 self.cgresult = None |
959 # list of step already done |
959 # list of step already done |
960 self.stepsdone = set() |
960 self.stepsdone = set() |
|
961 # Whether we attempted a clone from pre-generated bundles. |
|
962 self.clonebundleattempted = False |
961 |
963 |
962 @util.propertycache |
964 @util.propertycache |
963 def pulledsubset(self): |
965 def pulledsubset(self): |
964 """heads of the set of changeset target by the pull""" |
966 """heads of the set of changeset target by the pull""" |
965 # compute target subset |
967 # compute target subset |
1601 |
1603 |
1602 if not remote.capable('clonebundles'): |
1604 if not remote.capable('clonebundles'): |
1603 return |
1605 return |
1604 |
1606 |
1605 res = remote._call('clonebundles') |
1607 res = remote._call('clonebundles') |
|
1608 |
|
1609 # If we call the wire protocol command, that's good enough to record the |
|
1610 # attempt. |
|
1611 pullop.clonebundleattempted = True |
|
1612 |
1606 entries = parseclonebundlesmanifest(repo, res) |
1613 entries = parseclonebundlesmanifest(repo, res) |
1607 if not entries: |
1614 if not entries: |
1608 repo.ui.note(_('no clone bundles available on remote; ' |
1615 repo.ui.note(_('no clone bundles available on remote; ' |
1609 'falling back to regular clone\n')) |
1616 'falling back to regular clone\n')) |
1610 return |
1617 return |