##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972
Gregory Szorc - - Load All Authors

File last commit:

r46284:9934920a default
r49404:c9141848 default
Show More
linux-requirements.txt.in
17 lines | 622 B | text/plain | TextLexer
/ contrib / automation / linux-requirements.txt.in
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
automation: install black...
 r43718 # black pulls in typed-ast, which doesn't install on PyPy.
Gregory Szorc
automation: upgrade packages in Linux environment...
 r46284 black==19.10b0 ; python_version >= '3.6' and platform_python_implementation != 'PyPy'
Gregory Szorc
automation: initial support for running Linux tests...
 r42471 # Bazaar doesn't work with Python 3 nor PyPy.
bzr ; python_version <= '2.7' and platform_python_implementation == 'CPython'
docutils
fuzzywuzzy
Gregory Szorc
automation: upgrade packages in Linux environment...
 r46284 # isort 5.0 drops support for Python 3.5. We can remove this line when we
# drop support for 3.5.
isort < 5.0
Gregory Szorc
automation: initial support for running Linux tests...
 r42471 pyflakes
pygments
pylint
# Needed to avoid warnings from fuzzywuzzy.
python-Levenshtein
# typed-ast dependency doesn't install on PyPy.
typed-ast ; python_version >= '3.0' and platform_python_implementation != 'PyPy'
vcrpy