comparison hgext/githelp.py @ 43811:29adf0a087a1

merge with stable
author Augie Fackler <augie@google.com>
date Thu, 05 Dec 2019 11:15:19 -0500
parents 9f70512ae2cf 24d0189238f1
children ca5bd34c597b
comparison
equal deleted inserted replaced
43810:765a9c299c44 43811:29adf0a087a1
113 ui.warn(_(b"ignoring unknown option %s\n") % flag) 113 ui.warn(_(b"ignoring unknown option %s\n") % flag)
114 114
115 args = list([convert(x) for x in args]) 115 args = list([convert(x) for x in args])
116 opts = dict( 116 opts = dict(
117 [ 117 [
118 (k, convert(v)) if isinstance(v, str) else (k, v) 118 (k, convert(v)) if isinstance(v, bytes) else (k, v)
119 for k, v in pycompat.iteritems(opts) 119 for k, v in pycompat.iteritems(opts)
120 ] 120 ]
121 ) 121 )
122 122
123 return args, opts 123 return args, opts