1592130 - moz-phab patch does not work on Windows/hg

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect, P2)

Description

[Miko Mynttinen]

I believe this is similar to bug 1589293.

$ moz-phab patch --apply-to here D44582
Patching revisions: D44561 D44579 D44581 D44582
Bookmark set to D44582_1
patching file gfx/angle/update-angle.py
Hunk #1 FAILED at 338
1 out of 1 hunks FAILED -- saving rejects to file gfx/angle/update-angle.py.rej
patching file gfx/angle/cherry_picks.txt
Hunk #1 FAILED at 0
Hunk #2 FAILED at 11
2 out of 2 hunks FAILED -- saving rejects to file gfx/angle/cherry_picks.txt.rej
patching file gfx/angle/MERGE_BASE
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file gfx/angle/MERGE_BASE.rej
abort: patch failed to apply
CommandError: command 'hg.exe' failed to complete successfully

I managed to manually fix this by replacing 1:

with temporary_file(diff) as patch_file, temporary_file(body) as body_file:

to

with temporary_binary_file(diff.encode("utf8")) as patch_file, temporary_file(body) as body_file:

Comment 1

[Miko Mynttinen]

Attachment: Bug 1592130 - moz-phab patch does not work on Windows/hg; r=zalun

Comment 2

[:glob ✱]

https://github.com/mozilla-conduit/review/commit/0e4e3c1685a0d019981a8f0b4a5bb199ab35bbd3