comparison hgext/githelp.py @ 41437:873a28d7e962

githelp: format with %d if an integer Python 3 doesn't allow us to format an int with %s like Python 2 did. So handle that. Differential Revision: https://phab.mercurial-scm.org/D5726
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 26 Jan 2019 14:16:34 -0800
parents 031d91623fdc
children eddff539f5be
comparison
equal deleted inserted replaced
41436:031d91623fdc 41437:873a28d7e962
119 cmd = "hg " + self.name 119 cmd = "hg " + self.name
120 if self.opts: 120 if self.opts:
121 for k, values in sorted(self.opts.iteritems()): 121 for k, values in sorted(self.opts.iteritems()):
122 for v in values: 122 for v in values:
123 if v: 123 if v:
124 cmd += " %s %s" % (k, v) 124 if isinstance(v, int):
125 fmt = ' %s %d'
126 else:
127 fmt = ' %s %s'
128
129 cmd += fmt % (k, v)
125 else: 130 else:
126 cmd += " %s" % (k,) 131 cmd += " %s" % (k,)
127 if self.args: 132 if self.args:
128 cmd += " " 133 cmd += " "
129 cmd += " ".join(self.args) 134 cmd += " ".join(self.args)