equal
deleted
inserted
replaced
1506 raise error.Abort(msg) |
1506 raise error.Abort(msg) |
1507 |
1507 |
1508 pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) |
1508 pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) |
1509 with repo.wlock(), repo.lock(), pullop.trmanager: |
1509 with repo.wlock(), repo.lock(), pullop.trmanager: |
1510 # Use the modern wire protocol, if available. |
1510 # Use the modern wire protocol, if available. |
1511 if remote.capable('exchangev2'): |
1511 if remote.capable('command-changesetdata'): |
1512 exchangev2.pull(pullop) |
1512 exchangev2.pull(pullop) |
1513 else: |
1513 else: |
1514 # This should ideally be in _pullbundle2(). However, it needs to run |
1514 # This should ideally be in _pullbundle2(). However, it needs to run |
1515 # before discovery to avoid extra work. |
1515 # before discovery to avoid extra work. |
1516 _maybeapplyclonebundle(pullop) |
1516 _maybeapplyclonebundle(pullop) |