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