This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5626

scmutil: drop unreachable except clause
ClosedPublic

Authored by martinvonz on Jan 17 2019, 12:49 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG17941fc53ae9: scmutil: drop unreachable except clause
Summary

socket.error is a subclass of IOError, which we catch higher up. It
seems to have been this way since 020a896a5292 (dispatch: sort
exception handlers, 2009-01-12), so let's celebrate the 10 year
anniversary (a few days late) of it being wrong by deleting it.

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

martinvonz created this revision.Jan 17 2019, 12:49 AM
yuja added a subscriber: yuja.Jan 18 2019, 7:29 AM

Queued, thanks.

socket.error is a subclass of IOError, which we catch higher up. It

For the record, it's Python 2.6 feature.

https://docs.python.org/2.7/library/socket.html#socket.error

Closed by commit rHG17941fc53ae9: scmutil: drop unreachable except clause (authored by martinvonz). · Explain WhyJan 18 2019, 7:35 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (3 lines)

Diff 13323

mercurial/scmutil.py

# scmutil.py - Mercurial core utility functions # scmutil.py - Mercurial core utility functions
# #
# Copyright Matt Mackall <mpm@selenic.com> # Copyright Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import glob import glob
import hashlib import hashlib
import os import os
import re import re
import socket
import subprocess import subprocess
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
else: else:
ui.error(_("abort: %s\n") % encoding.strtolocal(inst.strerror)) ui.error(_("abort: %s\n") % encoding.strtolocal(inst.strerror))
except MemoryError: except MemoryError:
ui.error(_("abort: out of memory\n")) ui.error(_("abort: out of memory\n"))
except SystemExit as inst: except SystemExit as inst:
# Commands shouldn't sys.exit directly, but give a return code. # Commands shouldn't sys.exit directly, but give a return code.
# Just in case catch this and and pass exit code to caller. # Just in case catch this and and pass exit code to caller.
return inst.code return inst.code
except socket.error as inst:
ui.error(_("abort: %s\n") % stringutil.forcebytestr(inst.args[-1]))
return -1 return -1
def checknewlabel(repo, lbl, kind): def checknewlabel(repo, lbl, kind):
# Do not use the "kind" parameter in ui output. # Do not use the "kind" parameter in ui output.
# It makes strings difficult to translate. # It makes strings difficult to translate.
if lbl in ['tip', '.', 'null']: if lbl in ['tip', '.', 'null']:
raise error.Abort(_("the name '%s' is reserved") % lbl) raise error.Abort(_("the name '%s' is reserved") % lbl)