##// END OF EJS Templates
packaging: stage files and dynamically generate WiX installer...
packaging: stage files and dynamically generate WiX installer Like we did for Inno, we want to make the WiX installer "dumb" and simply consume source files from a directory tree rather than have to define every single file in installer files. This will greatly decrease the amount of effort required to maintain the WiX installer since we don't have to think that much about keeping files in sync. This commit changes the WiX packager to populate a staging directory as part of packaging. After it does so, it scans that directory and dynamically generates WiX XML defining the content within. The IDs and GUIDs being generated are deterministic. So, upgrades should work as expected in Windows Installer land. (WiX has a "heat" tool that can generate XML by walking the filesystem but it doesn't have this deterministic property, sadly.) As part of this change, GUIDs are now effectively reset. So the next upgrade should be a complete wipe and replace. This could potentially cause issues. But in my local testing, I was able to upgrade an existing 5.1.2 install without issue. Compared to the previous commit, the installed files differ in the following: * A ReleaseNotes.txt file is now included * A hgrc.d/editor.rc file is now generated (mercurial.rc has been updated to reflect this logical change to the content source) * All files are marked as read-only. Previously, only a subset of files were. This should help prevent unwanted tampering. Although we may want to consider use cases like modifying template files... This change also means that Inno and WiX are now using very similar code for managing the install layout. This means that on disk both packages are nearly identical. The differences in install layout are as follows: * Inno has a Copying.txt vs a COPYING.rtf for WiX. (The WiX installer wants to use RTF.) * Inno has a Mercurial.url file that is an internet shortcut to www.mercurial-scm.org. (This could potentially be removed.) * Inno includes msvc[mpr]90.dll files and WiX does not. (WiX installs the MSVC runtime via merge modules.) * Inno includes unins000.{dat,exe} files. (WiX's state is managed by Windows Installer, which places things elsewhere.) Because file lists are dynamically generated now, the test ensuring things remain in sync has been deleted. Good riddance. While this is a huge step towards unifying the Windows installers, there's still some improvements that can be made. But I think it is worth celebrating the milestone of getting both Inno and WiX to essentially share core packaging code and workflows. That should make it much easier to change the installers going forward. This will aid support of Python 3. Differential Revision: https://phab.mercurial-scm.org/D7173

File last commit:

r43350:86e4daa2 default
r44022:94eac340 default
Show More
debugshell.py
65 lines | 1.5 KiB | text/x-python | PythonLexer
Vishakh H
contrib: add debugshell extension
r11633 # debugshell extension
"""a python shell with repo, changelog & manifest objects"""
Pulkit Goyal
debugshell: use absolute_import
r28476 from __future__ import absolute_import
import code
Vishakh H
contrib: add debugshell extension
r11633 import mercurial
Pulkit Goyal
debugshell: use absolute_import
r28476 import sys
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 from mercurial import (
demandimport,
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 )
Gregory Szorc
debugshell: declare command using decorator
r21243
cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Vishakh H
contrib: add debugshell extension
r11633
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
debugshell: abstract out pdb code.interact
r19771 def pdb(ui, repo, msg, **opts):
Vishakh H
contrib: add debugshell extension
r11633 objects = {
'mercurial': mercurial,
'repo': repo,
'cl': repo.changelog,
Durham Goode
manifest: remove last uses of repo.manifest...
r30375 'mf': repo.manifestlog,
Vishakh H
contrib: add debugshell extension
r11633 }
Sean Farley
debugshell: abstract out pdb code.interact
r19771
code.interact(msg, local=objects)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
debugshell: add function to embed ipython
r19772 def ipdb(ui, repo, msg, **opts):
import IPython
cl = repo.changelog
Durham Goode
manifest: remove last uses of repo.manifest...
r30375 mf = repo.manifestlog
Augie Fackler
formatting: blacken the codebase...
r43346 cl, mf # use variables to appease pyflakes
Sean Farley
debugshell: add function to embed ipython
r19772
IPython.embed()
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 @command(b'debugshell|dbsh', [])
Sean Farley
debugshell: abstract out pdb code.interact
r19771 def debugshell(ui, repo, **opts):
Augie Fackler
formatting: blacken the codebase...
r43346 bannermsg = "loaded repo : %s\n" "using source: %s" % (
pycompat.sysstr(repo.root),
mercurial.__path__[0],
)
Sean Farley
debugshell: abstract out pdb code.interact
r19771
Augie Fackler
formatting: blacken the codebase...
r43346 pdbmap = {'pdb': 'code', 'ipdb': 'IPython'}
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 debugger = ui.config(b"ui", b"debugger")
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773 if not debugger:
debugger = 'pdb'
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 else:
debugger = pycompat.sysstr(debugger)
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
# if IPython doesn't exist, fallback to code.interact
try:
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 with demandimport.deactivated():
__import__(pdbmap[debugger])
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773 except ImportError:
Augie Fackler
cleanup: mark some ui.(status|note|warn|write) calls as not needing i18n...
r43350 ui.warnnoi18n(
Augie Fackler
formatting: blacken the codebase...
r43346 b"%s debugger specified but %s module was not found\n"
% (debugger, pdbmap[debugger])
)
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 debugger = b'pdb'
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
getattr(sys.modules[__name__], debugger)(ui, repo, bannermsg, **opts)