equal
deleted
inserted
replaced
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, str) else (k, v) |
119 for k, v in opts.iteritems() |
119 for k, v in pycompat.iteritems(opts) |
120 ] |
120 ] |
121 ) |
121 ) |
122 |
122 |
123 return args, opts |
123 return args, opts |
124 |
124 |
130 self.opts = {} |
130 self.opts = {} |
131 |
131 |
132 def __bytes__(self): |
132 def __bytes__(self): |
133 cmd = b"hg " + self.name |
133 cmd = b"hg " + self.name |
134 if self.opts: |
134 if self.opts: |
135 for k, values in sorted(self.opts.iteritems()): |
135 for k, values in sorted(pycompat.iteritems(self.opts)): |
136 for v in values: |
136 for v in values: |
137 if v: |
137 if v: |
138 if isinstance(v, int): |
138 if isinstance(v, int): |
139 fmt = b' %s %d' |
139 fmt = b' %s %d' |
140 else: |
140 else: |