diff: suppress `merging foo` output lines when performing a merge diff Differential Revision: https://phab.mercurial-scm.org/D9939

diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

rust: use HgError in ConfigError Differential Revision: https://phab.mercurial-scm.org/D9938

rust: Fold find_root and check_requirements into Repo::find Differential Revision: https://phab.mercurial-scm.org/D9906

rhg: Simplify CommandError based on its use Differential Revision: https://phab.mercurial-scm.org/D9905

rust: replace ToString impls with Display ToString is automatically implementing for everything that implements Display, and Display can avoid allocating intermediate strings. Differential Revision: https://phab.mercurial-scm.org/D9904

rust: use HgError in RevlogError and Vfs Differential Revision: https://phab.mercurial-scm.org/D9897

rust: replace RequirementsError with HgError Differential Revision: https://phab.mercurial-scm.org/D9896

rhg: Print an error message in more cases Differential Revision: https://phab.mercurial-scm.org/D9895

rust: Remove DirstateParseError and ListDirstateTrackedFilesError Use HgError instead. Differential Revision: https://phab.mercurial-scm.org/D9894

rust: Replace DirstatePackError with HgError Differential Revision: https://phab.mercurial-scm.org/D9893

rust: Introduce an `HgError` enum for common error cases Differential Revision: https://phab.mercurial-scm.org/D9892

rust: remove three enums that were identical to `RevlogError` Differential Revision: https://phab.mercurial-scm.org/D9877

rhg: replace `map_*_error` functions with `From` impls Differential Revision: https://phab.mercurial-scm.org/D9876

rust: replace trivial `impl From …` with `#[derive(derive_more::From)]` Crate docs: https://jeltef.github.io/derive_more/derive_more/from.html Differential Revision: https://phab.mercurial-scm.org/D9875

rust: remove `FooError` structs with only `kind: FooErrorKind` enum field Use the enum directly as `FooError` instead. Differential Revision: https://phab.mercurial-scm.org/D9874

rhg: centralize parsing of `--rev` CLI arguments This new module will be the place to implement more of the revset language when we do so. Differential Revision: https://phab.mercurial-scm.org/D9873

rust: Remove hex parsing from the nodemap Separating concerns simplifies error types. Differential Revision: https://phab.mercurial-scm.org/D9864

rust: Make NodePrefix allocation-free and Copy, remove NodePrefixRef The `*Ref` struct only existed to avoid allocating `Vec`s when cloning `NodePrefix`, but we can avoid having `Vec` in the first place by using an inline array instead. This makes `NodePrefix` 21 bytes (with 1 for the length) which is smaller than before as `Vec` alone is 24 bytes. Differential Revision: https://phab.mercurial-scm.org/D9863

churn: count lines that look like diff headers but are not Previously, churn cannot count added lines that start with "++ " or removed lines that start with "-- ". Differential Revision: https://phab.mercurial-scm.org/D9929

rust: Exclude empty node prefixes We presumably don’t want `--rev ""` to select every single revision, even though the empty string is a prefix of all strings. Differential Revision: https://phab.mercurial-scm.org/D9862

rust: Simplify error type for reading hex node IDs If a string is not valid hexadecimal it’s not that useful to track the precise reason. Differential Revision: https://phab.mercurial-scm.org/D9861

rust: replace Node::encode_hex with std::fmt::LowerHex This avoids allocating intermediate strings. Differential Revision: https://phab.mercurial-scm.org/D9860

rhg: Build in release mode on CI This follows e73b40c790ec which made tests use the release executable. With e73b40c790ec but not this, tests are skipped on CI because the executable is missing. Differential Revision: https://phab.mercurial-scm.org/D9907

config: use the right API to access git-submodule Differential Revision: https://phab.mercurial-scm.org/D9923

config: use the right API to access template access Preventing direct access to the underlying dict will help a coming refactoring of `config`. Differential Revision: https://phab.mercurial-scm.org/D9922

config: use the right API to access subrepository section Preventing direct access to the underlying dict will help a coming refactoring of `config`. Differential Revision: https://phab.mercurial-scm.org/D9921

config: test priority involving the command line Differential Revision: https://phab.mercurial-scm.org/D9917

config: test priority involving include Differential Revision: https://phab.mercurial-scm.org/D9916

config: add a test for priority when includes are involved Differential Revision: https://phab.mercurial-scm.org/D9915

errors: use InputError for incorrectly formatted dates Differential Revision: https://phab.mercurial-scm.org/D9913

errors: use StateError more in merge module Differential Revision: https://phab.mercurial-scm.org/D9912