This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9630

errors: respect ui.detailed-exit-code in chg
ClosedPublic

Authored by martinvonz on Dec 17 2020, 1:48 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGdadca47e3d4d: errors: respect ui.detailed-exit-code in chg
Summary

This fixes test-globalopts.t, which has been failing since
db5dddb38f5b (errors: raise InputError on early parse error in
dispatch, 2020-11-23).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 17 2020, 1:48 PM
mharbison72 accepted this revision.Dec 17 2020, 1:56 PM
This revision is now accepted and ready to land.Dec 17 2020, 1:56 PM
martinvonz added a commit: rHGdadca47e3d4d: errors: respect ui.detailed-exit-code in chg.Dec 17 2020, 1:58 PM
Closed by commit rHGdadca47e3d4d: errors: respect ui.detailed-exit-code in chg (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (8 lines)

Diff 24349

mercurial/chgserver.py

- "reconnect", the client should close the connection and - "reconnect", the client should close the connection and
reconnect. reconnect.
If neither "reconnect" nor "redirect" is included in the instruction If neither "reconnect" nor "redirect" is included in the instruction
list, the client can continue with this server after completing all list, the client can continue with this server after completing all
the instructions. the instructions.
""" """
args = self._readlist() args = self._readlist()
errorraised = False errorraised = False
detailed_exit_code = 255
try: try:
self.ui, lui = _loadnewui(self.ui, args, self.cdebug) self.ui, lui = _loadnewui(self.ui, args, self.cdebug)
except error.RepoError as inst: except error.RepoError as inst:
# RepoError can be raised while trying to read shared source # RepoError can be raised while trying to read shared source
# configuration # configuration
self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst)) self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
if inst.hint: if inst.hint:
self.ui.error(_(b"(%s)\n") % inst.hint) self.ui.error(_(b"(%s)\n") % inst.hint)
errorraised = True errorraised = True
except error.Abort as inst: except error.Abort as inst:
if isinstance(inst, error.InputError):
detailed_exit_code = 10
self.ui.error(inst.format()) self.ui.error(inst.format())
errorraised = True errorraised = True
if errorraised: if errorraised:
self.ui.flush() self.ui.flush()
self.cresult.write(b'exit 255') exit_code = 255
if self.ui.configbool(b'ui', b'detailed-exit-code'):
exit_code = detailed_exit_code
self.cresult.write(b'exit %d' % exit_code)
return return
newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) newhash = hashstate.fromui(lui, self.hashstate.mtimepaths)
insts = [] insts = []
if newhash.mtimehash != self.hashstate.mtimehash: if newhash.mtimehash != self.hashstate.mtimehash:
addr = _hashaddress(self.baseaddress, self.hashstate.confighash) addr = _hashaddress(self.baseaddress, self.hashstate.confighash)
insts.append(b'unlink %s' % addr) insts.append(b'unlink %s' % addr)
# mtimehash is empty if one or more extensions fail to load. # mtimehash is empty if one or more extensions fail to load.
# to be compatible with hg, still serve the client this time. # to be compatible with hg, still serve the client this time.