comparison mercurial/bundle2.py @ 35811:e35320ce8043 stable

bookmarks: fix pushkey compatibility mode (issue5777) The namespace used for the compatibility mode was missing a trailing 's'.
author Boris Feld <boris.feld@octobus.net>
date Tue, 30 Jan 2018 22:27:45 +0100
parents 2d3e486d09d0
children 768326377e4d
comparison
equal deleted inserted replaced
35810:113a30b87716 35811:e35320ce8043
2031 if pushkeycompat: 2031 if pushkeycompat:
2032 allhooks = [] 2032 allhooks = []
2033 for book, node in changes: 2033 for book, node in changes:
2034 hookargs = tr.hookargs.copy() 2034 hookargs = tr.hookargs.copy()
2035 hookargs['pushkeycompat'] = '1' 2035 hookargs['pushkeycompat'] = '1'
2036 hookargs['namespace'] = 'bookmark' 2036 hookargs['namespace'] = 'bookmarks'
2037 hookargs['key'] = book 2037 hookargs['key'] = book
2038 hookargs['old'] = nodemod.hex(bookstore.get(book, '')) 2038 hookargs['old'] = nodemod.hex(bookstore.get(book, ''))
2039 hookargs['new'] = nodemod.hex(node if node is not None else '') 2039 hookargs['new'] = nodemod.hex(node if node is not None else '')
2040 allhooks.append(hookargs) 2040 allhooks.append(hookargs)
2041 2041