facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

bundle2: support a 'records' mode for the 'bookmarks' part

Browse Source 
In this mode, the bookmarks changes are record in the 'bundleoperation' records
instead of inflicted to the repository. This is necessary to use the part when
pulling.
This commit is contained in:
Boris Feld 2017-10-17 15:26:16 +02:00
parent 85a28bae65
commit d449bcaec6
1 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
mercurial/bundle2.py
View File

@ -1982,40 +1982,55 @@ def handlepushkey(op, inpart):
def handlebookmark(op, inpart):
"""transmit bookmark information
The part contains binary encoded bookmark information. The bookmark
information is applied as is to the unbundling repository. Make sure a
'check:bookmarks' part is issued earlier to check for race condition in
such update.
The part contains binary encoded bookmark information.
This behavior is suitable for pushing. Semantic adjustment will be needed
for pull.
The exact behavior of this part can be controlled by the 'bookmarks' mode
on the bundle operation.
When mode is 'apply' (the default) the bookmark information is applied as
is to the unbundling repository. Make sure a 'check:bookmarks' part is
issued earlier to check for push races in such update. This behavior is
suitable for pushing.
When mode is 'records', the information is recorded into the 'bookmarks'
records of the bundle operation. This behavior is suitable for pulling.
"""
changes = bookmarks.binarydecode(inpart)
tr = op.gettransaction()
bookstore = op.repo._bookmarks
pushkeycompat = op.repo.ui.configbool('server', 'bookmarks-pushkey-compat')
if pushkeycompat:
allhooks = []
for book, node in changes:
hookargs = tr.hookargs.copy()
hookargs['pushkeycompat'] = '1'
hookargs['namespace'] = 'bookmark'
hookargs['key'] = book
hookargs['old'] = nodemod.hex(bookstore.get(book, ''))
hookargs['new'] = nodemod.hex(node if node is not None else '')
allhooks.append(hookargs)
for hookargs in allhooks:
op.repo.hook('prepushkey', throw=True, **hookargs)
bookmarksmode = op.modes.get('bookmarks', 'apply')
bookstore.applychanges(op.repo, tr, changes)
if bookmarksmode == 'apply':
tr = op.gettransaction()
bookstore = op.repo._bookmarks
if pushkeycompat:
allhooks = []
for book, node in changes:
hookargs = tr.hookargs.copy()
hookargs['pushkeycompat'] = '1'
hookargs['namespace'] = 'bookmark'
hookargs['key'] = book
hookargs['old'] = nodemod.hex(bookstore.get(book, ''))
hookargs['new'] = nodemod.hex(node if node is not None else '')
allhooks.append(hookargs)
if pushkeycompat:
def runhook():
for hookargs in allhooks:
op.repo.hook('prepushkey', **hookargs)
op.repo._afterlock(runhook)
op.repo.hook('prepushkey', throw=True, **hookargs)
bookstore.applychanges(op.repo, op.gettransaction(), changes)
if pushkeycompat:
def runhook():
for hookargs in allhooks:
op.repo.hook('prepushkey', **hookargs)
op.repo._afterlock(runhook)
elif bookmarksmode == 'records':
for book, node in changes:
record = {'bookmark': book, 'node': node}
op.records.add('bookmarks', record)
else:
raise error.ProgrammingError('unkown bookmark mode: %s' % bookmarksmode)
@parthandler('phase-heads')
def handlephases(op, inpart):