Mercurial > evolve
annotate 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 |
rev | line source |
---|---|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 import hghave |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 @hghave.check("docgraph-ext", "Extension to generate graph from repository") |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 def docgraph(): |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 try: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 import hgext.docgraph |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 hgext.docgraph.cmdtable # trigger import |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 except ImportError: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 try: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 import hgext3rd.docgraph |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 hgext3rd.docgraph.cmdtable # trigger import |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 except ImportError: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 return False |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 return True |
5338
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
15 |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
16 @hghave.check("flake8", "Flake8 python linter") |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
17 def has_flake8(): |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
18 try: |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
19 import flake8 |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
20 |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
21 flake8.__version__ |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
22 except ImportError: |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
23 return False |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
24 else: |
6a50faea786d
tests: use hghaveaddon.py to check for flake8
Anton Shestakov <av6@dwimlabs.net>
parents:
2959
diff
changeset
|
25 return True |
5339
f2139537c2be
tests: use hghaveaddon.py to check for check-manifest
Anton Shestakov <av6@dwimlabs.net>
parents:
5338
diff
changeset
|
26 |
f2139537c2be
tests: use hghaveaddon.py to check for check-manifest
Anton Shestakov <av6@dwimlabs.net>
parents:
5338
diff
changeset
|
27 @hghave.check("check-manifest", "check-manifest MANIFEST.in checking tool") |
f2139537c2be
tests: use hghaveaddon.py to check for check-manifest
Anton Shestakov <av6@dwimlabs.net>
parents:
5338
diff
changeset
|
28 def has_check_manifest(): |
f2139537c2be
tests: use hghaveaddon.py to check for check-manifest
Anton Shestakov <av6@dwimlabs.net>
parents:
5338
diff
changeset
|
29 return hghave.matchoutput('check-manifest --version 2>&1', |
f2139537c2be
tests: use hghaveaddon.py to check for check-manifest
Anton Shestakov <av6@dwimlabs.net>
parents:
5338
diff
changeset
|
30 br'check-manifest version') |