( )⚙ D954 style: never use a space before a colon or comma

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D954

style: never use a space before a colon or comma
ClosedPublic

Authored by alex_gaynor on Oct 5 2017, 9:47 AM.

Details

Reviewers
durin42
pulkit
spectral
Group Reviewers
hg-reviewers
Commits
rHGa57c938e7ac8: style: never use a space before a colon or comma

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 5 2017, 9:47 AM
pulkit accepted this revision.Oct 5 2017, 9:53 AM
spectral accepted this revision.Oct 5 2017, 10:49 AM
durin42 accepted this revision.Oct 5 2017, 10:50 AM
This revision is now accepted and ready to land.Oct 5 2017, 10:50 AM
Closed by commit rHGa57c938e7ac8: style: never use a space before a colon or comma (authored by alex_gaynor). · Explain WhyOct 5 2017, 10:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2464

mercurial/color.py

'diff.diffline': 'bold', 'diff.diffline': 'bold',
'diff.extended': 'cyan bold', 'diff.extended': 'cyan bold',
'diff.file_a': 'red bold', 'diff.file_a': 'red bold',
'diff.file_b': 'green bold', 'diff.file_b': 'green bold',
'diff.hunk': 'magenta', 'diff.hunk': 'magenta',
'diff.inserted': 'green', 'diff.inserted': 'green',
'diff.tab': '', 'diff.tab': '',
'diff.trailingwhitespace': 'bold red_background', 'diff.trailingwhitespace': 'bold red_background',
'changeset.public' : '', 'changeset.public': '',
'changeset.draft' : '', 'changeset.draft': '',
'changeset.secret' : '', 'changeset.secret': '',
'diffstat.deleted': 'red', 'diffstat.deleted': 'red',
'diffstat.inserted': 'green', 'diffstat.inserted': 'green',
'histedit.remaining': 'red bold', 'histedit.remaining': 'red bold',
'ui.prompt': 'yellow', 'ui.prompt': 'yellow',
'log.changeset': 'yellow', 'log.changeset': 'yellow',
'patchbomb.finalsummary': '', 'patchbomb.finalsummary': '',
'patchbomb.from': 'magenta', 'patchbomb.from': 'magenta',
'patchbomb.to': 'cyan', 'patchbomb.to': 'cyan',

mercurial/commandserver.py

handler(self) handler(self)
else: else:
# clients are expected to check what commands are supported by # clients are expected to check what commands are supported by
# looking at the servers capabilities # looking at the servers capabilities
raise error.Abort(_('unknown command %s') % cmd) raise error.Abort(_('unknown command %s') % cmd)
return cmd != '' return cmd != ''
capabilities = {'runcommand' : runcommand, capabilities = {'runcommand': runcommand,
'getencoding' : getencoding} 'getencoding': getencoding}
def serve(self): def serve(self):
hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities)) hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities))
hellomsg += '\n' hellomsg += '\n'
hellomsg += 'encoding: ' + encoding.encoding hellomsg += 'encoding: ' + encoding.encoding
hellomsg += '\n' hellomsg += '\n'
hellomsg += 'pid: %d' % util.getpid() hellomsg += 'pid: %d' % util.getpid()
if util.safehasattr(os, 'getpgid'): if util.safehasattr(os, 'getpgid'):

mercurial/dispatch.py

req.args[3] != '--stdio'): req.args[3] != '--stdio'):
raise error.Abort( raise error.Abort(
_('potentially unsafe serve --stdio invocation: %r') % _('potentially unsafe serve --stdio invocation: %r') %
(req.args,)) (req.args,))
try: try:
debugger = 'pdb' debugger = 'pdb'
debugtrace = { debugtrace = {
'pdb' : pdb.set_trace 'pdb': pdb.set_trace
} }
debugmortem = { debugmortem = {
'pdb' : pdb.post_mortem 'pdb': pdb.post_mortem
} }
# read --config before doing anything else # read --config before doing anything else
# (e.g. to change trust settings for reading .hg/hgrc) # (e.g. to change trust settings for reading .hg/hgrc)
cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args)) cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args))
if req.repo: if req.repo:
# copy configs that were passed on the cmdline (--config) to # copy configs that were passed on the cmdline (--config) to

mercurial/hgweb/hgwebdir_mod.py

def makeindex(self, req, tmpl, subdir=""): def makeindex(self, req, tmpl, subdir=""):
def archivelist(ui, nodeid, url): def archivelist(ui, nodeid, url):
allowed = ui.configlist("web", "allow_archive", untrusted=True) allowed = ui.configlist("web", "allow_archive", untrusted=True)
archives = [] archives = []
for typ, spec in hgweb_mod.archivespecs.iteritems(): for typ, spec in hgweb_mod.archivespecs.iteritems():
if typ in allowed or ui.configbool("web", "allow" + typ, if typ in allowed or ui.configbool("web", "allow" + typ,
untrusted=True): untrusted=True):
archives.append({"type" : typ, "extension": spec[2], archives.append({"type": typ, "extension": spec[2],
"node": nodeid, "url": url}) "node": nodeid, "url": url})
return archives return archives
def rawentries(subdir="", **map): def rawentries(subdir="", **map):
descend = self.ui.configbool('web', 'descend') descend = self.ui.configbool('web', 'descend')
collapse = self.ui.configbool('web', 'collapse') collapse = self.ui.configbool('web', 'collapse')
seenrepos = set() seenrepos = set()

