This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2440

py3: hunt down str(exception) instances and use util.forcebytestr
ClosedPublic

Authored by durin42 on Feb 26 2018, 12:16 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG04c319a07c7b: py3: hunt down str(exception) instances and use util.forcebytestr
Summary

I decided to grep around for \sstr\( and see what low-hanging fruit
that showed me. This was part of that hunt. That grep pattern still
has some things worth exploring.

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

durin42 created this revision.Feb 26 2018, 12:16 AM
indygreg accepted this revision.Feb 26 2018, 12:40 AM
This revision is now accepted and ready to land.Feb 26 2018, 12:40 AM
Closed by commit rHG04c319a07c7b: py3: hunt down str(exception) instances and use util.forcebytestr (authored by durin42). · Explain WhyFeb 26 2018, 12:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mmercurial/exchange.py (6 lines)
Mmercurial/localrepo.py (3 lines)
Mmercurial/scmutil.py (2 lines)
Mmercurial/ui.py (2 lines)
Mmercurial/url.py (2 lines)
Mmercurial/util.py (4 lines)

Diff 6096

mercurial/commands.py

:brev: a name, which might be a bookmark to be activated after updating :brev: a name, which might be a bookmark to be activated after updating
""" """
if modheads == 0: if modheads == 0:
return return
if optupdate: if optupdate:
try: try:
return hg.updatetotally(ui, repo, checkout, brev) return hg.updatetotally(ui, repo, checkout, brev)
except error.UpdateAbort as inst: except error.UpdateAbort as inst:
msg = _("not updating: %s") % str(inst) msg = _("not updating: %s") % util.forcebytestr(inst)
hint = inst.hint hint = inst.hint
raise error.UpdateAbort(msg, hint=hint) raise error.UpdateAbort(msg, hint=hint)
if modheads > 1: if modheads > 1:
currentbranchheads = len(repo.branchheads()) currentbranchheads = len(repo.branchheads())
if currentbranchheads == modheads: if currentbranchheads == modheads:
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
elif currentbranchheads > 1: elif currentbranchheads > 1:
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "

mercurial/exchange.py

entry['URL']) entry['URL'])
continue continue
except error.InvalidBundleSpecification as e: except error.InvalidBundleSpecification as e:
repo.ui.debug(str(e) + '\n') repo.ui.debug(str(e) + '\n')
continue continue
except error.UnsupportedBundleSpecification as e: except error.UnsupportedBundleSpecification as e:
repo.ui.debug('filtering %s because unsupported bundle ' repo.ui.debug('filtering %s because unsupported bundle '
'spec: %s\n' % (entry['URL'], str(e))) 'spec: %s\n' % (
entry['URL'], util.forcebytestr(e)))
continue continue
# If we don't have a spec and requested a stream clone, we don't know # If we don't have a spec and requested a stream clone, we don't know
# what the entry is so don't attempt to apply it. # what the entry is so don't attempt to apply it.
elif streamclonerequested: elif streamclonerequested:
repo.ui.debug('filtering %s because cannot determine if a stream ' repo.ui.debug('filtering %s because cannot determine if a stream '
'clone bundle\n' % entry['URL']) 'clone bundle\n' % entry['URL'])
continue continue
cg = readbundle(ui, fh, 'stream') cg = readbundle(ui, fh, 'stream')
if isinstance(cg, streamclone.streamcloneapplier): if isinstance(cg, streamclone.streamcloneapplier):
cg.apply(repo) cg.apply(repo)
else: else:
bundle2.applybundle(repo, cg, tr, 'clonebundles', url) bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
return True return True
except urlerr.httperror as e: except urlerr.httperror as e:
ui.warn(_('HTTP error fetching bundle: %s\n') % str(e)) ui.warn(_('HTTP error fetching bundle: %s\n') %
util.forcebytestr(e))
except urlerr.urlerror as e: except urlerr.urlerror as e:
ui.warn(_('error fetching bundle: %s\n') % e.reason) ui.warn(_('error fetching bundle: %s\n') % e.reason)
return False return False

mercurial/localrepo.py

bundler = bundle2.bundle20(self._repo.ui) bundler = bundle2.bundle20(self._repo.ui)
for out in output: for out in output:
bundler.addpart(out) bundler.addpart(out)
stream = util.chunkbuffer(bundler.getchunks()) stream = util.chunkbuffer(bundler.getchunks())
b = bundle2.getunbundler(self.ui, stream) b = bundle2.getunbundler(self.ui, stream)
bundle2.processbundle(self._repo, b) bundle2.processbundle(self._repo, b)
raise raise
except error.PushRaced as exc: except error.PushRaced as exc:
raise error.ResponseError(_('push failed:'), str(exc)) raise error.ResponseError(_('push failed:'),
util.forcebytestr(exc))
# End of _basewirecommands interface. # End of _basewirecommands interface.
# Begin of peer interface. # Begin of peer interface.
def iterbatch(self): def iterbatch(self):
return peer.localiterbatcher(self) return peer.localiterbatcher(self)

mercurial/scmutil.py

