Mercurial > hg
view setup.py @ 415:c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
If an "hg update" is attempted across branches, it is aborted with an
error message, basically saying that "update -m" is required. Don't
prompt the user for "keep vs delete" kinds of questions before deciding
to abort.
manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE
RF5czx2UQ2pSIP119xzq9mQ=
=Akj6
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:14:11 -0800 |
parents | 8b067bde6679 |
children | 688d03d6997a |
line wrap: on
line source
#!/usr/bin/env python # This is the mercurial setup script. # # './setup.py install', or # './setup.py --help' for more options import glob from distutils.core import setup, Extension from distutils.command.install_data import install_data class install_package_data(install_data): def finalize_options(self): self.set_undefined_options('install', ('install_lib', 'install_dir')) install_data.finalize_options(self) setup(name='mercurial', version='0.5b', author='Matt Mackall', author_email='mpm@selenic.com', url='http://selenic.com/mercurial', description='scalable distributed SCM', license='GNU GPL', packages=['mercurial'], ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']), Extension('mercurial.bdiff', ['mercurial/bdiff.c'])], data_files=[('mercurial/templates', ['templates/map'] + glob.glob('templates/map-*') + glob.glob('templates/*.tmpl'))], cmdclass = { 'install_data' : install_package_data }, scripts=['hg', 'hgmerge'])