D9290: pyoxidizer: switch to modern config using run_command instead of run_mode
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9290 AFFECTED FILES rust/hgcli/pyoxidizer.bzl CHANGE DETAILS diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl --- a/rust/hgcli/pyoxidizer.bzl +++ b/rust/hgcli/pyoxidizer.bzl @@ -49,7 +49,7 @@ config = dist.make_python_interpreter_config() config.raw_allocator = "system" -config.run_mode = "eval:%s" % RUN_CODE +config.run_command = RUN_CODE # We want to let the user load extensions from the file system config.filesystem_importer = True # We need this to make resourceutil happy, since it looks for sys.frozen. To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9289: pyoxidizer: default to one-file binary on non-Windows platforms
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Windows has some extra constraints that require a multi-file install, but we expect folks to use an MSI or similar installer there so it's less of a big deal. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9289 AFFECTED FILES rust/hgcli/pyoxidizer.bzl CHANGE DETAILS diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl --- a/rust/hgcli/pyoxidizer.bzl +++ b/rust/hgcli/pyoxidizer.bzl @@ -14,6 +14,9 @@ return default_python_distribution(flavor = "standalone_dynamic") def resource_callback(policy, resource): +if not IS_WINDOWS: +resource.add_location = "in-memory" +return # We use a custom resource routing policy to influence where things are loaded # from. # @@ -40,7 +43,8 @@ # extensions. packaging_policy.extension_module_filter = "all" packaging_policy.resources_location = "in-memory" -packaging_policy.resources_location_fallback = "filesystem-relative:lib" +if IS_WINDOWS: +packaging_policy.resources_location_fallback = "filesystem-relative:lib" packaging_policy.register_resource_callback(resource_callback) config = dist.make_python_interpreter_config() To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9291: make: add a pyoxidizer target
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9291
AFFECTED FILES
Makefile
CHANGE DETAILS
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@
PYTHON?=python3
endif
+PYOXIDIZER?=pyoxidizer
+
$(eval HGROOT := $(shell pwd))
HGPYTHONS ?= $(HGROOT)/build/pythons
PURE=
@@ -259,9 +261,12 @@
--resources contrib/packaging/macosx/ \
"$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg
+pyoxidizer:
+ $(PYOXIDIZER) build --path ./rust/hgcli --release
+
.PHONY: help all local build doc cleanbutpackages clean install install-bin \
install-doc install-home install-home-bin install-home-doc \
dist dist-notests check tests rust-tests check-code format-c \
- update-pot \
+ update-pot pyoxidizer \
$(packaging_targets) \
osx
To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6431] New: From 3.7.3 on Ubuntu Xenial to 5.6 on Bionic, terminal colour seqs do not work
https://bz.mercurial-scm.org/show_bug.cgi?id=6431 Bug ID: 6431 Summary: From 3.7.3 on Ubuntu Xenial to 5.6 on Bionic, terminal colour seqs do not work Product: Mercurial Version: stable branch Hardware: Macintosh OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: color Assignee: bugzi...@mercurial-scm.org Reporter: peter.b.w...@gmail.com CC: mercurial-devel@mercurial-scm.org Python Version: --- Hg uses ANSI colour sequences to pretty-print output. These used to work on Xenial. Since upgrading to Bionic, they are no longer working. I see the escape sequence character string instead of a change of colour. I upgraded the Xenial version to 5.6 and had the same problem. Writing the sequence direct to the terminal works as expected. -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
