This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7981

packaging: rename hgrc.d to defaultrc for Windows config files next to the exe
ClosedPublic

Authored by mharbison72 on Jan 24 2020, 1:43 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe4344e463c0c: packaging: rename hgrc.d to defaultrc for Windows config files next to the exe
Summary

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\\*.*'

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jan 24 2020, 1:43 AM
mharbison72 added a comment.Jan 24 2020, 1:52 AM

I left out the hgrc.d references in these places, because they seem to reference global hgrc.d, and not the one next to the executable.

  • contrib/plan9/proto
  • contrib/plan9/mkfile
  • contrib/packaging/debian/rules
  • contrib/packaging/mercurial.spec

I think we still need to figure out if we need to update the documentation to reference the new resource directory, and/or drop the hgrc.d next to the executable. But these changes at least let hg version and hg config run. I didn't go about disabling all of the other config files that get read in after these default config files.

mharbison72 added subscribers: indygreg, martinvonz.Jan 24 2020, 1:54 AM

CC @indygreg and @martinvonz because it's really late and I have no idea if I'm missing something.

mharbison72 added a commit: rHGe4344e463c0c: packaging: rename hgrc.d to defaultrc for Windows config files next to the exe.Jan 24 2020, 11:06 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe4344e463c0c: packaging: rename hgrc.d to defaultrc for Windows config files next to the exe (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19552

contrib/packaging/hgpackaging/py2exe.py

('dist/lib/*.pyd', 'lib/'), ('dist/lib/*.pyd', 'lib/'),
('dist/lib/library.zip', 'lib/'), ('dist/lib/library.zip', 'lib/'),
('dist/Microsoft.VC*.CRT.manifest', './'), ('dist/Microsoft.VC*.CRT.manifest', './'),
('dist/msvc*.dll', './'), ('dist/msvc*.dll', './'),
('dist/python*.dll', './'), ('dist/python*.dll', './'),
('doc/*.html', 'doc/'), ('doc/*.html', 'doc/'),
('doc/style.css', 'doc/'), ('doc/style.css', 'doc/'),
('mercurial/helptext/**/*.txt', 'helptext/'), ('mercurial/helptext/**/*.txt', 'helptext/'),
('mercurial/defaultrc/*.rc', 'hgrc.d/'), ('mercurial/defaultrc/*.rc', 'defaultrc/'),
('mercurial/locale/**/*', 'locale/'), ('mercurial/locale/**/*', 'locale/'),
('mercurial/templates/**/*', 'Templates/'), ('mercurial/templates/**/*', 'Templates/'),
('COPYING', 'Copying.txt'), ('COPYING', 'Copying.txt'),
] ]
# List of paths to exclude from the staging area. # List of paths to exclude from the staging area.
STAGING_EXCLUDES = [ STAGING_EXCLUDES = [
'doc/hg-ssh.8.html', 'doc/hg-ssh.8.html',
rules.append((source, dest)) rules.append((source, dest))
else: else:
rules = STAGING_RULES rules = STAGING_RULES
process_install_rules(rules, source_dir, staging_dir) process_install_rules(rules, source_dir, staging_dir)
# Write out a default editor.rc file to configure notepad as the # Write out a default editor.rc file to configure notepad as the
# default editor. # default editor.
with (staging_dir / 'hgrc.d' / 'editor.rc').open( with (staging_dir / 'defaultrc' / 'editor.rc').open(
'w', encoding='utf-8' 'w', encoding='utf-8'
) as fh: ) as fh:
fh.write('[ui]\neditor = notepad\n') fh.write('[ui]\neditor = notepad\n')
# Purge any files we don't want to be there. # Purge any files we don't want to be there.
for f in STAGING_EXCLUDES: for f in STAGING_EXCLUDES:
p = staging_dir / f p = staging_dir / f
if p.exists(): if p.exists():
print('removing %s' % p) print('removing %s' % p)
p.unlink() p.unlink()

contrib/packaging/hgpackaging/wix.py

EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'distutils', 'distutils',
'pygments', 'pygments',
} }
EXTRA_INSTALL_RULES = [ EXTRA_INSTALL_RULES = [
('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'), ('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 = [ STAGING_REMOVE_FILES = [
# We use the RTF variant. # We use the RTF variant.
'copying.txt', 'copying.txt',
] ]
SHORTCUTS = { SHORTCUTS = {

contrib/packaging/inno/mercurial.iss

{%- if entry.metadata %}; {{ entry.metadata }}{% endif %} {%- if entry.metadata %}; {{ entry.metadata }}{% endif %}
{% endfor %} {% endfor %}
[INI] [INI]
Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/ Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/
[UninstallDelete] [UninstallDelete]
Type: files; Name: {app}\Mercurial.url Type: files; Name: {app}\Mercurial.url
Type: filesandordirs; Name: {app}\hgrc.d Type: filesandordirs; Name: {app}\defaultrc
[Icons] [Icons]
Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url

contrib/packaging/wix/mercurial.wxs

<Feature Id='Complete' Title='Mercurial' Description='The complete package' <Feature Id='Complete' Title='Mercurial' Description='The complete package'
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
Level='1' Absent='disallow' > Level='1' Absent='disallow' >
<ComponentRef Id='MainExecutable' /> <ComponentRef Id='MainExecutable' />
<ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ProgramMenuDir' />
<ComponentGroupRef Id="hg.group.ROOT" /> <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.helptext" />
<ComponentGroupRef Id="hg.group.lib" /> <ComponentGroupRef Id="hg.group.lib" />
<ComponentGroupRef Id="hg.group.templates" /> <ComponentGroupRef Id="hg.group.templates" />
<MergeRef Id='VCRuntime' /> <MergeRef Id='VCRuntime' />
<MergeRef Id='VCRuntimePolicy' /> <MergeRef Id='VCRuntimePolicy' />
</Feature> </Feature>
<?ifdef MercurialExtraFeatures?> <?ifdef MercurialExtraFeatures?>
<?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?> <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>