This is an archive of the discontinued Mercurial Phabricator instance.

Differential D905

style: never put multiple statements on one line
ClosedPublic

Authored by alex_gaynor on Oct 2 2017, 9:01 AM.

Details

Reviewers
durin42
ryanmce
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5326e4ef1dab: style: never put multiple statements on one line

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

alex_gaynor created this revision.Oct 2 2017, 9:01 AM
ryanmce accepted this revision.Oct 2 2017, 1:17 PM
ryanmce added a subscriber: ryanmce.

This seems like a straightforward win.

Is there any way we can add a check-code for this if we don't already have one?

alex_gaynor added a comment.Oct 2 2017, 1:18 PM

This, and the other style things I've sent PRs for, were discovered with flake8 --select=E714,E701,E203 mercurial/.

lothiraldan added a subscriber: lothiraldan.Oct 2 2017, 1:18 PM

If the Style Czar or Style Committee agree with this change, could we add pylint check? The msg id for these errors is "multiple-statements (C0321)"

indygreg added subscribers: sid0, indygreg.Oct 2 2017, 1:25 PM
indygreg accepted this revision.

Since you weren't at the Sprint, I think the decision for style is that we'd check the existing wiki page for the style guide into the repo (possibly along with profiles/configs for various linting/reformatting tools). Then, future changes to style would be handled via code review.

@sid0's annotation revision skipping feature is maturing and combined with @yuya's patches to resolve a revset from a file will allow us to check in a file containing a list of "reformatting" revisions to automatically/easily skip when doing annotate. So we should be more willing to mass rewrite code.

This revision is now accepted and ready to land.Oct 2 2017, 1:25 PM
Closed by commit rHG5326e4ef1dab: style: never put multiple statements on one line (authored by alex_gaynor). · Explain WhyOct 2 2017, 1:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2343

mercurial/keepalive.py

try: try:
host = self._connmap[connection] host = self._connmap[connection]
except KeyError: except KeyError:
pass pass
else: else:
del self._connmap[connection] del self._connmap[connection]
del self._readymap[connection] del self._readymap[connection]
self._hostmap[host].remove(connection) self._hostmap[host].remove(connection)
if not self._hostmap[host]: del self._hostmap[host] if not self._hostmap[host]:
del self._hostmap[host]
finally: finally:
self._lock.release() self._lock.release()
def set_ready(self, connection, ready): def set_ready(self, connection, ready):
try: try:
self._readymap[connection] = ready self._readymap[connection] = ready
except KeyError: except KeyError:
pass pass
print(format % ('keepalive read', m.hexdigest())) print(format % ('keepalive read', m.hexdigest()))
fo = urlreq.urlopen(url) fo = urlreq.urlopen(url)
foo = '' foo = ''
while True: while True:
f = fo.readline() f = fo.readline()
if f: if f:
foo = foo + f foo = foo + f
else: break else:
break
fo.close() fo.close()
m = md5(foo) m = md5(foo)
print(format % ('keepalive readline', m.hexdigest())) print(format % ('keepalive readline', m.hexdigest()))
def comp(N, url): def comp(N, url):
print(' making %i connections to:\n %s' % (N, url)) print(' making %i connections to:\n %s' % (N, url))
util.stdout.write(' first using the normal urllib handlers') util.stdout.write(' first using the normal urllib handlers')

mercurial/pure/bdiff.py

b = bytes(b).splitlines(True) b = bytes(b).splitlines(True)
if not a: if not a:
s = "".join(b) s = "".join(b)
return s and (struct.pack(">lll", 0, 0, len(s)) + s) return s and (struct.pack(">lll", 0, 0, len(s)) + s)
bin = [] bin = []
p = [0] p = [0]
for i in a: p.append(p[-1] + len(i)) for i in a:
p.append(p[-1] + len(i))
d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() d = difflib.SequenceMatcher(None, a, b).get_matching_blocks()
d = _normalizeblocks(a, b, d) d = _normalizeblocks(a, b, d)
la = 0 la = 0
lb = 0 lb = 0
for am, bm, size in d: for am, bm, size in d:
s = "".join(b[lb:bm]) s = "".join(b[lb:bm])
if am > la or s: if am > la or s:

mercurial/pure/mpatch.py

# load our original text # load our original text
m.write(a) m.write(a)
frags = [(len(a), b1)] frags = [(len(a), b1)]
# copy all the patches into our segment so we can memmove from them # copy all the patches into our segment so we can memmove from them
pos = b2 + bl pos = b2 + bl
m.seek(pos) m.seek(pos)
for p in bins: m.write(p) for p in bins:
m.write(p)
for plen in plens: for plen in plens:
# if our list gets too long, execute it # if our list gets too long, execute it
if len(frags) > 128: if len(frags) > 128:
b2, b1 = b1, b2 b2, b1 = b1, b2
frags = [_collect(m, b1, frags)] frags = [_collect(m, b1, frags)]
new = [] new = []

mercurial/sshserver.py

rsp = wireproto.dispatch(self.repo, self, cmd) rsp = wireproto.dispatch(self.repo, self, cmd)
self.handlers[rsp.__class__](self, rsp) self.handlers[rsp.__class__](self, rsp)
elif cmd: elif cmd:
impl = getattr(self, 'do_' + cmd, None) impl = getattr(self, 'do_' + cmd, None)
if impl: if impl:
r = impl() r = impl()
if r is not None: if r is not None:
self.sendresponse(r) self.sendresponse(r)
else: self.sendresponse("") else:
self.sendresponse("")
return cmd != '' return cmd != ''
def _client(self): def _client(self):
client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0] client = encoding.environ.get('SSH_CLIENT', '').split(' ', 1)[0]
return 'remote:ssh:' + client return 'remote:ssh:' + client

mercurial/util.py

inst.filename = name inst.filename = name
raise raise
ofp = posixfile(temp, "wb") ofp = posixfile(temp, "wb")
for chunk in filechunkiter(ifp): for chunk in filechunkiter(ifp):
ofp.write(chunk) ofp.write(chunk)
ifp.close() ifp.close()
ofp.close() ofp.close()
except: # re-raises except: # re-raises
try: os.unlink(temp) try:
except OSError: pass os.unlink(temp)
except OSError:
pass
raise raise
return temp return temp
class filestat(object): class filestat(object):
"""help to exactly detect change of a file """help to exactly detect change of a file
'stat' attribute is result of 'os.stat()' if specified 'path' 'stat' attribute is result of 'os.stat()' if specified 'path'
exists. Otherwise, it is None. This can avoid preparative exists. Otherwise, it is None. This can avoid preparative