Show More
@@ -894,6 +894,10 class pulloperation(object): | |||
|
894 | 894 | return self.heads |
|
895 | 895 | |
|
896 | 896 | @util.propertycache |
|
897 | def canusebundle2(self): | |
|
898 | return _canusebundle2(self) | |
|
899 | ||
|
900 | @util.propertycache | |
|
897 | 901 | def remotebundle2caps(self): |
|
898 | 902 | return bundle2.bundle2caps(self.remote) |
|
899 | 903 | |
@@ -970,7 +974,7 def pull(repo, remote, heads=None, force | |||
|
970 | 974 | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) |
|
971 | 975 | streamclone.maybeperformlegacystreamclone(pullop) |
|
972 | 976 | _pulldiscovery(pullop) |
|
973 |
if |
|
|
977 | if pullop.canusebundle2: | |
|
974 | 978 | _pullbundle2(pullop) |
|
975 | 979 | _pullchangeset(pullop) |
|
976 | 980 | _pullphase(pullop) |
@@ -1021,7 +1025,7 def _pullbookmarkbundle1(pullop): | |||
|
1021 | 1025 | discovery to reduce the chance and impact of race conditions.""" |
|
1022 | 1026 | if pullop.remotebookmarks is not None: |
|
1023 | 1027 | return |
|
1024 |
if |
|
|
1028 | if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps: | |
|
1025 | 1029 | # all known bundle2 servers now support listkeys, but lets be nice with |
|
1026 | 1030 | # new implementation. |
|
1027 | 1031 | return |
General Comments 0
You need to be logged in to leave comments.
Login now