Mercurial > evolve
view tests/hghaveaddon.py @ 5601:3946ee4ee3ae
topic: add a `exp….topic.linear-merge` option to allow some oedipus
If this option is set to `from-branch`, a user can call `hg merge some-topic`
from a bare branch even if `some-topic` is a direct descendant of the current
working copy parents. This was previously denied if the changesets was on the
same branch, since the result would be an "oedipus merge".
Some user have been requesting this, and this type of merge is one of Gitlab
standard way of merging a "Merge Request". That new option will unlock issue
`heptapod#200` and make this mode available for those who wants it.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 14 Oct 2020 15:48:37 +0200 |
parents | f2139537c2be |
children | e41b99cec0c2 |
line wrap: on
line source
import hghave @hghave.check("docgraph-ext", "Extension to generate graph from repository") def docgraph(): try: import hgext.docgraph hgext.docgraph.cmdtable # trigger import except ImportError: try: import hgext3rd.docgraph hgext3rd.docgraph.cmdtable # trigger import except ImportError: return False return True @hghave.check("flake8", "Flake8 python linter") def has_flake8(): try: import flake8 flake8.__version__ except ImportError: return False else: return True @hghave.check("check-manifest", "check-manifest MANIFEST.in checking tool") def has_check_manifest(): return hghave.matchoutput('check-manifest --version 2>&1', br'check-manifest version')