equal
deleted
inserted
replaced
2026 if b'bookmarks' in pullop.stepsdone: |
2026 if b'bookmarks' in pullop.stepsdone: |
2027 return |
2027 return |
2028 pullop.stepsdone.add(b'bookmarks') |
2028 pullop.stepsdone.add(b'bookmarks') |
2029 repo = pullop.repo |
2029 repo = pullop.repo |
2030 remotebookmarks = pullop.remotebookmarks |
2030 remotebookmarks = pullop.remotebookmarks |
|
2031 bookmarks_mode = None |
|
2032 if pullop.remote_path is not None: |
|
2033 bookmarks_mode = pullop.remote_path.bookmarks_mode |
2031 bookmod.updatefromremote( |
2034 bookmod.updatefromremote( |
2032 repo.ui, |
2035 repo.ui, |
2033 repo, |
2036 repo, |
2034 remotebookmarks, |
2037 remotebookmarks, |
2035 pullop.remote.url(), |
2038 pullop.remote.url(), |
2036 pullop.gettransaction, |
2039 pullop.gettransaction, |
2037 explicit=pullop.explicitbookmarks, |
2040 explicit=pullop.explicitbookmarks, |
|
2041 mode=bookmarks_mode, |
2038 ) |
2042 ) |
2039 |
2043 |
2040 |
2044 |
2041 def _pullobsolete(pullop): |
2045 def _pullobsolete(pullop): |
2042 """utility function to pull obsolete markers from a remote |
2046 """utility function to pull obsolete markers from a remote |