Mercurial > evolve
view setup.py @ 4241:df22f010cf24
next: make next command --evolve by default
Before this patch, if we need to evolve to update to the next child,
we were suggesting the user to use --evolve flag. This patch make some
changes to evolve by default in that conditions.
After making next command to evolve by default we have to consider
the following points:
1) If we don't need to evolve while updating to the next child:
a) And if wdir is dirty, we suggest to use --merge flag
b) if wdir is clean, we simply update to next child (if ambiguous,
prompt the user to select one)
2) If we need to evolve:
a) when wdir is dirty, we suggest the user to use `hg shelve` first,
to make wdir clean. As we don't support --merge while evovling.
b) when wdir is clean, we evolve the next cset.
Changes made in test-prev-next.t reflect the changed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 10 Nov 2018 15:50:05 +0100 |
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 )