##// END OF EJS Templates
dirstate-tree: Remove DirstateMap::iter_node_data_mut...
dirstate-tree: Remove DirstateMap::iter_node_data_mut In an upcoming changeset we want DirstateMap to be able to work directly with nodes in their "on disk" representation, without always allocating corresponding in-memory data structures. Nodes would have two possible representations: one immutable "on disk" refering to the bytes buffer of the contents of the .hg/dirstate file, and one mutable with HashMap like the curren data structure. These nodes would have copy-on-write semantics: when an immutable node would need to be mutated, instead we allocate new mutable node for it and its ancestors. A mutable iterator of the entire tree would still be possible, but it would become much more expensive since we’d need to allocate mutable nodes for everything. Instead, remove this iterator. It was only used to clear ambiguous mtimes while serializing the `DirstateMap`. Instead clearing and serialization are now two separate passes. Clearing first uses an immutable iterator to collect the paths of nodes that need to be cleared, then accesses only those nodes mutably. Differential Revision: https://phab.mercurial-scm.org/D10744

File last commit:

r47982:159d2de3 default
r48121:73f23e76 default
Show More
pyoxidizer.bzl
273 lines | 8.8 KiB | text/x-python | PythonLexer
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976 # The following variables can be passed in as parameters:
#
# VERSION
# Version string of program being produced.
#
# MSI_NAME
# Root name of MSI installer.
#
# EXTRA_MSI_FEATURES
# ; delimited string of extra features to advertise in the built MSA.
Gregory Szorc
pyoxidizer: support code signing...
r47977 #
# SIGNING_PFX_PATH
# Path to code signing certificate to use.
#
# SIGNING_PFX_PASSWORD
# Password to code signing PFX file defined by SIGNING_PFX_PATH.
#
# SIGNING_SUBJECT_NAME
# String fragment in code signing certificate subject name used to find
# code signing certificate in Windows certificate store.
#
# TIME_STAMP_SERVER_URL
# URL of time-stamp token authority (RFC 3161) servers to stamp code signatures.
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976
Gregory Szorc
hgcli: customize for Mercurial...
r45129 ROOT = CWD + "/../.."
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976 VERSION = VARS.get("VERSION", "5.8")
MSI_NAME = VARS.get("MSI_NAME", "mercurial")
EXTRA_MSI_FEATURES = VARS.get("EXTRA_MSI_FEATURES")
Gregory Szorc
pyoxidizer: support code signing...
r47977 SIGNING_PFX_PATH = VARS.get("SIGNING_PFX_PATH")
SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "")
SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME")
TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com")
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 # Code to run in Python interpreter.
RUN_CODE = "import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run()"
set_build_path(ROOT + "/build/pyoxidizer")
def make_distribution():
Gregory Szorc
pyoxidizer: use Python 3.9 (BC)...
r47982 return default_python_distribution(python_version = "3.9")
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 def resource_callback(policy, resource):
Augie Fackler
pyoxidizer: default to one-file binary on non-Windows platforms...
r46435 if not IS_WINDOWS:
resource.add_location = "in-memory"
return
Augie Fackler
pyoxidizer: run buildifier...
r46491
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 # We use a custom resource routing policy to influence where things are loaded
# from.
#
# For Python modules and resources, we load from memory if they are in
# the standard library and from the filesystem if not. This is because
# parts of Mercurial and some 3rd party packages aren't yet compatible
# with memory loading.
#
# For Python extension modules, we load from the filesystem because
# this yields greatest compatibility.
if type(resource) in ("PythonModuleSource", "PythonPackageResource", "PythonPackageDistributionResource"):
if resource.is_stdlib:
resource.add_location = "in-memory"
else:
resource.add_location = "filesystem-relative:lib"
elif type(resource) == "PythonExtensionModule":
resource.add_location = "filesystem-relative:lib"
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 def make_exe(dist):
Rodrigo Damazio Bovendorp
pyoxidizer: formatting bazel definitions...
r45339 """Builds a Rust-wrapped Mercurial binary."""
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 packaging_policy = dist.make_python_packaging_policy()
Augie Fackler
pyoxidizer: run buildifier...
r46491
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 # Extension may depend on any Python functionality. Include all
# extensions.
packaging_policy.extension_module_filter = "all"
Gregory Szorc
pyoxidizer: update to PyOxidizer 0.9...
r46341 packaging_policy.resources_location = "in-memory"
Augie Fackler
pyoxidizer: default to one-file binary on non-Windows platforms...
r46435 if IS_WINDOWS:
packaging_policy.resources_location_fallback = "filesystem-relative:lib"
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 packaging_policy.register_resource_callback(resource_callback)
Gregory Szorc
pyoxidizer: update to PyOxidizer 0.9...
r46341 config = dist.make_python_interpreter_config()
Gregory Szorc
pyoxidizer: use allocator_backend instead of raw_allocator...
r47975 config.allocator_backend = "default"
Augie Fackler
pyoxidizer: switch to modern config using run_command instead of run_mode...
r46436 config.run_command = RUN_CODE
Augie Fackler
pyoxidizer: run buildifier...
r46491
Gregory Szorc
pyoxidizer: update to PyOxidizer 0.9...
r46341 # We want to let the user load extensions from the file system
config.filesystem_importer = True
Augie Fackler
pyoxidizer: run buildifier...
r46491
Gregory Szorc
pyoxidizer: update to PyOxidizer 0.9...
r46341 # We need this to make resourceutil happy, since it looks for sys.frozen.
config.sys_frozen = True
config.legacy_windows_stdio = True
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128
exe = dist.to_python_executable(
Gregory Szorc
hgcli: customize for Mercurial...
r45129 name = "hg",
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 packaging_policy = packaging_policy,
Gregory Szorc
hgcli: customize for Mercurial...
r45129 config = config,
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128 )
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 # Add Mercurial to resources.
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 exe.add_python_resources(exe.pip_install(["--verbose", ROOT]))
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270
# On Windows, we install extra packages for convenience.
Gregory Szorc
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
r46277 if IS_WINDOWS:
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 exe.add_python_resources(
Matt Harbison
pyoxidizer: point to the py3 requirements instead of py2 on Windows...
r46626 exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]),
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 )
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128
Gregory Szorc
hgcli: customize for Mercurial...
r45129 return exe
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 def make_manifest(dist, exe):
Gregory Szorc
hgcli: customize for Mercurial...
r45129 m = FileManifest()
m.add_python_resource(".", exe)
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 return m
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976
# This adjusts the InstallManifest produced from exe generation to provide
# additional files found in a Windows install layout.
def make_windows_install_layout(manifest):
# Copy various files to new install locations. This can go away once
# we're using the importlib resource reader.
RECURSIVE_COPIES = {
"lib/mercurial/locale/": "locale/",
"lib/mercurial/templates/": "templates/",
}
for (search, replace) in RECURSIVE_COPIES.items():
for path in manifest.paths():
if path.startswith(search):
new_path = path.replace(search, replace)
print("copy %s to %s" % (path, new_path))
file = manifest.get_file(path)
manifest.add_file(file, path = new_path)
# Similar to above, but with filename pattern matching.
# lib/mercurial/helptext/**/*.txt -> helptext/
# lib/mercurial/defaultrc/*.rc -> defaultrc/
for path in manifest.paths():
if path.startswith("lib/mercurial/helptext/") and path.endswith(".txt"):
new_path = path[len("lib/mercurial/"):]
elif path.startswith("lib/mercurial/defaultrc/") and path.endswith(".rc"):
new_path = path[len("lib/mercurial/"):]
else:
continue
print("copying %s to %s" % (path, new_path))
manifest.add_file(manifest.get_file(path), path = new_path)
# We also install a handful of additional files.
EXTRA_CONTRIB_FILES = [
"bash_completion",
"hgweb.fcgi",
"hgweb.wsgi",
"logo-droplets.svg",
"mercurial.el",
"mq.el",
"tcsh_completion",
"tcsh_completion_build.sh",
"xml.rnc",
"zsh_completion",
]
for f in EXTRA_CONTRIB_FILES:
manifest.add_file(FileContent(path = ROOT + "/contrib/" + f), directory = "contrib")
# Individual files with full source to destination path mapping.
EXTRA_FILES = {
"contrib/hgk": "contrib/hgk.tcl",
"contrib/win32/postinstall.txt": "ReleaseNotes.txt",
"contrib/win32/ReadMe.html": "ReadMe.html",
"doc/style.css": "doc/style.css",
"COPYING": "Copying.txt",
}
for source, dest in EXTRA_FILES.items():
print("adding extra file %s" % dest)
manifest.add_file(FileContent(path = ROOT + "/" + source), path = dest)
# And finally some wildcard matches.
manifest.add_manifest(glob(
include = [ROOT + "/contrib/vim/*"],
strip_prefix = ROOT + "/"
))
manifest.add_manifest(glob(
include = [ROOT + "/doc/*.html"],
strip_prefix = ROOT + "/"
))
# But we don't ship hg-ssh on Windows, so exclude its documentation.
manifest.remove("doc/hg-ssh.8.html")
return manifest
def make_msi(manifest):
manifest = make_windows_install_layout(manifest)
if "x86_64" in BUILD_TARGET_TRIPLE:
platform = "x64"
else:
platform = "x86"
manifest.add_file(
FileContent(path = ROOT + "/contrib/packaging/wix/COPYING.rtf"),
path = "COPYING.rtf",
)
manifest.remove("Copying.txt")
manifest.add_file(
FileContent(path = ROOT + "/contrib/win32/mercurial.ini"),
path = "defaultrc/mercurial.rc",
)
manifest.add_file(
FileContent(filename = "editor.rc", content = "[ui]\neditor = notepad\n"),
path = "defaultrc/editor.rc",
)
wix = WiXInstaller("hg", "%s-%s.msi" % (MSI_NAME, VERSION))
# Materialize files in the manifest to the install layout.
wix.add_install_files(manifest)
# From mercurial.wxs.
wix.install_files_root_directory_id = "INSTALLDIR"
# Pull in our custom .wxs files.
defines = {
"PyOxidizer": "1",
"Platform": platform,
"Version": VERSION,
"Comments": "Installs Mercurial version %s" % VERSION,
"PythonVersion": "3",
"MercurialHasLib": "1",
}
if EXTRA_MSI_FEATURES:
defines["MercurialExtraFeatures"] = EXTRA_MSI_FEATURES
wix.add_wxs_file(
ROOT + "/contrib/packaging/wix/mercurial.wxs",
preprocessor_parameters=defines,
)
# Our .wxs references to other files. Pull those into the build environment.
for f in ("defines.wxi", "guids.wxi", "COPYING.rtf"):
wix.add_build_file(f, ROOT + "/contrib/packaging/wix/" + f)
wix.add_build_file("mercurial.ico", ROOT + "/contrib/win32/mercurial.ico")
return wix
Gregory Szorc
pyoxidizer: support code signing...
r47977 def register_code_signers():
if not IS_WINDOWS:
return
if SIGNING_PFX_PATH:
signer = code_signer_from_pfx_file(SIGNING_PFX_PATH, SIGNING_PFX_PASSWORD)
elif SIGNING_SUBJECT_NAME:
signer = code_signer_from_windows_store_subject(SIGNING_SUBJECT_NAME)
else:
signer = None
if signer:
signer.set_time_stamp_server(TIME_STAMP_SERVER_URL)
signer.activate()
register_code_signers()
Gregory Szorc
pyoxidizer: simplify targets...
r47974 register_target("distribution", make_distribution)
register_target("exe", make_exe, depends = ["distribution"])
register_target("app", make_manifest, depends = ["distribution", "exe"], default = True)
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976 register_target("msi", make_msi, depends = ["app"])
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270
Gregory Szorc
hgcli: add stub PyOxidizer project...
r45128 resolve_targets()