mercurial/hgweb/wsgicgi.py

content = application(environ, start_response) content = application(environ, start_response)
try: try:
for chunk in content: for chunk in content:
write(chunk) write(chunk)
if not headers_sent: if not headers_sent:
write('') # send headers now if body was empty write('') # send headers now if body was empty
finally: finally:
getattr(content, 'close', lambda : None)() getattr(content, 'close', lambda: None)()

mercurial/httppeer.py

self._urlopener = url.opener(ui, authinfo) self._urlopener = url.opener(ui, authinfo)
self._requestbuilder = urlreq.request self._requestbuilder = urlreq.request
def __del__(self): def __del__(self):
urlopener = getattr(self, '_urlopener', None) urlopener = getattr(self, '_urlopener', None)
if urlopener: if urlopener:
for h in urlopener.handlers: for h in urlopener.handlers:
h.close() h.close()
getattr(h, "close_all", lambda : None)() getattr(h, "close_all", lambda: None)()
# Begin of _basepeer interface. # Begin of _basepeer interface.
@util.propertycache @util.propertycache
def ui(self): def ui(self):
return self._ui return self._ui
def url(self): def url(self):

mercurial/merge.py

hash = nullhex hash = nullhex
else: else:
hash = hex(hashlib.sha1(fcl.path()).digest()) hash = hex(hashlib.sha1(fcl.path()).digest())
self._repo.vfs.write('merge/' + hash, fcl.data()) self._repo.vfs.write('merge/' + hash, fcl.data())
self._state[fd] = ['u', hash, fcl.path(), self._state[fd] = ['u', hash, fcl.path(),
fca.path(), hex(fca.filenode()), fca.path(), hex(fca.filenode()),
fco.path(), hex(fco.filenode()), fco.path(), hex(fco.filenode()),
fcl.flags()] fcl.flags()]
self._stateextras[fd] = { 'ancestorlinknode' : hex(fca.node()) } self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())}
self._dirty = True self._dirty = True
def __contains__(self, dfile): def __contains__(self, dfile):
return dfile in self._state return dfile in self._state
def __getitem__(self, dfile): def __getitem__(self, dfile):
return self._state[dfile][0] return self._state[dfile][0]
else: else:
actions[f] = ('m', (f, f, None, False, pa.node()), actions[f] = ('m', (f, f, None, False, pa.node()),
"both created") "both created")
else: else:
a = ma[f] a = ma[f]
fla = ma.flags(f) fla = ma.flags(f)
nol = 'l' not in fl1 + fl2 + fla nol = 'l' not in fl1 + fl2 + fla
if n2 == a and fl2 == fla: if n2 == a and fl2 == fla:
actions[f] = ('k' , (), "remote unchanged") actions[f] = ('k', (), "remote unchanged")
elif n1 == a and fl1 == fla: # local unchanged - use remote elif n1 == a and fl1 == fla: # local unchanged - use remote
if n1 == n2: # optimization: keep local content if n1 == n2: # optimization: keep local content
actions[f] = ('e', (fl2,), "update permissions") actions[f] = ('e', (fl2,), "update permissions")
else: else:
actions[f] = ('g', (fl2, False), "remote is newer") actions[f] = ('g', (fl2, False), "remote is newer")
elif nol and n2 == a: # remote only changed 'x' elif nol and n2 == a: # remote only changed 'x'
actions[f] = ('e', (fl2,), "update permissions") actions[f] = ('e', (fl2,), "update permissions")
elif nol and n1 == a: # local only changed 'x' elif nol and n1 == a: # local only changed 'x'

mercurial/progress.py

progwidth -= 3 progwidth -= 3
self.indetcount += 1 self.indetcount += 1
# mod the count by twice the width so we can make the # mod the count by twice the width so we can make the
# cursor bounce between the right and left sides # cursor bounce between the right and left sides
amt = self.indetcount % (2 * progwidth) amt = self.indetcount % (2 * progwidth)
amt -= progwidth amt -= progwidth
bar = (' ' * int(progwidth - abs(amt)) + '<=>' + bar = (' ' * int(progwidth - abs(amt)) + '<=>' +
' ' * int(abs(amt))) ' ' * int(abs(amt)))
prog = ''.join(('[', bar , ']')) prog = ''.join(('[', bar, ']'))
out = spacejoin(head, prog, tail) out = spacejoin(head, prog, tail)
else: else:
out = spacejoin(head, tail) out = spacejoin(head, tail)
self._writeerr('\r' + encoding.trim(out, termwidth)) self._writeerr('\r' + encoding.trim(out, termwidth))
self.lasttopic = topic self.lasttopic = topic
self._flusherr() self._flusherr()
def clear(self): def clear(self):