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
7a4d187479b6D11725Alphare
windows: use raw string in test log paths 
Oct 22 2021
aad84024660fD11730marmoute
pull: make the new argument a keyword argument 
Oct 29 2021
500260410bb8D11729marmoute
dirstate: make sure that status does not overlook the fallback flags 
Oct 28 2021
91f07430db8cD11728marmoute
dirstate: use a single closure for get_flags 
Oct 28 2021
4216f5561c3bdurin42
merge: with stable 
Oct 26 2021
9de0823705b4D11719mharbison72
typing: add more type hints to the errors module 
Oct 23 2021
ebac18733142D11718mharbison72
typing: add a few assertions to revlog.py to help pytype 
Oct 23 2021
0d6a099bba58D11715Alphare
dirstate: group return logic and clarify each function in flagfunc 
Oct 21 2021
8f54d9c79b12D11713Alphare
dirstate: add missing return on platforms without exec or symlink 
Oct 20 2021
126feb805247D11712Alphare
parsers: don't ask about symlinks on platforms that don't support them 
Oct 20 2021
249d1888e9d8D11711Alphare
parsers: don't ask about the exec bit on platforms that don't have it 
Oct 20 2021
fd3d4b7f8e62D11714spectral
tests: fix test-convert-git to work w/ "git pull" requiring strategy 
Oct 19 2021
96aa3a68d3b5Alphare
branching: merge stable into default 
Oct 21 2021
d86908050375markand
hg: remove reserved identifiers 
Oct 21 2021
cc9acd2c6fd0D11690Alphare
python: compatibility for python 3.11 (issue6604) 
Oct 19 2021
e95fd116c968D11710Alphare
pyoxidizer: force pip to not use pep517 in order to be able to install hg 
Oct 20 2021
f2694f9d90dcD11710Alphare
pyoxidizer: force pip to not use pep517 in order to still be able to install hg 
Oct 20 2021
16c3fe46929aD11698spectral
pyoxidizer: update README.md with several small fixes 
Oct 18 2021
c900d962e38bD11697spectral
pyoxidizer: disable using in-memory resources 
Oct 18 2021
749946b6a641D11704marmoute
dirstate-v2: reorder flag to group related one together 
Oct 19 2021
3861e3f6ad54D11695marmoute
dirstate-v2: read the fallback value in Rust 
Oct 19 2021
bb240915f69fD11694marmoute
dirstate-v2: adjust the meaning of directory flags 
Oct 19 2021
83d0bd45b662D11702SimonSapin
dirstate-v2: actually use sub-second mtime precision 
Oct 13 2021
68bb472aee9cD11701SimonSapin
dirstate: ignore sub-second component when either is zero in mtime 
Oct 14 2021
9205d9be8b41D11700marmoute
dirstate-v2: add a new MTIME_SECOND_AMBIGUOUS flags 
Oct 19 2021
269ff8978086D11684SimonSapin
dirstate: store mtimes with nanosecond precision in memory 
Oct 18 2021
84f6b0c41b90D11696SimonSapin
rust: remove now-unused DirstateEntry::clear_ambiguous_mtime method 
Oct 19 2021
c591944f42c1D11699marmoute
dirstate: align Rust function name to `need_delay` 
Oct 19 2021
f45d35950db6D11691SimonSapin
dirstate: rename a `very_likely_equal` method to `likely_equal` 
Oct 18 2021
cae221e8e4c5D11706spectral
merge-halt: fix issue with merge.on-failure=halt breaking unshelve 
Oct 19 2021
7b0b417cd960D11705spectral
merge-halt: demonstrate unshelve issue with merge.on-failure=halt 
Oct 19 2021
a098543ba1bcgracinet
rust-nodemap: backed out mitigation for issue 6554 
Oct 19 2021
56d037d07395D11692Alphare
backout: backed out changeset 2f2107c01dee 
Oct 19 2021
8c34edb1ad10D11693Alphare
backout: backed out changeset 6edc8800dbc3 
Oct 19 2021
b874e8d81a98D11688marmoute
dirstate-v2: preserve the fallback values on disk 
Oct 18 2021
5f8ee8157dccD11688marmoute
dirstate-v2: preserve the fallback values on disk 
Oct 18 2021
948570aa7630D11687marmoute
dirstate: make DirstateItem constructor accept fallback value 
Oct 18 2021
602c8e8411f5D11686marmoute
dirstate: add a concept of "fallback" flags to dirstate item 
Oct 18 2021
dfc5a505ddc5D11682marmoute
dirstate-v2: adds two flag to track the presence of some unrecorded files 
Oct 15 2021
1730b2fceaa1D11681SimonSapin
dirstate-v2: adds a flag to mark a file as modified 
Oct 15 2021
d24bba52407dAlphare
backout: backed out changeset 2f2107c01dee (+1 change) 
Oct 19 2021
fbda0f5b57b9Alphare
backout: backed out changeset 2f2107c01dee (+1 change) 
Oct 19 2021
8fb71d1ab953Alphare
Backed out changeset 2f2107c01dee 
Oct 19 2021
e9faae0f445cD11689aalekseyev
rhg: simplify split_metadata 
Oct 19 2021
7f23a472068fD11360Alphare
pyoxidizer: default to a meaningless release instead of hardcoding 5.8 
Aug 27 2021
c62e4397eb28D11667martinvonz
copy: recommend `--at-rev .` if target was added in parent commit 
Oct 14 2021
32b824459175D11685Alphare
rewrite: fix issue6599 
Oct 18 2021
2f7caef017d9D11683Alphare
fix: appease pyflakes and make unused variables more obvious 
Oct 18 2021
b56858d85a7bD11677marmoute
bookmarks: add a `ignore` variant of the bookmark mode 
Oct 14 2021
76c071bba40dD11676marmoute
bookmarks: add support for `mirror` mode to `incoming` 
Oct 14 2021