equal
deleted
inserted
replaced
947 def _pullbookmarkbundle1(pullop): |
947 def _pullbookmarkbundle1(pullop): |
948 """fetch bookmark data in bundle1 case |
948 """fetch bookmark data in bundle1 case |
949 |
949 |
950 If not using bundle2, we have to fetch bookmarks before changeset |
950 If not using bundle2, we have to fetch bookmarks before changeset |
951 discovery to reduce the chance and impact of race conditions.""" |
951 discovery to reduce the chance and impact of race conditions.""" |
|
952 if pullop.remotebookmarks is not None: |
|
953 return |
952 if not _canusebundle2(pullop): # all bundle2 server now support listkeys |
954 if not _canusebundle2(pullop): # all bundle2 server now support listkeys |
953 pullop.remotebookmarks = pullop.remote.listkeys('bookmarks') |
955 pullop.remotebookmarks = pullop.remote.listkeys('bookmarks') |
954 |
956 |
955 |
957 |
956 @pulldiscovery('changegroup') |
958 @pulldiscovery('changegroup') |