mercurial/exchange.py
changeset 22656 c9276945eba3
parent 22655 f48ac29c2a9e
child 22658 a8f0d8e4c80a
equal deleted inserted replaced
22655:f48ac29c2a9e 22656:c9276945eba3
   890 
   890 
   891     kwargs['common'] = pullop.common
   891     kwargs['common'] = pullop.common
   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
   899     else:
   899     else:
   900         if pullop.heads is None and list(pullop.common) == [nullid]:
   900         if pullop.heads is None and list(pullop.common) == [nullid]:
   919 
   919 
   920     # processing phases change
   920     # processing phases change
   921     for namespace, value in op.records['listkeys']:
   921     for namespace, value in op.records['listkeys']:
   922         if namespace == 'phases':
   922         if namespace == 'phases':
   923             _pullapplyphases(pullop, value)
   923             _pullapplyphases(pullop, value)
       
   924 
       
   925     # processing bookmark update
       
   926     for namespace, value in op.records['listkeys']:
       
   927         if namespace == 'bookmarks':
       
   928             pullop.remotebookmarks = value
       
   929             _pullbookmarks(pullop)
   924 
   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
   928 
   934