Show More
@@ -1723,7 +1723,11 b' def unbundle(repo, cg, heads, source, ur' | |||||
1723 | # 'check_heads' call wil be a no-op |
|
1723 | # 'check_heads' call wil be a no-op | |
1724 | check_heads(repo, heads, 'uploading changes') |
|
1724 | check_heads(repo, heads, 'uploading changes') | |
1725 | # push can proceed |
|
1725 | # push can proceed | |
1726 | if util.safehasattr(cg, 'params'): |
|
1726 | if not util.safehasattr(cg, 'params'): | |
|
1727 | # legacy case: bundle1 (changegroup 01) | |||
|
1728 | lockandtr[1] = repo.lock() | |||
|
1729 | r = cg.apply(repo, source, url) | |||
|
1730 | else: | |||
1727 | r = None |
|
1731 | r = None | |
1728 | try: |
|
1732 | try: | |
1729 | def gettransaction(): |
|
1733 | def gettransaction(): | |
@@ -1762,10 +1766,6 b' def unbundle(repo, cg, heads, source, ur' | |||||
1762 | mandatory=False) |
|
1766 | mandatory=False) | |
1763 | parts.append(part) |
|
1767 | parts.append(part) | |
1764 | raise |
|
1768 | raise | |
1765 | else: |
|
|||
1766 | # legacy case: bundle1 (changegroup 01) |
|
|||
1767 | lockandtr[1] = repo.lock() |
|
|||
1768 | r = cg.apply(repo, source, url) |
|
|||
1769 | finally: |
|
1769 | finally: | |
1770 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) |
|
1770 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) | |
1771 | if recordout is not None: |
|
1771 | if recordout is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now