# HG changeset patch # User Jun Wu # Date 1507876474 25200 # Node ID dacfcdd8b94e115a61c3ed738ea0197b9b89ceb8 # Parent 238abf65a8ad653a5ce14287609185f3687618ec codemod: use pycompat.isdarwin This is done by: sed -i "s/pycompat\.sysplatform == 'darwin'/pycompat.isdarwin/" **/*.py Plus a manual change to `sslutil.py` which involves indentation change that cannot be done by `sed`. Differential Revision: https://phab.mercurial-scm.org/D1035 diff -r 238abf65a8ad -r dacfcdd8b94e hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py Thu Oct 12 09:04:22 2017 -0700 +++ b/hgext/fsmonitor/__init__.py Thu Oct 12 23:34:34 2017 -0700 @@ -603,7 +603,7 @@ def extsetup(ui): extensions.wrapfilecache( localrepo.localrepository, 'dirstate', wrapdirstate) - if pycompat.sysplatform == 'darwin': + if pycompat.isdarwin: # An assist for avoiding the dangling-symlink fsevents bug extensions.wrapfunction(os, 'symlink', wrapsymlink) diff -r 238abf65a8ad -r dacfcdd8b94e hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py Thu Oct 12 09:04:22 2017 -0700 +++ b/hgext/largefiles/lfutil.py Thu Oct 12 23:34:34 2017 -0700 @@ -79,7 +79,7 @@ encoding.environ.get('APPDATA')) if appdata: return os.path.join(appdata, longname) - elif pycompat.sysplatform == 'darwin': + elif pycompat.isdarwin: home = encoding.environ.get('HOME') if home: return os.path.join(home, 'Library', 'Caches', longname) diff -r 238abf65a8ad -r dacfcdd8b94e mercurial/cffi/osutil.py --- a/mercurial/cffi/osutil.py Thu Oct 12 09:04:22 2017 -0700 +++ b/mercurial/cffi/osutil.py Thu Oct 12 23:34:34 2017 -0700 @@ -16,7 +16,7 @@ pycompat, ) -if pycompat.sysplatform == 'darwin': +if pycompat.isdarwin: from . import _osutil ffi = _osutil.ffi diff -r 238abf65a8ad -r dacfcdd8b94e mercurial/posix.py --- a/mercurial/posix.py Thu Oct 12 09:04:22 2017 -0700 +++ b/mercurial/posix.py Thu Oct 12 23:34:34 2017 -0700 @@ -332,7 +332,7 @@ # fallback normcase function for non-ASCII strings normcasefallback = normcase -if pycompat.sysplatform == 'darwin': +if pycompat.isdarwin: def normcase(path): ''' diff -r 238abf65a8ad -r dacfcdd8b94e mercurial/scmposix.py --- a/mercurial/scmposix.py Thu Oct 12 09:04:22 2017 -0700 +++ b/mercurial/scmposix.py Thu Oct 12 23:34:34 2017 -0700 @@ -46,7 +46,7 @@ def userrcpath(): if pycompat.sysplatform == 'plan9': return [encoding.environ['home'] + '/lib/hgrc'] - elif pycompat.sysplatform == 'darwin': + elif pycompat.isdarwin: return [os.path.expanduser('~/.hgrc')] else: confighome = encoding.environ.get('XDG_CONFIG_HOME') diff -r 238abf65a8ad -r dacfcdd8b94e mercurial/sslutil.py --- a/mercurial/sslutil.py Thu Oct 12 09:04:22 2017 -0700 +++ b/mercurial/sslutil.py Thu Oct 12 23:34:34 2017 -0700 @@ -677,8 +677,8 @@ for using system certificate store CAs in addition to the provided cacerts file """ - if (pycompat.sysplatform != 'darwin' or - util.mainfrozen() or not pycompat.sysexecutable): + if (not pycompat.isdarwin or util.mainfrozen() or + not pycompat.sysexecutable): return False exe = os.path.realpath(pycompat.sysexecutable).lower() return (exe.startswith('/usr/bin/python') or @@ -736,7 +736,7 @@ # The Apple OpenSSL trick isn't available to us. If Python isn't able to # load system certs, we're out of luck. - if pycompat.sysplatform == 'darwin': + if pycompat.isdarwin: # FUTURE Consider looking for Homebrew or MacPorts installed certs # files. Also consider exporting the keychain certs to a file during # Mercurial install. diff -r 238abf65a8ad -r dacfcdd8b94e mercurial/util.py --- a/mercurial/util.py Thu Oct 12 09:04:22 2017 -0700 +++ b/mercurial/util.py Thu Oct 12 23:34:34 2017 -0700 @@ -1561,7 +1561,7 @@ def gui(): '''Are we running in a GUI?''' - if pycompat.sysplatform == 'darwin': + if pycompat.isdarwin: if 'SSH_CONNECTION' in encoding.environ: # handle SSH access to a box where the user is logged in return False