dirstate: remove the python-side whitelist of allowed matchers This whitelist is too permissive because it allows matchers that contain disallowed ones deep inside, for example through `intersectionmatcher`. It is also too restrictive because it doesn't pass through some of the matchers we support, such as `patternmatcher`. It's also unnecessary because unsupported matchers raise `FallbackError` and we fall back anyway. Making this change makes more of the tests use rust code path, and therefore subtly change behavior. For example, rust status in largefiles repos seems to have strange behavior.

     1

# A tool that performs a 3-way merge, resolving conflicts in sorted lists and

     2

# leaving other conflicts unchanged. This is useful with Mercurial's support

     3

# for partial merge tools (configured in `[partial-merge-tools]`).

     4

     5

[package]

     6

name = "merge-lists"

     7

version = "0.1.0"

     8

edition = "2021"

     9

# We need https://github.com/rust-lang/rust/pull/89825

    10

rust-version = "1.59"

    11

    12

[dependencies]

    13

clap = { version = "4.3.17", features = ["derive"] }

    14

itertools = "0.10.3"

    15

regex = "1.5.5"

    16

similar = { version="2.1.0", features = ["bytes"] }

    17

    18

[dev-dependencies]

    19

assert_cmd = "2.0.4"

    20

insta = "1.13.0"

    21

tempdir = "0.3.7"