Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/chgserver.py @ 47759:d7515d29761d stable 5.9rc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge default into stable This mark the start of the 5.9 freeze.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Jul 2021 22:52:09 +0200
parents 227bbb078c2c
children 7caaefa48794
comparison
equal deleted inserted replaced
47054:29ea3b4c4f62 47759:d7515d29761d
318 self.in_ = in_ 318 self.in_ = in_
319 self.out = out 319 self.out = out
320 self.channel = channel 320 self.channel = channel
321 321
322 def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None): 322 def __call__(self, cmd, environ, cwd=None, type=b'system', cmdtable=None):
323 args = [type, cmd, os.path.abspath(cwd or b'.')] 323 args = [type, cmd, util.abspath(cwd or b'.')]
324 args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ)) 324 args.extend(b'%s=%s' % (k, v) for k, v in pycompat.iteritems(environ))
325 data = b'\0'.join(args) 325 data = b'\0'.join(args)
326 self.out.write(struct.pack(b'>cI', self.channel, len(data))) 326 self.out.write(struct.pack(b'>cI', self.channel, len(data)))
327 self.out.write(data) 327 self.out.write(data)
328 self.out.flush() 328 self.out.flush()
513 # configuration 513 # configuration
514 self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst)) 514 self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
515 if inst.hint: 515 if inst.hint:
516 self.ui.error(_(b"(%s)\n") % inst.hint) 516 self.ui.error(_(b"(%s)\n") % inst.hint)
517 errorraised = True 517 errorraised = True
518 except error.Abort as inst: 518 except error.Error as inst:
519 if isinstance(inst, error.InputError): 519 if inst.detailed_exit_code is not None:
520 detailed_exit_code = 10 520 detailed_exit_code = inst.detailed_exit_code
521 elif isinstance(inst, error.ConfigError):
522 detailed_exit_code = 30
523 self.ui.error(inst.format()) 521 self.ui.error(inst.format())
524 errorraised = True 522 errorraised = True
525 523
526 if errorraised: 524 if errorraised:
527 self.ui.flush() 525 self.ui.flush()