This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4253

util: fix signature of setsockopt in socket observer
ClosedPublic

Authored by durin42 on Aug 10 2018, 11:08 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGed8160e4fea0: util: fix signature of setsockopt in socket observer
Summary

The format string expected the result, callers all passed the result,
but we didn't actually accept the result to this function. I swear
I've looked at this code a dozen times trying to find the problem, and
it was this simple all along.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 10 2018, 11:08 AM
pulkit accepted this revision.Aug 10 2018, 11:52 AM
pulkit added a subscriber: pulkit.

I also have been here a lot of times and I was unable to found what's wrong. Kudos for fixing this.

Closed by commit rHGed8160e4fea0: util: fix signature of setsockopt in socket observer (authored by durin42). · Explain WhyAug 10 2018, 12:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (4 lines)

Diff 10305

mercurial/util.py

self.fh.write('%s> settimeout(%r)\n' % (self.name, value)) self.fh.write('%s> settimeout(%r)\n' % (self.name, value))
def gettimeout(self, res): def gettimeout(self, res):
if not self.states: if not self.states:
return return
self.fh.write('%s> gettimeout() -> %f\n' % (self.name, res)) self.fh.write('%s> gettimeout() -> %f\n' % (self.name, res))
def setsockopt(self, level, optname, value): def setsockopt(self, res, level, optname, value):
if not self.states: if not self.states:
return return
self.fh.write('%s> setsockopt(%r, %r, %r) -> %r\n' % ( self.fh.write('%s> setsockopt(%r, %r, %r) -> %r\n' % (
self.name, level, optname, value)) self.name, level, optname, value, res))
def makeloggingsocket(logh, fh, name, reads=True, writes=True, states=True, def makeloggingsocket(logh, fh, name, reads=True, writes=True, states=True,
logdata=False, logdataapis=True): logdata=False, logdataapis=True):
"""Turn a socket into a logging socket.""" """Turn a socket into a logging socket."""
observer = socketobserver(logh, name, reads=reads, writes=writes, observer = socketobserver(logh, name, reads=reads, writes=writes,
states=states, logdata=logdata, states=states, logdata=logdata,
logdataapis=logdataapis) logdataapis=logdataapis)