Show More
@@ -964,7 +964,7 b' def pull(repo, remote, heads=None, force' | |||||
964 | lock = pullop.repo.lock() |
|
964 | lock = pullop.repo.lock() | |
965 | try: |
|
965 | try: | |
966 | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) |
|
966 | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) | |
967 | streamclone.maybeperformstreamclone(pullop) |
|
967 | streamclone.maybeperformlegacystreamclone(pullop) | |
968 | _pulldiscovery(pullop) |
|
968 | _pulldiscovery(pullop) | |
969 | if _canusebundle2(pullop): |
|
969 | if _canusebundle2(pullop): | |
970 | _pullbundle2(pullop) |
|
970 | _pullbundle2(pullop) |
@@ -66,7 +66,15 b' def canperformstreamclone(repo, remote, ' | |||||
66 |
|
66 | |||
67 | return True, requirements |
|
67 | return True, requirements | |
68 |
|
68 | |||
69 | def maybeperformstreamclone(pullop): |
|
69 | def maybeperformlegacystreamclone(pullop): | |
|
70 | """Possibly perform a legacy stream clone operation. | |||
|
71 | ||||
|
72 | Legacy stream clones are performed as part of pull but before all other | |||
|
73 | operations. | |||
|
74 | ||||
|
75 | A legacy stream clone will not be performed if a bundle2 stream clone is | |||
|
76 | supported. | |||
|
77 | """ | |||
70 | repo = pullop.repo |
|
78 | repo = pullop.repo | |
71 | remote = pullop.remote |
|
79 | remote = pullop.remote | |
72 |
|
80 |
General Comments 0
You need to be logged in to leave comments.
Login now