Mercurial > evolve
view setup.py @ 4721:b69497b23d31
touch: make sure merge commits include files from p1 and p2
Otherwise touching a merge commit makes it lose all changes.
This fix populates `updates` argument of rewriteutil.rewrite() with parent
changesets. That argument is normally used for folding multiple changesets, but
in this case it's simply used to include files from p1 and p2. Usually,
rewrite() works fine using ctx.files(), but that function can return an empty
list when ctx is a merge commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 10 Jul 2019 18:16:38 +0800 |
parents | efac9aad0963 |
children | 9f2e480ad786 |
line wrap: on
line source
import os from distutils.core import setup from os.path import dirname, join META_PATH = 'hgext3rd/evolve/metadata.py' def get_metadata(): meta = {} fullpath = join(dirname(__file__), META_PATH) execfile(fullpath, meta) return meta def get_version(): '''Read version info from a file without importing it''' return get_metadata()['__version__'] def min_hg_version(): '''Read version info from a file without importing it''' return get_metadata()['minimumhgversion'] py_modules = [ 'hgext3rd.serverminitopic', ] py_packages = [ 'hgext3rd', 'hgext3rd.evolve', 'hgext3rd.evolve.thirdparty', 'hgext3rd.topic', ] if os.environ.get('INCLUDE_INHIBIT'): py_modules.append('hgext3rd.evolve.hack.inhibit') py_modules.append('hgext3rd.evolve.hack.directaccess') setup( name='hg-evolve', version=get_version(), author='Pierre-Yves David', author_email='pierre-yves.david@ens-lyon.org', maintainer='Pierre-Yves David', maintainer_email='pierre-yves.david@ens-lyon.org', url='https://www.mercurial-scm.org/doc/evolution/', description='Flexible evolution of Mercurial history.', long_description=open('README').read(), keywords='hg mercurial', license='GPLv2+', py_modules=py_modules, packages=py_packages )