except error.WdirUnsupported: except error.WdirUnsupported:
ui.warn(_("abort: working directory revision cannot be specified\n")) ui.warn(_("abort: working directory revision cannot be specified\n"))
except error.Abort as inst: except error.Abort as inst:
ui.warn(_("abort: %s\n") % inst) ui.warn(_("abort: %s\n") % inst)
if inst.hint: if inst.hint:
ui.warn(_("(%s)\n") % inst.hint) ui.warn(_("(%s)\n") % inst.hint)
except ImportError as inst: except ImportError as inst:
ui.warn(_("abort: %s!\n") % inst) ui.warn(_("abort: %s!\n") % inst)
m = str(inst).split()[-1] m = util.forcebytestr(inst).split()[-1]
if m in "mpatch bdiff".split(): if m in "mpatch bdiff".split():
ui.warn(_("(did you forget to compile extensions?)\n")) ui.warn(_("(did you forget to compile extensions?)\n"))
elif m in "zlib".split(): elif m in "zlib".split():
ui.warn(_("(is your Python install correct?)\n")) ui.warn(_("(is your Python install correct?)\n"))
except IOError as inst: except IOError as inst:
if util.safehasattr(inst, "code"): if util.safehasattr(inst, "code"):
ui.warn(_("abort: %s\n") % util.forcebytestr(inst)) ui.warn(_("abort: %s\n") % util.forcebytestr(inst))
elif util.safehasattr(inst, "reason"): elif util.safehasattr(inst, "reason"):

mercurial/ui.py

trusted = sections or trust or self._trusted(fp, filename) trusted = sections or trust or self._trusted(fp, filename)
try: try:
cfg.read(filename, fp, sections=sections, remap=remap) cfg.read(filename, fp, sections=sections, remap=remap)
fp.close() fp.close()
except error.ConfigError as inst: except error.ConfigError as inst:
if trusted: if trusted:
raise raise
self.warn(_("ignored: %s\n") % str(inst)) self.warn(_("ignored: %s\n") % util.forcebytestr(inst))
if self.plain(): if self.plain():
for k in ('debug', 'fallbackencoding', 'quiet', 'slash', for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
'logtemplate', 'statuscopies', 'style', 'logtemplate', 'statuscopies', 'style',
'traceback', 'verbose'): 'traceback', 'verbose'):
if k in cfg['ui']: if k in cfg['ui']:
del cfg['ui'][k] del cfg['ui'][k]
for k, v in cfg.items('defaults'): for k, v in cfg.items('defaults'):

mercurial/url.py

cookiefile = util.expandpath(cookiefile) cookiefile = util.expandpath(cookiefile)
try: try:
cookiejar = util.cookielib.MozillaCookieJar(cookiefile) cookiejar = util.cookielib.MozillaCookieJar(cookiefile)
cookiejar.load() cookiejar.load()
self.cookiejar = cookiejar self.cookiejar = cookiejar
except util.cookielib.LoadError as e: except util.cookielib.LoadError as e:
ui.warn(_('(error loading cookie file %s: %s; continuing without ' ui.warn(_('(error loading cookie file %s: %s; continuing without '
'cookies)\n') % (cookiefile, str(e))) 'cookies)\n') % (cookiefile, util.forcebytestr(e)))
def http_request(self, request): def http_request(self, request):
if self.cookiejar: if self.cookiejar:
self.cookiejar.add_cookie_header(request) self.cookiejar.add_cookie_header(request)
return request return request
def https_request(self, request): def https_request(self, request):

mercurial/util.py

return ''.join(parts) return ''.join(parts)
return None return None
def decompress(self, data): def decompress(self, data):
try: try:
return zlib.decompress(data) return zlib.decompress(data)
except zlib.error as e: except zlib.error as e:
raise error.RevlogError(_('revlog decompress error: %s') % raise error.RevlogError(_('revlog decompress error: %s') %
str(e)) forcebytestr(e))
def revlogcompressor(self, opts=None): def revlogcompressor(self, opts=None):
return self.zlibrevlogcompressor() return self.zlibrevlogcompressor()
compengines.register(_zlibengine()) compengines.register(_zlibengine())
class _bz2engine(compressionengine): class _bz2engine(compressionengine):
def name(self): def name(self):
if chunk: if chunk:
chunks.append(chunk) chunks.append(chunk)
pos = pos2 pos = pos2
# Frame should be exhausted, so no finish() API. # Frame should be exhausted, so no finish() API.
return ''.join(chunks) return ''.join(chunks)
except Exception as e: except Exception as e:
raise error.RevlogError(_('revlog decompress error: %s') % raise error.RevlogError(_('revlog decompress error: %s') %
str(e)) forcebytestr(e))
def revlogcompressor(self, opts=None): def revlogcompressor(self, opts=None):
opts = opts or {} opts = opts or {}
return self.zstdrevlogcompressor(self._module, return self.zstdrevlogcompressor(self._module,
level=opts.get('level', 3)) level=opts.get('level', 3))
compengines.register(_zstdengine()) compengines.register(_zstdengine())