##// END OF EJS Templates
pull: retrieve bookmarks through bundle2...
Pierre-Yves David -
r22656:c9276945 default
parent child Browse files
Show More
@@ -892,7 +892,7 b' def _pullbundle2(pullop):'
892 kwargs['heads'] = pullop.heads or pullop.rheads
892 kwargs['heads'] = pullop.heads or pullop.rheads
893 kwargs['cg'] = pullop.fetch
893 kwargs['cg'] = pullop.fetch
894 if 'b2x:listkeys' in remotecaps:
894 if 'b2x:listkeys' in remotecaps:
895 kwargs['listkeys'] = ['phase']
895 kwargs['listkeys'] = ['phase', 'bookmarks']
896 if not pullop.fetch:
896 if not pullop.fetch:
897 pullop.repo.ui.status(_("no changes found\n"))
897 pullop.repo.ui.status(_("no changes found\n"))
898 pullop.cgresult = 0
898 pullop.cgresult = 0
@@ -922,6 +922,12 b' def _pullbundle2(pullop):'
922 if namespace == 'phases':
922 if namespace == 'phases':
923 _pullapplyphases(pullop, value)
923 _pullapplyphases(pullop, value)
924
924
925 # processing bookmark update
926 for namespace, value in op.records['listkeys']:
927 if namespace == 'bookmarks':
928 pullop.remotebookmarks = value
929 _pullbookmarks(pullop)
930
925 def _pullbundle2extraprepare(pullop, kwargs):
931 def _pullbundle2extraprepare(pullop, kwargs):
926 """hook function so that extensions can extend the getbundle call"""
932 """hook function so that extensions can extend the getbundle call"""
927 pass
933 pass
General Comments 0
You need to be logged in to leave comments. Login now