diff -r 9cc55b743713 -r 57875cf423c9 mercurial/scmposix.py --- a/mercurial/scmposix.py Fri Oct 04 15:53:45 2019 -0400 +++ b/mercurial/scmposix.py Sat Oct 05 10:29:34 2019 -0400 @@ -18,17 +18,23 @@ # 'less' as the default seems reasonable. fallbackpager = 'less' + def _rcfiles(path): rcs = [os.path.join(path, 'hgrc')] rcdir = os.path.join(path, 'hgrc.d') try: - rcs.extend([os.path.join(rcdir, f) - for f, kind in util.listdir(rcdir) - if f.endswith(".rc")]) + rcs.extend( + [ + os.path.join(rcdir, f) + for f, kind in util.listdir(rcdir) + if f.endswith(".rc") + ] + ) except OSError: pass return rcs + def systemrcpath(): path = [] if pycompat.sysplatform == 'plan9': @@ -43,6 +49,7 @@ path.extend(_rcfiles('/' + root)) return path + def userrcpath(): if pycompat.sysplatform == 'plan9': return [encoding.environ['home'] + '/lib/hgrc'] @@ -53,12 +60,16 @@ if confighome is None or not os.path.isabs(confighome): confighome = os.path.expanduser('~/.config') - return [os.path.expanduser('~/.hgrc'), - os.path.join(confighome, 'hg', 'hgrc')] + return [ + os.path.expanduser('~/.hgrc'), + os.path.join(confighome, 'hg', 'hgrc'), + ] + def termsize(ui): try: import termios + TIOCGWINSZ = termios.TIOCGWINSZ # unavailable on IRIX (issue3449) except (AttributeError, ImportError): return 80, 24