Mercurial > hg-stable
changeset 14230:d51630301241
rename util.lookup_reg to lookupreg
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Fri, 06 May 2011 15:16:22 +0200 |
| parents | 85fd8402cbc4 |
| children | 8abe4db2d162 |
| files | mercurial/filemerge.py mercurial/scmutil.py mercurial/util.py mercurial/win32.py |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Fri May 06 15:13:46 2011 +0200 +++ b/mercurial/filemerge.py Fri May 06 15:16:22 2011 +0200 @@ -29,7 +29,7 @@ k = _toolstr(ui, tool, kn) if not k: continue - p = util.lookup_reg(k, _toolstr(ui, tool, "regname")) + p = util.lookupreg(k, _toolstr(ui, tool, "regname")) if p: p = util.find_exe(p + _toolstr(ui, tool, "regappend")) if p:
--- a/mercurial/scmutil.py Fri May 06 15:13:46 2011 +0200 +++ b/mercurial/scmutil.py Fri May 06 15:16:22 2011 +0200 @@ -439,8 +439,8 @@ rcpath.append(os.path.join(progrcd, f)) return rcpath # else look for a system rcpath in the registry - value = util.lookup_reg('SOFTWARE\\Mercurial', None, - _HKEY_LOCAL_MACHINE) + value = util.lookupreg('SOFTWARE\\Mercurial', None, + _HKEY_LOCAL_MACHINE) if not isinstance(value, str) or not value: return rcpath value = value.replace('/', os.sep)
--- a/mercurial/util.py Fri May 06 15:13:46 2011 +0200 +++ b/mercurial/util.py Fri May 06 15:16:22 2011 +0200 @@ -487,7 +487,7 @@ return _("filename ends with '%s', which is not allowed " "on Windows") % t -def lookup_reg(key, name=None, scope=None): +def lookupreg(key, name=None, scope=None): return None def hidewindow():
--- a/mercurial/win32.py Fri May 06 15:13:46 2011 +0200 +++ b/mercurial/win32.py Fri May 06 15:16:22 2011 +0200 @@ -180,7 +180,7 @@ _kernel32.CloseHandle(h) return _kernel32.GetLastError() != _ERROR_INVALID_PARAMETER -def lookup_reg(key, valname=None, scope=None): +def lookupreg(key, valname=None, scope=None): ''' Look up a key/value name in the Windows registry. valname: value name. If unspecified, the default value for the key