diff -r 9cc55b743713 -r 57875cf423c9 mercurial/scmwindows.py --- a/mercurial/scmwindows.py Fri Oct 04 15:53:45 2019 -0400 +++ b/mercurial/scmwindows.py Sat Oct 05 10:29:34 2019 -0400 @@ -11,6 +11,7 @@ try: import _winreg as winreg + winreg.CloseKey except ImportError: import winreg @@ -18,6 +19,7 @@ # MS-DOS 'more' is the only pager available by default on Windows. fallbackpager = 'more' + def systemrcpath(): '''return default os-specific hgrc search path''' rcpath = [] @@ -32,8 +34,9 @@ if f.endswith('.rc'): rcpath.append(os.path.join(progrcd, f)) # else look for a system rcpath in the registry - value = util.lookupreg('SOFTWARE\\Mercurial', None, - winreg.HKEY_LOCAL_MACHINE) + value = util.lookupreg( + 'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE + ) if not isinstance(value, str) or not value: return rcpath value = util.localpath(value) @@ -46,16 +49,17 @@ rcpath.append(os.path.join(p, f)) return rcpath + def userrcpath(): '''return os-specific hgrc search path to the user dir''' home = os.path.expanduser('~') - path = [os.path.join(home, 'mercurial.ini'), - os.path.join(home, '.hgrc')] + path = [os.path.join(home, 'mercurial.ini'), os.path.join(home, '.hgrc')] userprofile = encoding.environ.get('USERPROFILE') if userprofile and userprofile != home: path.append(os.path.join(userprofile, 'mercurial.ini')) path.append(os.path.join(userprofile, '.hgrc')) return path + def termsize(ui): return win32.termsize()