comparison mercurial/debugcommands.py @ 36616:dfcf589a4031

debugcommands: add some strkwargs love to some **args calls Differential Revision: https://phab.mercurial-scm.org/D2563
author Augie Fackler <augie@google.com>
date Fri, 02 Mar 2018 14:12:17 -0500
parents ff6b8484400b
children c6061cadb400
comparison
equal deleted inserted replaced
36615:ff6b8484400b 36616:dfcf589a4031
2788 ui.status(_('sending %s command\n') % command) 2788 ui.status(_('sending %s command\n') % command)
2789 2789
2790 if 'PUSHFILE' in args: 2790 if 'PUSHFILE' in args:
2791 with open(args['PUSHFILE'], r'rb') as fh: 2791 with open(args['PUSHFILE'], r'rb') as fh:
2792 del args['PUSHFILE'] 2792 del args['PUSHFILE']
2793 res, output = peer._callpush(command, fh, **args) 2793 res, output = peer._callpush(command, fh,
2794 **pycompat.strkwargs(args))
2794 ui.status(_('result: %s\n') % util.escapedata(res)) 2795 ui.status(_('result: %s\n') % util.escapedata(res))
2795 ui.status(_('remote output: %s\n') % 2796 ui.status(_('remote output: %s\n') %
2796 util.escapedata(output)) 2797 util.escapedata(output))
2797 else: 2798 else:
2798 res = peer._call(command, **args) 2799 res = peer._call(command, **pycompat.strkwargs(args))
2799 ui.status(_('response: %s\n') % util.escapedata(res)) 2800 ui.status(_('response: %s\n') % util.escapedata(res))
2800 2801
2801 elif action == 'batchbegin': 2802 elif action == 'batchbegin':
2802 if batchedcommands is not None: 2803 if batchedcommands is not None:
2803 raise error.Abort(_('nested batchbegin not allowed')) 2804 raise error.Abort(_('nested batchbegin not allowed'))