1541190 - Use `patch` backend to apply patches when `hg import`'s internal patcher fails

Status: RESOLVED FIXED

(Conduit Graveyard :: Transplant, enhancement, P2)

Description

[Steven MacLeod [:smacleod]]

Mercurial's built in patcher for hg import can have bugs and fail to apply patches that patch or git apply would successfully (See Bug Bug 1541181). We should first attempt to apply the patch using the built-in patcher but if it fails fallback to the patch utility. We can tell hg import to use patch to apply the actual patches by setting ui.patch to patch. From hg help config:

    "patch"
        An optional external tool that "hg import" and some extensions will
        use for applying patches. By default Mercurial uses an internal patch
        utility. The external tool must work as the common Unix "patch"
        program. In particular, it must accept a "-p" argument to strip patch
        headers, a "-d" argument to specify the current directory, a file name
        to patch, and a patch file to take from stdin.

        It is possible to specify a patch tool together with extra arguments.
        For example, setting this option to "patch --merge" will use the
        "patch" program with its 2-way merge option.

Comment 1

[:glob ✱]

Attachment: Bug 1541190 - update idna, and provide help on psycopg2 compiling; r=smacleod

Comment 2

[:glob ✱]

Attachment: Bug 1541190 - reformat with black and isort; r=smacleod

Depends on D29142

Comment 3

[:glob ✱]

Attachment: Bug 1541190 - add test failure files to gitignore; r=smacleod

Depends on D29143

Comment 4

[:glob ✱]

Attachment: Bug 1541190 - retry intermittent failures caused by ProtocolErrors during tests; r=smacleod

Depends on D29144

Comment 5

[:glob ✱]

Attachment: Bug 1541190 - explictly deal with database errors during submission, and gently touch http/401 handling; r=smacleod

Depends on D29145

Comment 6

[:glob ✱]

Attachment: Bug 1541190 - Use `patch` backend to apply patches when `hg import`'s internal patcher fails; r=smacleod

Depends on D29146