Mercurial > hg
changeset 13985:26335a817dd0
move os_rcpath from util to scmutil
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Thu, 21 Apr 2011 20:54:45 +0200 |
| parents | af60153b5e3b |
| children | 9c374cf76b7d |
| files | mercurial/scmutil.py mercurial/util.py |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Thu Apr 21 20:14:29 2011 +0200 +++ b/mercurial/scmutil.py Thu Apr 21 20:54:45 2011 +0200 @@ -296,6 +296,13 @@ newdirs.append(d) dirs[:] = newdirs +def os_rcpath(): + '''return default os-specific hgrc search path''' + path = util.system_rcpath() + path.extend(util.user_rcpath()) + path = [os.path.normpath(f) for f in path] + return path + _rcpath = None def rcpath(): @@ -319,5 +326,5 @@ else: _rcpath.append(p) else: - _rcpath = util.os_rcpath() + _rcpath = os_rcpath() return _rcpath
--- a/mercurial/util.py Thu Apr 21 20:14:29 2011 +0200 +++ b/mercurial/util.py Thu Apr 21 20:54:45 2011 +0200 @@ -1083,13 +1083,6 @@ except (UnicodeDecodeError, UnicodeEncodeError): return _ellipsis(text, maxlength)[0] -def os_rcpath(): - '''return default os-specific hgrc search path''' - path = system_rcpath() - path.extend(user_rcpath()) - path = [os.path.normpath(f) for f in path] - return path - def bytecount(nbytes): '''return byte count formatted as readable string, with units'''