merge: with stable
Description
Description
Details
Details
- Committed
durin42 Oct 26 2021, 10:23 AM - Parents
- rHG6ca72719b60b: Added signature for changeset 6ee0244fc1cf
rHG9de0823705b4: typing: add more type hints to the errors module - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 9de0823705b4 | D11719 | mharbison72 | typing: add more type hints to the errors module | Oct 23 | ||
| ebac18733142 | D11718 | mharbison72 | typing: add a few assertions to revlog.py to help pytype | Oct 23 | ||
| 0d6a099bba58 | D11715 | Alphare | dirstate: group return logic and clarify each function in flagfunc | Oct 21 | ||
| 8f54d9c79b12 | D11713 | Alphare | dirstate: add missing return on platforms without exec or symlink | Oct 20 | ||
| 126feb805247 | D11712 | Alphare | parsers: don't ask about symlinks on platforms that don't support them | Oct 20 | ||
| 249d1888e9d8 | D11711 | Alphare | parsers: don't ask about the exec bit on platforms that don't have it | Oct 20 | ||
| fd3d4b7f8e62 | D11714 | spectral | tests: fix test-convert-git to work w/ "git pull" requiring strategy | Oct 19 | ||
| 96aa3a68d3b5 | Alphare | branching: merge stable into default | Oct 21 | |||
| d86908050375 | markand | hg: remove reserved identifiers | Oct 21 | |||
| cc9acd2c6fd0 | D11690 | Alphare | python: compatibility for python 3.11 (issue6604) | Oct 19 | ||
| e95fd116c968 | D11710 | Alphare | pyoxidizer: force pip to not use pep517 in order to be able to install hg | Oct 20 | ||
| f2694f9d90dc | D11710 | Alphare | pyoxidizer: force pip to not use pep517 in order to still be able to install hg | Oct 20 | ||
| 16c3fe46929a | D11698 | spectral | pyoxidizer: update README.md with several small fixes | Oct 18 | ||
| c900d962e38b | D11697 | spectral | pyoxidizer: disable using in-memory resources | Oct 18 | ||
| 749946b6a641 | D11704 | marmoute | dirstate-v2: reorder flag to group related one together | Oct 19 | ||
| 3861e3f6ad54 | D11695 | marmoute | dirstate-v2: read the fallback value in Rust | Oct 19 | ||
| bb240915f69f | D11694 | marmoute | dirstate-v2: adjust the meaning of directory flags | Oct 19 | ||
| 83d0bd45b662 | D11702 | SimonSapin | dirstate-v2: actually use sub-second mtime precision | Oct 13 | ||
| 68bb472aee9c | D11701 | SimonSapin | dirstate: ignore sub-second component when either is zero in mtime | Oct 14 | ||
| 9205d9be8b41 | D11700 | marmoute | dirstate-v2: add a new MTIME_SECOND_AMBIGUOUS flags | Oct 19 | ||
| 269ff8978086 | D11684 | SimonSapin | dirstate: store mtimes with nanosecond precision in memory | Oct 18 | ||
| 84f6b0c41b90 | D11696 | SimonSapin | rust: remove now-unused DirstateEntry::clear_ambiguous_mtime method | Oct 19 | ||
| c591944f42c1 | D11699 | marmoute | dirstate: align Rust function name to `need_delay` | Oct 19 | ||
| f45d35950db6 | D11691 | SimonSapin | dirstate: rename a `very_likely_equal` method to `likely_equal` | Oct 18 | ||
| cae221e8e4c5 | D11706 | spectral | merge-halt: fix issue with merge.on-failure=halt breaking unshelve | Oct 19 | ||
| 7b0b417cd960 | D11705 | spectral | merge-halt: demonstrate unshelve issue with merge.on-failure=halt | Oct 19 | ||
| a098543ba1bc | gracinet | rust-nodemap: backed out mitigation for issue 6554 | Oct 19 | |||
| 56d037d07395 | D11692 | Alphare | backout: backed out changeset 2f2107c01dee | Oct 19 | ||
| 8c34edb1ad10 | D11693 | Alphare | backout: backed out changeset 6edc8800dbc3 | Oct 19 | ||
| b874e8d81a98 | D11688 | marmoute | dirstate-v2: preserve the fallback values on disk | Oct 18 | ||
| 5f8ee8157dcc | D11688 | marmoute | dirstate-v2: preserve the fallback values on disk | Oct 18 | ||
| 948570aa7630 | D11687 | marmoute | dirstate: make DirstateItem constructor accept fallback value | Oct 18 | ||
| 602c8e8411f5 | D11686 | marmoute | dirstate: add a concept of "fallback" flags to dirstate item | Oct 18 | ||
| dfc5a505ddc5 | D11682 | marmoute | dirstate-v2: adds two flag to track the presence of some unrecorded files | Oct 15 | ||
| 1730b2fceaa1 | D11681 | SimonSapin | dirstate-v2: adds a flag to mark a file as modified | Oct 15 | ||
| d24bba52407d | Alphare | backout: backed out changeset 2f2107c01dee (+1 change) | Oct 19 | |||
| fbda0f5b57b9 | Alphare | backout: backed out changeset 2f2107c01dee (+1 change) | Oct 19 | |||
| 8fb71d1ab953 | Alphare | Backed out changeset 2f2107c01dee | Oct 19 | |||
| e9faae0f445c | D11689 | aalekseyev | rhg: simplify split_metadata | Oct 19 | ||
| 7f23a472068f | D11360 | Alphare | pyoxidizer: default to a meaningless release instead of hardcoding 5.8 | Aug 27 | ||
| c62e4397eb28 | D11667 | martinvonz | copy: recommend `--at-rev .` if target was added in parent commit | Oct 14 | ||
| 32b824459175 | D11685 | Alphare | rewrite: fix issue6599 | Oct 18 | ||
| 2f7caef017d9 | D11683 | Alphare | fix: appease pyflakes and make unused variables more obvious | Oct 18 | ||
| b56858d85a7b | D11677 | marmoute | bookmarks: add a `ignore` variant of the bookmark mode | Oct 14 | ||
| 76c071bba40d | D11676 | marmoute | bookmarks: add support for `mirror` mode to `incoming` | Oct 14 | ||
| 4d2ab365699e | D11675 | marmoute | bookmarks: move the `mirror` option to the `paths` section | Oct 14 | ||
| 7d1e60244561 | D11674 | marmoute | path: keep the path instance in the `pulloperation` | Oct 14 | ||
| 607e9322fc89 | D11673 | marmoute | path: return path instance directly from get_pull_paths | Oct 14 | ||
| 08630dd719f9 | D11672 | marmoute | path: unify path creation in `get_pull_paths` | Oct 14 | ||
| ea50caada82d | D11671 | marmoute | path: add a new argument to control path validation | Oct 14 |