merge: with stable
Description
Description
Details
Details
- Committed
durin42 Jan 4 2022, 2:21 PM - Parents
- rHGb52cf5063865: heptapod-ci: make Windows jobs manual again
rHG823e906d879d: help: properly document the default pattern - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 823e906d879d | JordiGH | help: properly document the default pattern | Feb 15 2019 | |||
| 791f5d5f7a96 | D11948 | pacien | hg-core: dedup LazyAncestors Iterator impl | Dec 10 2021 | ||
| 35ebe6f824be | D11947 | pacien | hg-cpython: use ancestor iterator impls from vcsgraph | Nov 16 2021 | ||
| 8e8737a1fa7d | D11946 | pacien | hg-cpython: implement vcsgraph::Graph for our Index | Dec 10 2021 | ||
| 99a0b5422cf5 | D11945 | pacien | rust: add vcsgraph crate as dependency | Dec 10 2021 | ||
| 59524cb1cd73 | D11903 | martinvonz | simplemerge: don't calculate conflict labels when resolving automatically | Dec 8 2021 | ||
| bd27dad294b7 | D11902 | martinvonz | simplemerge: remove now-unused `localorother` argument from `merge_lines()` | Dec 8 2021 | ||
| fb691fa90807 | D11901 | martinvonz | simplemerge: add a specialized function for "union", "local", "other" | Dec 8 2021 | ||
| 47f2a82ae3e4 | D11943 | SimonSapin | rhg: Fall back to Python if verbose status is requested by config | Dec 18 2021 | ||
| 262a38f10427 | D11942 | SimonSapin | rhg: Accept different "invalid ignore pattern" error message formatting | Dec 17 2021 | ||
| c9abfb80b4e3 | D11941 | SimonSapin | rhg: Properly format warnings related to ignore patterns | Dec 17 2021 | ||
| 7f633432ca92 | D11940 | SimonSapin | rhg: Sub-repositories are not supported | Nov 9 2021 | ||
| 5151b0f6519e | D11887 | martinvonz | simplemerge: make `localorother` a "mode" instead of a separate thing | Dec 7 2021 | ||
| fa159bb463e6 | D11886 | martinvonz | simplemerge: avoid a call to `pycompat.strkwargs()` | Dec 7 2021 | ||
| 58a3be48ddd2 | D11879 | martinvonz | simplemerge: stop merging file flags | Dec 7 2021 | ||
| 608a35db186c | D11885 | martinvonz | filemerge: stop returning always-`True` value | Dec 8 2021 | ||
| 40522aea2f27 | D11878 | martinvonz | filemerge: remove unused `orig` argument from tool functions | Dec 6 2021 | ||
| ba34141f8dbb | D11877 | martinvonz | filemerge: stop passing around 3 unused `None` values in `files` argument | Dec 6 2021 | ||
| da38519cbd10 | D11876 | martinvonz | filemerge: rename backup variables from `back` to `backup` | Dec 6 2021 | ||
| 23ce9e7bf1e5 | D11944 | mharbison72 | setup.py: fix some documentation typos | Dec 18 2021 | ||
| 4afb9627dc77 | D11939 | SimonSapin | dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too | Dec 17 2021 | ||
| c5d6c874766a | D11937 | marmoute | rank: actually persist revision's rank in changelog-v2 | Dec 15 2021 | ||
| 52034c42c09d | D11936 | marmoute | rank: add a "rank" value to the revlog-entry tuple | Dec 14 2021 | ||
| d5137c00ab17 | D11935 | marmoute | changelog-v2: fix an assertion error to display the right data | Dec 15 2021 | ||
| 2c6084f67a86 | D11934 | marmoute | changelog-v2: use helper constant in the code to pack/unpack entries | Dec 14 2021 | ||
| 30741bbea550 | D11933 | marmoute | revlog: add some information about the revision we cannot find | Dec 15 2021 | ||
| e293ff808a05 | D11932 | SimonSapin | rhg: Use binary search in manifest lookup | Dec 16 2021 | ||
| d3ec82016104 | D11938 | SimonSapin | rust: Upgrade to format-bytes 0.3 | Dec 17 2021 | ||
| 08af0adc235c | D11931 | mharbison72 | pytype: stop excluding ssutil.py | Dec 14 2021 | ||
| 81805bba11f9 | D11930 | mharbison72 | pytype: stop excluding wireprotoserver.py | Dec 14 2021 | ||
| 12a43f857a11 | D11929 | mharbison72 | pytype: stop excluding pycompat.py | Dec 14 2021 | ||
| f8540fe4be0f | D11928 | mharbison72 | procutil: avoid an uninitialized variable usage on tempfile exception | Dec 14 2021 | ||
| 333a2656e981 | D11927 | mharbison72 | pytype: stop excluding procutil.py | Dec 14 2021 | ||
| 7caaefa48794 | D11926 | mharbison72 | pytype: stop excluding chgserver.py | Dec 14 2021 | ||
| ea13dabbe168 | D11924 | mharbison72 | pytype: stop excluding webcommands.py | Dec 13 2021 | ||
| 8a075b679918 | D11923 | mharbison72 | tests: drop an obsolete comment about a pytype failure | Dec 13 2021 | ||
| 290f9c150f70 | D11922 | mharbison72 | pytype: stop excluding patch.py | Dec 13 2021 | ||
| d2fff292c265 | D11921 | mharbison72 | pytype: stop excluding statprof.py | Dec 13 2021 | ||
| c1fe758c1530 | D11920 | mharbison72 | statprof: convert a few exception byte strings to str | Dec 13 2021 | ||
| cfb4f1dee978 | D11919 | mharbison72 | pytype: stop excluding wireprotov2server.py | Dec 13 2021 | ||
| dcdecec401ca | D11918 | mharbison72 | pytype: stop excluding stringutil.py | Dec 13 2021 | ||
| 3444e0b39c30 | D11917 | mharbison72 | pytype: stop excluding cmdutil.py | Dec 13 2021 | ||
| 79b904313357 | D11916 | mharbison72 | pytype: stop excluding copies.py | Dec 13 2021 | ||
| 19e6446cea11 | D11915 | mharbison72 | copies: fix some documentation typos | Dec 12 2021 | ||
| 74b41e8b3d9c | D11914 | mharbison72 | copies: drop an unused variable | Dec 12 2021 | ||
| abac7983d28e | D11913 | mharbison72 | pytype: stop excluding lsprof.py | Dec 12 2021 | ||
| 8843c9a8771b | D11912 | mharbison72 | pytype: stop excluding changegroup.py | Dec 12 2021 | ||
| a4d8de93023c | D11911 | mharbison72 | pytype: stop excluding upgrade.py | Dec 12 2021 | ||
| b005d07ded7d | D11910 | SimonSapin | rhg: Skip reading the contents of ambiguous files in some cases | Dec 14 2021 | ||
| 3eb3aef6d3bf | D11909 | SimonSapin | rhg: Mark it as expected that the issue6528 bug is not reproduced | Dec 14 2021 |