contrib: add a partial-merge tool for sorted lists (such as Python imports) This is a pretty naive tool that uses a regular expression for matching lines. It is based on a Google-internal tool that worked in a similar way. For now, the regular expression is hard-coded to attempt to match single-line Python imports. The only commit I've found in the hg core repo where the tool helped was commit 9cd6292abfdf. I think that's because we often use multiple imports per import statement. I think this tool is still a decent first step (especially once the regex is made configurable in the next patch). The merging should ideally use a proper Python parser and do the merge at the AST (or CST?) level, but that's significantly harder, especially if you want to preserve comments and whitespace. It's also less generic. Differential Revision: https://phab.mercurial-scm.org/D12380

     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 = "3.1.6", 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"