facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

util_win32.py: fix user_rcpath

Browse Source 
Fixes issue504.
This commit is contained in:
Alexis S. L. Carvalho 2007-02-16 05:53:03 -02:00
parent 79d891fab8
commit c235d44d85
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/util.py
View File

@ -801,7 +801,11 @@ if os.name == 'nt':
def user_rcpath():
'''return os-specific hgrc search path to the user dir'''
path = [os.path.join(os.path.expanduser('~'), 'mercurial.ini')]
try:
userrc = user_rcpath_win32()
except:
userrc = os.path.join(os.path.expanduser('~'), 'mercurial.ini')
path = [userrc]
userprofile = os.environ.get('USERPROFILE')
if userprofile:
path.append(os.path.join(userprofile, 'mercurial.ini'))

2
mercurial/util_win32.py
View File

@ -187,7 +187,7 @@ def system_rcpath_win32():
filename = win32api.GetModuleFileName(0)
return [os.path.join(os.path.dirname(filename), 'mercurial.ini')]
def user_rcpath():
def user_rcpath_win32():
'''return os-specific hgrc search path to the user dir'''
userdir = os.path.expanduser('~')
if userdir == '~':