HomePhabricator

merge with stable

Authored by martinvonz.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
69ae64637be5Manuel Jacob
tests: use native string type for parsed hghave log lines 
Mar 9 2020
408a4eb41453Manuel Jacob
tests: avoid implicit bytes -> unicode -> bytes roundtrip on Python 2 
Mar 6 2020
9db11679f8acmarmoute
cext: make HgRevlogIndex_GetParents private again 
Mar 8 2020
79ac59d3f73dmarmoute
setup-rust: remove the legacy 'direct-ffi' variant 
Mar 6 2020
75ada5fe9b62D8162marmoute
hghave: add a `rust` keyword to detect the use of compiled rust code 
Feb 18 2020
23df5ecfa365D8180marmoute
nodemap: check that a simple lookup works fine 
Feb 28 2020
295417387769D8248Alphare
debuginstall: print if Rust extensions are installed 
Mar 6 2020
6aee0647e026D8254durin42
nodemap: fix missing r-prefix on regular expression 
Mar 6 2020
e397c6d74652Manuel Jacob
tests: use pyflakes module instead of pyflakes executable 
Mar 6 2020
18ac32d2802fManuel Jacob
tests: use native string type for parsed hghave log lines 
Mar 9 2020
cc85b2c88969Manuel Jacob
tests: avoid implicit bytes -> unicode -> bytes roundtrip on Python 2 
Mar 6 2020
b4fe3395b975marmoute
cext: make HgRevlogIndex_GetParents private again 
Mar 8 2020
02e9ee14f227marmoute
setup-rust: remove the legacy 'direct-ffi' variant 
Mar 6 2020
827a5e9d6174D8162marmoute
hghave: add a `rust` keyword to detect the use of compiled rust code 
Feb 18 2020
07a67cb37bdcD8180marmoute
nodemap: check that a simple lookup works fine 
Feb 28 2020
4d27d297af07D8266durin42
localrepo: add git extension to autoextensions list 
Mar 7 2020
5db5cfa2cab3D8264durin42
gitlog: implement __iter__ on changelog 
Mar 7 2020
ce0cad6c069fD8263durin42
gitlog: fix embarassing bug that prevented log from showing correct parents 
Mar 7 2020
4f5b730365e7D8262durin42
git: add readfast() method to manifest 
Mar 7 2020
bf7d15b1ad2fD8248Alphare
debuginstall: print if Rust extensions are installed 
Mar 6 2020
6d4f6c2f7f18D8254durin42
nodemap: fix missing r-prefix on regular expression 
Mar 6 2020
6267f7175093Manuel Jacob
tests: use native string type for parsed hghave log lines 
Mar 9 2020
c0c8183a0d9fManuel Jacob
tests: avoid implicit bytes -> unicode -> bytes roundtrip on Python 2 
Mar 6 2020
251d668eaf04marmoute
cext: make HgRevlogIndex_GetParents private again 
Mar 8 2020
10e2ac217348marmoute
setup-rust: remove the legacy 'direct-ffi' variant 
Mar 6 2020
d4689494c436D8162marmoute
hghave: add a `rust` keyword to detect the use of compiled rust code 
Feb 18 2020
b4e098628646D8180marmoute
nodemap: check that a simple lookup works fine 
Feb 28 2020
8407f8678a77D8266durin42
localrepo: add git extension to autoextensions list 
Mar 7 2020
3e5293769f22D8264durin42
gitlog: implement __iter__ on changelog 
Mar 7 2020
559e31eabc3dD8263durin42
gitlog: fix embarassing bug that prevented log from showing correct parents 
Mar 7 2020
ff465d38cf45D8262durin42
git: add readfast() method to manifest 
Mar 7 2020
69935d41ada4D8248Alphare
debuginstall: print if Rust extensions are installed 
Mar 6 2020
50b570f04abbD8254durin42
nodemap: fix missing r-prefix on regular expression 
Mar 6 2020
bd539f0a3771D8256martinvonz
git: make {shortest()} return shortest *unique* prefix 
Mar 6 2020
2b5c4788d7f0Manuel Jacob
tests: use pyflakes module instead of pyflakes executable 
Mar 6 2020
7e69ff5789c7D6734durin42
git: skeleton of a new extension to _directly_ operate on git repos 
Feb 11 2020
c8fd21413458D8242marmoute
copies-tests: add a case where with merge with an overwritten files 
Mar 3 2020
6f1f4a6f4168D8241marmoute
copies-tests: add a case where a file is deleted/added but with a merge 
Mar 3 2020
890def17d03bD8240marmoute
copies-tests: add a test with a rename overwriting another file 
Mar 3 2020
902b559202a6D8239marmoute
copies-tests: add a `h` to the root commit (for chain merge tests) 
Feb 29 2020
7f5735639360D8257marmoute
copies-tests: remove the final summary 
Mar 6 2020
275365d85e3fD8238marmoute
copies-tests: clarify the description of the EA/AE cases 
Mar 3 2020
b8882f5d7cb4D8237marmoute
copies-tests: update the analysis of the BD/DB cases 
Mar 3 2020
68e14fecd82aD8247marmoute
copies-tests: swap two branch description 
Mar 6 2020
62165f6c5a1aD6734durin42
git: skeleton of a new extension to _directly_ operate on git repos 
Feb 11 2020
9d2b2df2c2baD8255durin42
cleanup: run pyupgrade on our source tree to clean up varying things 
Mar 6 2020
ff72bd52d56aManuel Jacob
tests: avoid implicit conversion of str to unicode 
Mar 6 2020
55c443fcb4fcManuel Jacob
tests: rename _bytespath() to _sys2bytes() and _strpath() to _sys2str() 
Mar 6 2020
fc70291f3d24Manuel Jacob
tests: avoid implicit conversion of str to unicode 
Mar 5 2020
109322cd322aManuel Jacob
tests: avoid implicit conversion of str to unicode 
Mar 5 2020