This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3732

debugcommands: work around logiofd being a pipe and unseekable
ClosedPublic

Authored by durin42 on Jun 14 2018, 12:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG275cc461b854: debugcommands: work around logiofd being a pipe and unseekable
Summary

This was breaking in our Python 3 build, but not Python 2. I don't
know how it ever worked in Python 2, but this passes on both.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (8 lines)

Diff 9080

mercurial/debugcommands.py

logfh = None logfh = None
if opts['logiofd'] and opts['logiofile']: if opts['logiofd'] and opts['logiofile']:
raise error.Abort(_('cannot use both --logiofd and --logiofile')) raise error.Abort(_('cannot use both --logiofd and --logiofile'))
if opts['logiofd']: if opts['logiofd']:
# Line buffered because output is line based. # Line buffered because output is line based.
try:
logfh = os.fdopen(int(opts['logiofd']), r'ab', 1) logfh = os.fdopen(int(opts['logiofd']), r'ab', 1)
except OSError as e:
if e.errno != errno.ESPIPE:
raise
# can't seek a pipe, so `ab` mode fails on py3
logfh = os.fdopen(int(opts['logiofd']), r'wb', 1)
elif opts['logiofile']: elif opts['logiofile']:
logfh = open(opts['logiofile'], 'ab', 1) logfh = open(opts['logiofile'], 'ab', 1)
s = wireprotoserver.sshserver(ui, repo, logfh=logfh) s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
s.serve_forever() s.serve_forever()
@command('debugsetparents', [], _('REV1 [REV2]')) @command('debugsetparents', [], _('REV1 [REV2]'))
def debugsetparents(ui, repo, rev1, rev2=None): def debugsetparents(ui, repo, rev1, rev2=None):