copies-rust: extract conflicting value comparison in its own function First, that logic is complicated enough to be in it own function. Second, we want to start adding alternative path within the merge code so we need this logic easily accessible in multiple places. Differential Revision: https://phab.mercurial-scm.org/D9424

mergetools: alphabetize the config settings This will make it easier to identify differences with the TortoiseHg config file. It was simply piped through `sort`, and then the spacing and comments restored into the proper place. The `UltraCompare` config was positioned such that the sort is case insensitive- it's the only camelcase config in here. Differential Revision: https://phab.mercurial-scm.org/D9620

share: properly copy cache files when cloning from a share If a is shared to b and b cloned to c, the old code would look directly under b/.hg for the cache directory and not use the cachevfs layer to pick the members from a/.hg/cache. Adjust variable names and comments to reflect that the function is used for more than just the branchmap cache. Differential Revision: https://phab.mercurial-scm.org/D9598

tests: workaround for a flaky test Differential Revision: https://phab.mercurial-scm.org/D9597

revlog: support none compression revlog files had uncompressed revlog entries support since forever, but it wasn't selectable or exposed explicitly. It is occassionally useful for performance testing as it avoids the latency of zlib or zstd. It also has the nice side effect of providing a non-default compression engine out-of-the-box. Differential Revision: https://phab.mercurial-scm.org/D9572

errors: raise InputError on recursive template definition Differential Revision: https://phab.mercurial-scm.org/D9602

errors: raise StateError when push fails because it creates new heads I decided to raise `StateError` here because the local and remote repos are in an incompatible state. I think remote errors (exit code 100) should be when something goes wrong on the remote and there's nothing the user can do. Differential Revision: https://phab.mercurial-scm.org/D9391

errors: raise InputError on early parse error in dispatch I didn't think this would have any effect on the tests, but it does because the catching in `scmutil.callcatch()` still happens. That's because `dispatch` passes in the function that includes the parsing as an argument to that function. I initially used `ConfigError` here but Matt Harbison convinced me to use `InputError`. I think that makes sense since error is not in a config file. Differential Revision: https://phab.mercurial-scm.org/D9387

errors: raise more specifc errors from narrowcommands Differential Revision: https://phab.mercurial-scm.org/D9386

errors: use detailed exit code 50 for StorageError This is done as part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. Differential Revision: https://phab.mercurial-scm.org/D9601