Show More
@@ -1262,8 +1262,7 def _pullchangeset(pullop): | |||
|
1262 | 1262 | "changegroupsubset.")) |
|
1263 | 1263 | else: |
|
1264 | 1264 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') |
|
1265 |
pullop.cgresult = c |
|
|
1266 | pullop.remote.url()) | |
|
1265 | pullop.cgresult = cg.apply(pullop.repo, 'pull', pullop.remote.url()) | |
|
1267 | 1266 | |
|
1268 | 1267 | def _pullphase(pullop): |
|
1269 | 1268 | # Get remote phases data from remote |
@@ -1592,7 +1591,7 def unbundle(repo, cg, heads, source, ur | |||
|
1592 | 1591 | raise |
|
1593 | 1592 | else: |
|
1594 | 1593 | lockandtr[1] = repo.lock() |
|
1595 |
r = c |
|
|
1594 | r = cg.apply(repo, source, url) | |
|
1596 | 1595 | finally: |
|
1597 | 1596 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) |
|
1598 | 1597 | if recordout is not None: |
@@ -1786,7 +1785,7 def trypullbundlefromurl(ui, repo, url): | |||
|
1786 | 1785 | if isinstance(cg, bundle2.unbundle20): |
|
1787 | 1786 | bundle2.processbundle(repo, cg, lambda: tr) |
|
1788 | 1787 | else: |
|
1789 |
c |
|
|
1788 | cg.apply(repo, 'clonebundles', url) | |
|
1790 | 1789 | tr.close() |
|
1791 | 1790 | return True |
|
1792 | 1791 | except urllib2.HTTPError as e: |
General Comments 0
You need to be logged in to leave comments.
Login now