equal
deleted
inserted
replaced
129 ignored = {b'HG'} |
129 ignored = {b'HG'} |
130 else: |
130 else: |
131 ignored = set() |
131 ignored = set() |
132 envitems = [ |
132 envitems = [ |
133 (k, v) |
133 (k, v) |
134 for k, v in encoding.environ.iteritems() |
134 for k, v in pycompat.iteritems(encoding.environ) |
135 if _envre.match(k) and k not in ignored |
135 if _envre.match(k) and k not in ignored |
136 ] |
136 ] |
137 envhash = _hashlist(sorted(envitems)) |
137 envhash = _hashlist(sorted(envitems)) |
138 return sectionhash[:6] + envhash[:6] |
138 return sectionhash[:6] + envhash[:6] |
139 |
139 |
315 self.out = out |
315 self.out = out |
316 self.channel = channel |
316 self.channel = channel |
317 |
317 |
318 def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): |
318 def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): |
319 args = [type, procutil.quotecommand(cmd), os.path.abspath(cwd or b'.')] |
319 args = [type, procutil.quotecommand(cmd), os.path.abspath(cwd or b'.')] |
320 args.extend(b'%s=%s' % (k, v) for k, v in environ.iteritems()) |
320 args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ)) |
321 data = b'\0'.join(args) |
321 data = b'\0'.join(args) |
322 self.out.write(struct.pack(b'>cI', self.channel, len(data))) |
322 self.out.write(struct.pack(b'>cI', self.channel, len(data))) |
323 self.out.write(data) |
323 self.out.write(data) |
324 self.out.flush() |
324 self.out.flush() |
325 |
325 |