This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12482

setup: fix incomplete implementation of Command
ClosedPublic

Authored by Alphare on Apr 7 2022, 9:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb6f535f3beda: setup: fix incomplete implementation of Command
rHG9f88ade6168e: setup: fix incomplete implementation of Command
Summary

test-install.t fails without the get_outputs method being implemented,
which is used when, self.report is True.

When 8d7eaff92f9c introduced this change, they probably ran test-install.t
without HGTESTS_ALLOW_NETIO=1, which does not trigger this codepath.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Apr 7 2022, 9:29 AM

Pending CI refresh

Alphare added a commit: rHG9f88ade6168e: setup: fix incomplete implementation of Command.Apr 7 2022, 10:52 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9f88ade6168e: setup: fix incomplete implementation of Command (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (11 lines)

Diff 32863

setup.py

fp.write(data) fp.write(data)
class hginstallcompletion(Command): class hginstallcompletion(Command):
description = 'Install shell completion' description = 'Install shell completion'
def initialize_options(self): def initialize_options(self):
self.install_dir = None self.install_dir = None
self.outputs = []
def finalize_options(self): def finalize_options(self):
self.set_undefined_options( self.set_undefined_options(
'install_data', ('install_dir', 'install_dir') 'install_data', ('install_dir', 'install_dir')
) )
def get_outputs(self):
return self.outputs
def run(self): def run(self):
for src, dir_path, dest in ( for src, dir_path, dest in (
( (
'bash_completion', 'bash_completion',
('share', 'bash-completion', 'completions'), ('share', 'bash-completion', 'completions'),
'hg', 'hg',
), ),
('zsh_completion', ('share', 'zsh', 'site-functions'), '_hg'), ('zsh_completion', ('share', 'zsh', 'site-functions'), '_hg'),
): ):
dir = os.path.join(self.install_dir, *dir_path) dir = os.path.join(self.install_dir, *dir_path)
self.mkpath(dir) self.mkpath(dir)
self.copy_file(
os.path.join('contrib', src), os.path.join(dir, dest) dest = os.path.join(dir, dest)
) self.outputs.append(dest)
self.copy_file(os.path.join('contrib', src), dest)
# virtualenv installs custom distutils/__init__.py and # virtualenv installs custom distutils/__init__.py and
# distutils/distutils.cfg files which essentially proxy back to the # distutils/distutils.cfg files which essentially proxy back to the
# "real" distutils in the main Python install. The presence of this # "real" distutils in the main Python install. The presence of this
# directory causes py2exe to pick up the "hacked" distutils package # directory causes py2exe to pick up the "hacked" distutils package
# from the virtualenv and "import distutils" will fail from the py2exe # from the virtualenv and "import distutils" will fail from the py2exe
# build because the "real" distutils files can't be located. # build because the "real" distutils files can't be located.