equal
deleted
inserted
replaced
113 |
113 |
114 args = list([convert(x) for x in args]) |
114 args = list([convert(x) for x in args]) |
115 opts = dict( |
115 opts = dict( |
116 [ |
116 [ |
117 (k, convert(v)) if isinstance(v, bytes) else (k, v) |
117 (k, convert(v)) if isinstance(v, bytes) else (k, v) |
118 for k, v in pycompat.iteritems(opts) |
118 for k, v in opts.items() |
119 ] |
119 ] |
120 ) |
120 ) |
121 |
121 |
122 return args, opts |
122 return args, opts |
123 |
123 |
129 self.opts = {} |
129 self.opts = {} |
130 |
130 |
131 def __bytes__(self): |
131 def __bytes__(self): |
132 cmd = b"hg " + self.name |
132 cmd = b"hg " + self.name |
133 if self.opts: |
133 if self.opts: |
134 for k, values in sorted(pycompat.iteritems(self.opts)): |
134 for k, values in sorted(self.opts.items()): |
135 for v in values: |
135 for v in values: |
136 if v: |
136 if v: |
137 if isinstance(v, int): |
137 if isinstance(v, int): |
138 fmt = b' %s %d' |
138 fmt = b' %s %d' |
139 else: |
139 else: |