HomePhabricator

merge: with stable

Authored by durin42.

Description

merge: with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
448aff4e8dd4yuja
dirstate: fix leak of entry object in dirstate_item_from_v1_data() 
Sep 23
13efd8fdc55fyuja
dirstate: fix parse_dirstate() to error out if NULL entry created 
Sep 23
1b2ee68e85f9D11465SimonSapin
rust: Remove EntryState::Unknown 
Sep 20
631f6b445a77D11464SimonSapin
dirstate: Remove the `state == ' '` special case 
Sep 20
cedfe2606adfD11463SimonSapin
debugsate: Change debug_iter() to yield tuples instead of DirstateItem 
Sep 20
357307feaf61D11462SimonSapin
debugstate: Always call dirstatemap.debug_iter() 
Sep 20
f2a9db29cb2dD11461SimonSapin
rust: Make the fields of DirstateEntry private 
Sep 17
627cd8f33db0D11460SimonSapin
rust: Remove support for passing a dict to the Rust pathutil.dirs() 
Sep 20
1194394510baD11459SimonSapin
rust: Remove the `rustext.parsers` module 
Sep 20
a83e24c3af6bD11458SimonSapin
dirstate: remove now-unused .directories() method 
Sep 17
08efe5945d2bD11457SimonSapin
rust: Move DirstateEntry to its own module 
Sep 17
5caec48d9a01D11476mharbison72
extensions: prevent a crash on py3 with a `minimumhgversion` str value 
Sep 20
a9bedc56f025D11475mharbison72
extensions: prevent a crash on py3 when testing a bad extension minimum 
Sep 20
0dc4cc654d96D11474mharbison72
typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes 
Sep 20
376d08ae904fD11473mharbison72
util: eliminate the possibility of returning None from `versiontuple()` 
Sep 20
406a7e629946D11472mharbison72
archival: force a `CompressionError` to bytes before passing to `error.Abort` 
Sep 20
8655a77dce94D11471mharbison72
parser: force a `ValueError` to bytes before passing to `error.ParseError` 
Sep 20
ae79611e3115D11470mharbison72
util: avoid a name-error warning in the `mmapread` exception handler 
Sep 20
94d4a3f78e99D11469mharbison72
typing: suppress an name-error warning in `mercurial/windows.py` 
Sep 20
c0588d389c5fD11468mharbison72
typing: suppress an import-error warning in `mercurial/utils/resourceutil.py` 
Sep 20
28c62f83b652D11467mharbison72
encoding: force a few Errors to bytes before passing to `error.Abort` 
Sep 20
1fda8c9358ceD11466mharbison72
typing: add a fake `__init__()` to bytestr to distract pytype 
Sep 21
b642a6298ce0durin42
merge: with stable 
Sep 20
5e7eea915019D11443marmoute
dirstate: drop the `dirstatemap.dropfile` method 
Sep 15
44fc75bd1580D11442marmoute
dirstate: use `reset_state` instead of `dropfile` in test-rebuildstate.t 
Sep 16
af84aa1a66f1D11441marmoute
dirstate: use `reset_state` instead of `dropfile` in largefile 
Sep 16
1370d695c258D11440marmoute
dirstate: use `reset_state` in `rebuild` instead of `dropfile` 
Sep 15
bac82c2ce858D11439marmoute
dirstate: use `reset_state` to drop file in `update_file_p1` 
Sep 15
938a7769050cD11438marmoute
dirstate: support file tracked nowhere in `reset_state` 
Sep 15
70547a7d5930D11437marmoute
dirstate: drop dirstatemap.addfile 
Sep 15
aa442fde0ea5D11436marmoute
dirstate: update the documentation of the dirstatemap API 
Sep 15
e7d0a511965cD11435marmoute
dirstate: drop the `_addpath` method 
Sep 15
ccb9cc47b7b6D11434marmoute
dirstate: remove the `normallookup` function 
Sep 15
eb1f8d6e9419D11433marmoute
dirstate: stop using `_normallookup` in the adddrop extension 
Sep 16
14fa2e583422D11432marmoute
dirstate: replace the use of `_normallookup` in `rebuild` 
Sep 15
625b84c1abddD11431marmoute
dirstate: replace the use of _normallookup in `setparents` 
Sep 15
0d2a404f1932D11430marmoute
dirstate: introduce a set_tracked method on "map" and "item" 
Sep 15
87b3010c08e0D11429marmoute
dirstate: fix restoration of "merged" state after a remove 
Sep 15
d459c6b84961D11428marmoute
dirstate: inline the last two `_drop` usage 
Sep 15
dd267f16042fD11427marmoute
dirstate: make a conditionnal easier to read in `setparents` 
Sep 15
72b80a0124f8D11426marmoute
dirstate: removed the now unused `_add` method 
Sep 15
7e65ca30fb91D11425marmoute
dirstate: replace `_add` call in `setparent` 
Sep 15
6255a0d33c45D11424marmoute
dirstate: directly call the right function in `set_tracked` 
Sep 15
ffde999a3ea9D11423marmoute
dirstate: same logic as what we did for `_drop` 
Sep 15
36c0d738c330D11422marmoute
dirstate: use `tracked` property in `_addpath` 
Sep 15
d1d9510f73f0D11446SimonSapin
rust: Update the memmap2 crate to version 0.4.0 
Sep 17
2018753014beD11445martinvonz
dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()` 
Sep 16
ec178161a8d1D11444martinvonz
dirstate: make dirstate flags char be unsigned 
Sep 16
4e6f27230aeeD11421marmoute
dirstate: introduce a `set_clean` method on dirstate's map and items 
Sep 1
2e0ff3947b05D11420marmoute
dirstate: extract the logic to check file/dirname collision when adding a file 
Sep 1