D7981: packaging: rename hgrc.d to defaultrc for Windows config files next to the exe
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Fri Jan 24 11:07:04 EST 2020
Closed by commit rHGe4344e463c0c: packaging: rename hgrc.d to defaultrc for Windows config files next to the exe (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7981?vs=19543&id=19552
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7981/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7981
AFFECTED FILES
contrib/packaging/hgpackaging/py2exe.py
contrib/packaging/hgpackaging/wix.py
contrib/packaging/inno/mercurial.iss
contrib/packaging/wix/mercurial.wxs
CHANGE DETAILS
diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs
--- a/contrib/packaging/wix/mercurial.wxs
+++ b/contrib/packaging/wix/mercurial.wxs
@@ -99,7 +99,7 @@
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='ProgramMenuDir' />
<ComponentGroupRef Id="hg.group.ROOT" />
- <ComponentGroupRef Id="hg.group.hgrc.d" />
+ <ComponentGroupRef Id="hg.group.defaultrc" />
<ComponentGroupRef Id="hg.group.helptext" />
<ComponentGroupRef Id="hg.group.lib" />
<ComponentGroupRef Id="hg.group.templates" />
diff --git a/contrib/packaging/inno/mercurial.iss b/contrib/packaging/inno/mercurial.iss
--- a/contrib/packaging/inno/mercurial.iss
+++ b/contrib/packaging/inno/mercurial.iss
@@ -51,7 +51,7 @@
[UninstallDelete]
Type: files; Name: {app}\Mercurial.url
-Type: filesandordirs; Name: {app}\hgrc.d
+Type: filesandordirs; Name: {app}\defaultrc
[Icons]
Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -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 = [
diff --git a/contrib/packaging/hgpackaging/py2exe.py b/contrib/packaging/hgpackaging/py2exe.py
--- a/contrib/packaging/hgpackaging/py2exe.py
+++ b/contrib/packaging/hgpackaging/py2exe.py
@@ -45,7 +45,7 @@
('doc/*.html', 'doc/'),
('doc/style.css', 'doc/'),
('mercurial/helptext/**/*.txt', 'helptext/'),
- ('mercurial/defaultrc/*.rc', 'hgrc.d/'),
+ ('mercurial/defaultrc/*.rc', 'defaultrc/'),
('mercurial/locale/**/*', 'locale/'),
('mercurial/templates/**/*', 'Templates/'),
('COPYING', 'Copying.txt'),
@@ -232,7 +232,7 @@
# Write out a default editor.rc file to configure notepad as the
# default editor.
- with (staging_dir / 'hgrc.d' / 'editor.rc').open(
+ with (staging_dir / 'defaultrc' / 'editor.rc').open(
'w', encoding='utf-8'
) as fh:
fh.write('[ui]\neditor = notepad\n')
To: mharbison72, #hg-reviewers
Cc: martinvonz, indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list