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
823e906d879dJordiGH
help: properly document the default pattern 
Feb 15 2019
791f5d5f7a96D11948pacien
hg-core: dedup LazyAncestors Iterator impl 
Dec 10 2021
35ebe6f824beD11947pacien
hg-cpython: use ancestor iterator impls from vcsgraph 
Nov 16 2021
8e8737a1fa7dD11946pacien
hg-cpython: implement vcsgraph::Graph for our Index 
Dec 10 2021
99a0b5422cf5D11945pacien
rust: add vcsgraph crate as dependency 
Dec 10 2021
59524cb1cd73D11903martinvonz
simplemerge: don't calculate conflict labels when resolving automatically 
Dec 8 2021
bd27dad294b7D11902martinvonz
simplemerge: remove now-unused `localorother` argument from `merge_lines()` 
Dec 8 2021
fb691fa90807D11901martinvonz
simplemerge: add a specialized function for "union", "local", "other" 
Dec 8 2021
47f2a82ae3e4D11943SimonSapin
rhg: Fall back to Python if verbose status is requested by config 
Dec 18 2021
262a38f10427D11942SimonSapin
rhg: Accept different "invalid ignore pattern" error message formatting 
Dec 17 2021
c9abfb80b4e3D11941SimonSapin
rhg: Properly format warnings related to ignore patterns 
Dec 17 2021
7f633432ca92D11940SimonSapin
rhg: Sub-repositories are not supported 
Nov 9 2021
5151b0f6519eD11887martinvonz
simplemerge: make `localorother` a "mode" instead of a separate thing 
Dec 7 2021
fa159bb463e6D11886martinvonz
simplemerge: avoid a call to `pycompat.strkwargs()` 
Dec 7 2021
58a3be48ddd2D11879martinvonz
simplemerge: stop merging file flags 
Dec 7 2021
608a35db186cD11885martinvonz
filemerge: stop returning always-`True` value 
Dec 8 2021
40522aea2f27D11878martinvonz
filemerge: remove unused `orig` argument from tool functions 
Dec 6 2021
ba34141f8dbbD11877martinvonz
filemerge: stop passing around 3 unused `None` values in `files` argument 
Dec 6 2021
da38519cbd10D11876martinvonz
filemerge: rename backup variables from `back` to `backup` 
Dec 6 2021
23ce9e7bf1e5D11944mharbison72
setup.py: fix some documentation typos 
Dec 18 2021
4afb9627dc77D11939SimonSapin
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too 
Dec 17 2021
c5d6c874766aD11937marmoute
rank: actually persist revision's rank in changelog-v2 
Dec 15 2021
52034c42c09dD11936marmoute
rank: add a "rank" value to the revlog-entry tuple 
Dec 14 2021
d5137c00ab17D11935marmoute
changelog-v2: fix an assertion error to display the right data 
Dec 15 2021
2c6084f67a86D11934marmoute
changelog-v2: use helper constant in the code to pack/unpack entries 
Dec 14 2021
30741bbea550D11933marmoute
revlog: add some information about the revision we cannot find 
Dec 15 2021
e293ff808a05D11932SimonSapin
rhg: Use binary search in manifest lookup 
Dec 16 2021
d3ec82016104D11938SimonSapin
rust: Upgrade to format-bytes 0.3 
Dec 17 2021
08af0adc235cD11931mharbison72
pytype: stop excluding ssutil.py 
Dec 14 2021
81805bba11f9D11930mharbison72
pytype: stop excluding wireprotoserver.py 
Dec 14 2021
12a43f857a11D11929mharbison72
pytype: stop excluding pycompat.py 
Dec 14 2021
f8540fe4be0fD11928mharbison72
procutil: avoid an uninitialized variable usage on tempfile exception 
Dec 14 2021
333a2656e981D11927mharbison72
pytype: stop excluding procutil.py 
Dec 14 2021
7caaefa48794D11926mharbison72
pytype: stop excluding chgserver.py 
Dec 14 2021
ea13dabbe168D11924mharbison72
pytype: stop excluding webcommands.py 
Dec 13 2021
8a075b679918D11923mharbison72
tests: drop an obsolete comment about a pytype failure 
Dec 13 2021
290f9c150f70D11922mharbison72
pytype: stop excluding patch.py 
Dec 13 2021
d2fff292c265D11921mharbison72
pytype: stop excluding statprof.py 
Dec 13 2021
c1fe758c1530D11920mharbison72
statprof: convert a few exception byte strings to str 
Dec 13 2021
cfb4f1dee978D11919mharbison72
pytype: stop excluding wireprotov2server.py 
Dec 13 2021
dcdecec401caD11918mharbison72
pytype: stop excluding stringutil.py 
Dec 13 2021
3444e0b39c30D11917mharbison72
pytype: stop excluding cmdutil.py 
Dec 13 2021
79b904313357D11916mharbison72
pytype: stop excluding copies.py 
Dec 13 2021
19e6446cea11D11915mharbison72
copies: fix some documentation typos 
Dec 12 2021
74b41e8b3d9cD11914mharbison72
copies: drop an unused variable 
Dec 12 2021
abac7983d28eD11913mharbison72
pytype: stop excluding lsprof.py 
Dec 12 2021
8843c9a8771bD11912mharbison72
pytype: stop excluding changegroup.py 
Dec 12 2021
a4d8de93023cD11911mharbison72
pytype: stop excluding upgrade.py 
Dec 12 2021
b005d07ded7dD11910SimonSapin
rhg: Skip reading the contents of ambiguous files in some cases 
Dec 14 2021
3eb3aef6d3bfD11909SimonSapin
rhg: Mark it as expected that the issue6528 bug is not reproduced 
Dec 14 2021