This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6991

hg: remove HGUNICODEPEDANTRY and RTUNICODEPEDANTRY
ClosedPublic

Authored by indygreg on Oct 5 2019, 5:03 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5c9c71cde1c9: hg: remove HGUNICODEPEDANTRY and RTUNICODEPEDANTRY
Summary

This was added in 73e4a02e6d23 and 89822d7a9d5f as a preliminary
way to better support Python 3. With the Python 3 port nearly done
and better procedures in place, we shouldn't need it.

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 5 2019, 5:03 PM
indygreg retitled this revision from hg: remove HGUNICODEPEDANTRY to hg: remove HGUNICODEPEDANTRY and RTUNICODEPEDANTRY.Oct 5 2019, 5:39 PM
indygreg edited the summary of this revision. (Show Details)
indygreg updated this revision to Diff 16862.
indygreg set the repository for this revision to rHG Mercurial.Oct 6 2019, 10:41 AM
pulkit accepted this revision.Oct 6 2019, 10:44 AM
This revision is now accepted and ready to land.Oct 6 2019, 10:44 AM
indygreg added a commit: rHG5c9c71cde1c9: hg: remove HGUNICODEPEDANTRY and RTUNICODEPEDANTRY.Oct 6 2019, 11:06 AM
Closed by commit rHG5c9c71cde1c9: hg: remove HGUNICODEPEDANTRY and RTUNICODEPEDANTRY (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhg (7 lines)
Mrust/hgcli/src/main.rs (14 lines)
Mtests/run-tests.py (7 lines)

Diff 16895

hg

#!/usr/bin/env python #!/usr/bin/env python
# #
# mercurial - scalable distributed SCM # mercurial - scalable distributed SCM
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import sys import sys
if os.environ.get('HGUNICODEPEDANTRY', False):
try:
reload(sys)
sys.setdefaultencoding("undefined")
except NameError:
pass
libdir = '@LIBDIR@' libdir = '@LIBDIR@'
if libdir != '@' 'LIBDIR' '@': if libdir != '@' 'LIBDIR' '@':
if not os.path.isabs(libdir): if not os.path.isabs(libdir):
libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
libdir) libdir)
libdir = os.path.abspath(libdir) libdir = os.path.abspath(libdir)
sys.path.insert(0, libdir) sys.path.insert(0, libdir)

rust/hgcli/src/main.rs

fn set_python_home(env: &Environment) { fn set_python_home(env: &Environment) {
let raw = cstring_from_os(&env.python_home).into_raw(); let raw = cstring_from_os(&env.python_home).into_raw();
unsafe { unsafe {
python27_sys::Py_SetPythonHome(raw); python27_sys::Py_SetPythonHome(raw);
} }
} }
fn update_encoding(_py: Python, _sys_mod: &PyModule) {
// Call sys.setdefaultencoding("undefined") if HGUNICODEPEDANTRY is set.
let pedantry = env::var("HGUNICODEPEDANTRY").is_ok();
if pedantry {
// site.py removes the sys.setdefaultencoding attribute. So we need
// to reload the module to get a handle on it. This is a lesser
// used feature and we'll support this later.
// TODO support this
panic!("HGUNICODEPEDANTRY is not yet supported");
}
}
fn update_modules_path(env: &Environment, py: Python, sys_mod: &PyModule) { fn update_modules_path(env: &Environment, py: Python, sys_mod: &PyModule) {
let sys_path = sys_mod.get(py, "path").unwrap(); let sys_path = sys_mod.get(py, "path").unwrap();
sys_path sys_path
.call_method(py, "insert", (0, env.mercurial_modules.to_str()), None) .call_method(py, "insert", (0, env.mercurial_modules.to_str()), None)
.expect("failed to update sys.path to location of Mercurial modules"); .expect("failed to update sys.path to location of Mercurial modules");
} }
fn run() -> Result<(), i32> { fn run() -> Result<(), i32> {
} }
result result
} }
fn run_py(env: &Environment, py: Python) -> PyResult<()> { fn run_py(env: &Environment, py: Python) -> PyResult<()> {
let sys_mod = py.import("sys").unwrap(); let sys_mod = py.import("sys").unwrap();
update_encoding(py, &sys_mod);
update_modules_path(&env, py, &sys_mod); update_modules_path(&env, py, &sys_mod);
// TODO consider a better error message on failure to import. // TODO consider a better error message on failure to import.
let demand_mod = py.import("hgdemandimport")?; let demand_mod = py.import("hgdemandimport")?;
demand_mod.call(py, "enable", NoArgs, None)?; demand_mod.call(py, "enable", NoArgs, None)?;
let dispatch_mod = py.import("mercurial.dispatch")?; let dispatch_mod = py.import("mercurial.dispatch")?;
dispatch_mod.call(py, "run", NoArgs, None)?; dispatch_mod.call(py, "run", NoArgs, None)?;

tests/run-tests.py

try: try:
import shlex import shlex
shellquote = shlex.quote shellquote = shlex.quote
except (ImportError, AttributeError): except (ImportError, AttributeError):
import pipes import pipes
shellquote = pipes.quote shellquote = pipes.quote
if os.environ.get('RTUNICODEPEDANTRY', False):
try:
reload(sys)
sys.setdefaultencoding("undefined")
except NameError:
pass
processlock = threading.Lock() processlock = threading.Lock()
pygmentspresent = False pygmentspresent = False
# ANSI color is unsupported prior to Windows 10 # ANSI color is unsupported prior to Windows 10
if os.name != 'nt': if os.name != 'nt':
try: # is pygments installed try: # is pygments installed
import pygments import pygments
import pygments.lexers as lexers import pygments.lexers as lexers