This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7171

packaging: write out editor.rc in Python
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8aa6aa9b7843: packaging: write out editor.rc in Python
Summary

Let's dynamically generate the file from Python instead of
relying on Inno functionality, as that will give more
visibility into what's going on.

I spotted this as part of converging the install layout
of Inno and WiX: the former doesn't install an editor.rc
and instead defines the editor via its mercurial.rc file.

We will change the behavior of WiX later once it is consuming
the staged install directory for packaging.

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

indygreg created this revision.Oct 23 2019, 9:54 PM
indygreg updated this revision to Diff 17405.Oct 24 2019, 11:34 PM
indygreg added a commit: rHG8aa6aa9b7843: packaging: write out editor.rc in Python.Nov 11 2019, 4:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8aa6aa9b7843: packaging: write out editor.rc in Python (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18024

contrib/packaging/hgpackaging/py2exe.py

def stage_install(source_dir: pathlib.Path, staging_dir: pathlib.Path): def stage_install(source_dir: pathlib.Path, staging_dir: pathlib.Path):
"""Copy all files to be installed to a directory. """Copy all files to be installed to a directory.
This allows packaging to simply walk a directory tree to find source This allows packaging to simply walk a directory tree to find source
files. files.
""" """
process_install_rules(STAGING_RULES, source_dir, staging_dir) process_install_rules(STAGING_RULES, source_dir, staging_dir)
# Write out a default editor.rc file to configure notepad as the
# default editor.
with (staging_dir / 'hgrc.d' / 'editor.rc').open(
'w', encoding='utf-8'
) as fh:
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/inno/mercurial.iss

[Files] [Files]
{% for entry in package_files -%} {% for entry in package_files -%}
Source: {{ entry.source }}; DestDir: {{ entry.dest_dir }} Source: {{ entry.source }}; DestDir: {{ entry.dest_dir }}
{%- 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/
Filename: {app}\hgrc.d\editor.rc; Section: ui; Key: editor; String: notepad
[UninstallDelete] [UninstallDelete]
Type: files; Name: {app}\Mercurial.url Type: files; Name: {app}\Mercurial.url
Type: filesandordirs; Name: {app}\hgrc.d Type: filesandordirs; Name: {app}\hgrc.d
[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