# HG changeset patch # User Pierre-Yves David # Date 1675394515 -3600 # Node ID 014ff9a625011d4a1edae13a778f676869f79a6c # Parent 0fbc0c97805332390c6c73cf049697a662bff644 wrapfunction: use sysstr instead of bytes as argument in "infinitepush" This is as valid and simpler, it will help us to eventually get ride of `safehasattr`. diff -r 0fbc0c978053 -r 014ff9a62501 hgext/infinitepush/__init__.py --- a/hgext/infinitepush/__init__.py Fri Feb 03 04:21:32 2023 +0100 +++ b/hgext/infinitepush/__init__.py Fri Feb 03 04:21:55 2023 +0100 @@ -390,15 +390,15 @@ bundle2.parthandlermapping[b'phase-heads'] = newphaseheadshandler extensions.wrapfunction( - localrepo.localrepository, b'listkeys', localrepolistkeys + localrepo.localrepository, 'listkeys', localrepolistkeys ) wireprotov1server.commands[b'lookup'] = ( _lookupwrap(wireprotov1server.commands[b'lookup'][0]), b'key', ) - extensions.wrapfunction(exchange, b'getbundlechunks', getbundlechunks) + extensions.wrapfunction(exchange, 'getbundlechunks', getbundlechunks) - extensions.wrapfunction(bundle2, b'processparts', processparts) + extensions.wrapfunction(bundle2, 'processparts', processparts) def clientextsetup(ui): @@ -415,7 +415,7 @@ extensions.wrapcommand(commands.table, b'pull', _pull) - extensions.wrapfunction(discovery, b'checkheads', _checkheads) + extensions.wrapfunction(discovery, 'checkheads', _checkheads) wireprotov1peer.wirepeer.listkeyspatterns = listkeyspatterns @@ -666,7 +666,7 @@ return origvalues extensions.wrapfunction( - localrepo.localrepository, b'listkeys', _listkeys + localrepo.localrepository, 'listkeys', _listkeys ) wrappedlistkeys = True heads = list((set(newheads) | set(heads)) - set(scratchheads)) @@ -678,7 +678,7 @@ exchange.getbundle2partsmapping[b'changegroup'] = oldchangegrouppart if wrappedlistkeys: extensions.unwrapfunction( - localrepo.localrepository, b'listkeys', _listkeys + localrepo.localrepository, 'listkeys', _listkeys ) return result @@ -757,7 +757,7 @@ if scratchbookmarks or unknownnodes: # Set anyincoming to True extensions.wrapfunction( - discovery, b'findcommonincoming', _findcommonincoming + discovery, 'findcommonincoming', _findcommonincoming ) try: # Remote scratch bookmarks will be deleted because remotenames doesn't @@ -775,7 +775,7 @@ return result finally: if scratchbookmarks: - extensions.unwrapfunction(discovery, b'findcommonincoming') + extensions.unwrapfunction(discovery, 'findcommonincoming') def _readscratchremotebookmarks(ui, repo, other): @@ -868,7 +868,7 @@ opts[b'bookmark'] = [] ui.setconfig(experimental, configscratchpush, True) oldphasemove = extensions.wrapfunction( - exchange, b'_localphasemove', _phasemove + exchange, '_localphasemove', _phasemove ) paths = list(urlutil.get_push_paths(repo, ui, dests))