HomePhabricator

merge with stable

Authored by yuja.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
f330d6117a5bD8604valentin.gatienbaron
relnotes: advertize the possibility to use rust 
May 30
7ca1d635e4a6D8603valentin.gatienbaron
rust: add a pointer for profiling to the README 
May 30
69d3ce00df99D8602valentin.gatienbaron
rust: update the mention of hgcli in rust/README.rst 
May 30
24d440e2fdbbmjacob
sslutil: fix comment to use inclusive or instead of exclusive or 
Jun 1
53b3baaadb64mjacob
sslutil: propagate return value ssl.PROTOCOL_SSLv23 from protocolsettings() 
Jun 1
38e3df9ff1e7mjacob
sslutil: stop storing protocol and options for SSLContext in settings dict 
Jun 1
4ca1110991c4mjacob
sslutil: rename 'minimumprotocolui' -> 'minimumprotocol' 
Jun 1
d61c05450b37mjacob
sslutil: properly detect which TLS versions are supported by the ssl module 
May 31
941fef7523c7mjacob
sslutil: remove dead code (that failed if only TLS 1.0 is available) 
May 31
4dcb2791beabmjacob
config: remove unused hostsecurity.disabletls10warning config 
May 30
5921dc0d5c3amjacob
sslutil: remove dead code (that downgraded default minimum TLS version) 
May 31
39c598f1c774mjacob
sslutil: remove comment referring to unsupported legacy stacks 
May 29
95c832849955mjacob
setup: require that Python has TLS 1.1 or TLS 1.2 
May 30
dd7c4a208a4emjacob
sslutil: check for OpenSSL without TLS 1.0 support in one case 
May 31
abcd6db1f2ccmjacob
sslutil: don't set minimum TLS version to 1.0 if 1.2 but not 1.1 is available 
May 31
4942c1bdd080mjacob
sslutil: add FIXME about supportedprotocols possibly containing too many items 
May 31
ceb7318013d5mjacob
sslutil: fix names of variables containing minimum protocol strings 
May 31
95903a8d8c97mjacob
sslutil: stop returning argument as third return value of protocolsettings() 
May 31
61cdc8137d53mjacob
relnotes: note that we now require modern SSL/TLS features in Python 
May 30
1409da2148c8mjacob
tests: stop checking for optional, now impossible output 
May 30
1537ce87e3baD8601valentin.gatienbaron
rust: remove one more occurrence of re2 
May 30
d044b66d8429D8600valentin.gatienbaron
scmutil: clarify getuipathfn comment 
May 26
94f227baa76fD8590durin42
githelp: add some minimal help for pickaxe functionality 
May 28
be3e85cf8f4dD8456Alphare
rust: remove duplicate import 
Apr 17
89f83e47e9c9mjacob
tests: remove "sslcontext" check 
May 29
7dd63a8cb1eemjacob
sslutil: eliminate `_canloaddefaultcerts` by constant-folding code using it 
May 29
ab5348bbc55emjacob
tests: remove "defaultcacerts" check 
May 29
035199ba04eemjacob
sslutil: eliminate `modernssl` by constant-folding code using it 
May 29
86a7b7abf28emjacob
hgweb: avoid using `sslutil.modernssl` 
May 29
dca2629f6d2emjacob
sslutil: remove comments referring to removed SSLContext emulation class 
May 29
7c19eb372438mjacob
sslutil: remove code checking for presence of ssl.SSLContext 
May 29
4c53c12b92d5mjacob
setup: require a Python version with modern SSL features 
May 29
47b3c8383cc1mjacob
sslutil: set `_canloaddefaultcerts` to `True` if `ssl.SSLContext` is present 
May 29
aa790f7c967aD8592durin42
filemerge: add __bytes__ for absentfilectx 
May 28
17d928f8abafD8591durin42
mergestate: move staticmethod _filectxorabsent to module level 
May 28
9f96beb9bafeD8594Alphare
rust: remove support for `re2` 
May 29
4313a0d7540dD8593Alphare
rust-dependencies: update `regex` to 1.3.9 
May 29
3aed7d262bdfmjacob
cleanup: remove compatibility code for Python < 2.7.4 
May 28
8e8fd938ca07mjacob
cleanup: eliminate procutil.quotecommand() 
May 28
5258bffdb1d6mjacob
cleanup: remove compatibility code for Python < 2.7.1 
May 28
233ee525dcefD8582valentin.gatienbaron
grep: reduce the cost of pathauditor checks when grepping working copy 
May 25
06105aa8bc0eD8581valentin.gatienbaron
grep: test that paths get audited 
May 25
3db660b8eba6D8580valentin.gatienbaron
grep: add test coverage of behavior on symlinks 
May 25
5fe8f02ced6dD8576aayjaychan
help: fix description of revlog version 2 
May 22
065421e12248D8586valentin.gatienbaron
files: speed up `hg files` when no flags change display 
May 26
5d77f571a563D8584valentin.gatienbaron
sshpeer: make client print (likely) server errors on stderr (BC) 
May 25
15e26cc0e2c6D8583valentin.gatienbaron
sshpeer: add test showing that -q silences remote errors 
May 25
5d8ae9248a70D8585valentin.gatienbaron
scmutil: speed up relativization of paths when it's a no-op 
May 26
e607099d8b93D8551durin42
context: implement mergestate() method 
May 18
b7808443ed6aD8550durin42
mergestate: split out merge state handling code from main merge module 
May 18