Show More
@@ -363,7 +363,7 def walkrepos(path, followsym=False, see | |||||
363 | def osrcpath(): |
|
363 | def osrcpath(): | |
364 | '''return default os-specific hgrc search path''' |
|
364 | '''return default os-specific hgrc search path''' | |
365 | path = systemrcpath() |
|
365 | path = systemrcpath() | |
366 |
path.extend(user |
|
366 | path.extend(userrcpath()) | |
367 | path = [os.path.normpath(f) for f in path] |
|
367 | path = [os.path.normpath(f) for f in path] | |
368 | return path |
|
368 | return path | |
369 |
|
369 | |||
@@ -415,7 +415,7 if os.name != 'nt': | |||||
415 | path.extend(rcfiles('/etc/mercurial')) |
|
415 | path.extend(rcfiles('/etc/mercurial')) | |
416 | return path |
|
416 | return path | |
417 |
|
417 | |||
418 |
def user |
|
418 | def userrcpath(): | |
419 | return [os.path.expanduser('~/.hgrc')] |
|
419 | return [os.path.expanduser('~/.hgrc')] | |
420 |
|
420 | |||
421 | else: |
|
421 | else: | |
@@ -453,7 +453,7 else: | |||||
453 | rcpath.append(os.path.join(p, f)) |
|
453 | rcpath.append(os.path.join(p, f)) | |
454 | return rcpath |
|
454 | return rcpath | |
455 |
|
455 | |||
456 |
def user |
|
456 | def userrcpath(): | |
457 | '''return os-specific hgrc search path to the user dir''' |
|
457 | '''return os-specific hgrc search path to the user dir''' | |
458 | home = os.path.expanduser('~') |
|
458 | home = os.path.expanduser('~') | |
459 | path = [os.path.join(home, 'mercurial.ini'), |
|
459 | path = [os.path.join(home, 'mercurial.ini'), |
General Comments 0
You need to be logged in to leave comments.
Login now