This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12260

automation: run hg with python3
ClosedPublic

Authored by indygreg on Mar 2 2022, 10:43 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd953a42b157d: automation: run hg with python3
Summary

Python 2.7 support will go away soon. Let's use Python 3 as part of
the automation.

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.Mar 2 2022, 10:43 AM
Alphare accepted this revision.Mar 3 2022, 5:50 AM
This revision is now accepted and ready to land.Mar 3 2022, 5:50 AM
indygreg added a commit: rHGd953a42b157d: automation: run hg with python3.Mar 3 2022, 6:06 AM
Closed by commit rHGd953a42b157d: automation: run hg with python3 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32444

contrib/automation/hgautomation/linux.py

env = dict(os.environ) env = dict(os.environ)
env['HGPLAIN'] = '1' env['HGPLAIN'] = '1'
env['HGENCODING'] = 'utf-8' env['HGENCODING'] = 'utf-8'
hg_bin = source_path / 'hg' hg_bin = source_path / 'hg'
res = subprocess.run( res = subprocess.run(
['python2.7', str(hg_bin), 'log', '-r', revision, '-T', '{node}'], ['python3', str(hg_bin), 'log', '-r', revision, '-T', '{node}'],
cwd=str(source_path), cwd=str(source_path),
env=env, env=env,
check=True, check=True,
capture_output=True, capture_output=True,
) )
full_revision = res.stdout.decode('ascii') full_revision = res.stdout.decode('ascii')
args = [ args = [
'python2.7', 'python3',
str(hg_bin), str(hg_bin),
'--config', '--config',
'ui.ssh=ssh -F %s' % ssh_config, 'ui.ssh=ssh -F %s' % ssh_config,
'--config', '--config',
'ui.remotecmd=/hgdev/venv-bootstrap/bin/hg', 'ui.remotecmd=/hgdev/venv-bootstrap/bin/hg',
# Also ensure .hgtags changes are present so auto version # Also ensure .hgtags changes are present so auto version
# calculation works. # calculation works.
'push', 'push',

contrib/automation/hgautomation/windows.py

env = dict(os.environ) env = dict(os.environ)
env['HGPLAIN'] = '1' env['HGPLAIN'] = '1'
env['HGENCODING'] = 'utf-8' env['HGENCODING'] = 'utf-8'
hg_bin = hg_repo / 'hg' hg_bin = hg_repo / 'hg'
res = subprocess.run( res = subprocess.run(
['python2.7', str(hg_bin), 'log', '-r', revision, '-T', '{node}'], ['python3', str(hg_bin), 'log', '-r', revision, '-T', '{node}'],
cwd=str(hg_repo), cwd=str(hg_repo),
env=env, env=env,
check=True, check=True,
capture_output=True, capture_output=True,
) )
full_revision = res.stdout.decode('ascii') full_revision = res.stdout.decode('ascii')
args = [ args = [
'python2.7', 'python3',
hg_bin, hg_bin,
'--config', '--config',
'ui.ssh=ssh -F %s' % ssh_config, 'ui.ssh=ssh -F %s' % ssh_config,
'--config', '--config',
'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe', 'ui.remotecmd=c:/hgdev/venv-bootstrap/Scripts/hg.exe',
# Also ensure .hgtags changes are present so auto version # Also ensure .hgtags changes are present so auto version
# calculation works. # calculation works.
'push', 'push',