Show More
@@ -370,8 +370,17 b' else:' | |||||
370 | # Platform specific variants |
|
370 | # Platform specific variants | |
371 | if os.name == 'nt': |
|
371 | if os.name == 'nt': | |
372 | nulldev = 'NUL:' |
|
372 | nulldev = 'NUL:' | |
|
373 | ||||
|
374 | try: | |||
|
375 | import win32api, win32process | |||
|
376 | filename = win32process.GetModuleFileNameEx(win32api.GetCurrentProcess(), 0) | |||
|
377 | systemrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') | |||
|
378 | ||||
|
379 | except ImportError: | |||
|
380 | systemrc = r'c:\mercurial\mercurial.ini' | |||
|
381 | pass | |||
373 |
|
382 | |||
374 | rcpath = (r'c:\mercurial\mercurial.ini', |
|
383 | rcpath = (systemrc, | |
375 | os.path.join(os.path.expanduser('~'), 'mercurial.ini')) |
|
384 | os.path.join(os.path.expanduser('~'), 'mercurial.ini')) | |
376 |
|
385 | |||
377 | def parse_patch_output(output_line): |
|
386 | def parse_patch_output(output_line): |
General Comments 0
You need to be logged in to leave comments.
Login now