diff contrib/packaging/hgpackaging/wix.py @ 44153:e4344e463c0c stable 5.3rc1

packaging: rename hgrc.d to defaultrc for Windows config files next to the exe The code and the help still says that it will read hgrc.d next to the executable. But this directory needs to exist to read the resource based config files. Otherwise even `hg version` errors out: $ /c/Program\ Files/Mercurial/hg.exe version Traceback (most recent call last): File "hg", line 43, in <module> File "mercurial\dispatch.pyc", line 110, in run File "mercurial\dispatch.pyc", line 226, in dispatch File "mercurial\ui.pyc", line 308, in load File "mercurial\rcutil.pyc", line 99, in rccomponents File "mercurial\rcutil.pyc", line 69, in default_rc_resources File "mercurial\utils\resourceutil.pyc", line 84, in contents WindowsError: [Error 3] The system cannot find the path specified: 'c:\\Program Files\\mercurial\\defaultrc\\*.*' Differential Revision: https://phab.mercurial-scm.org/D7981
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 24 Jan 2020 01:37:18 -0500
parents 94eac340d212
children 8d653abed861
line wrap: on
line diff
--- a/contrib/packaging/hgpackaging/wix.py	Fri Jan 24 01:11:19 2020 -0500
+++ b/contrib/packaging/hgpackaging/wix.py	Fri Jan 24 01:37:18 2020 -0500
@@ -37,7 +37,7 @@
 
 EXTRA_INSTALL_RULES = [
     ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'),
-    ('contrib/win32/mercurial.ini', 'hgrc.d/mercurial.rc'),
+    ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
 ]
 
 STAGING_REMOVE_FILES = [