This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10178

patch: convert a UI message to bytes when editing a patch
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:09 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5f86765c9707: patch: convert a UI message to bytes when editing a patch

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 26468

mercurial/patch.py

continue continue
if chunk.header.binary(): if chunk.header.binary():
ui.write(_(b'cannot edit patch for binary file')) ui.write(_(b'cannot edit patch for binary file'))
ui.write(b"\n") ui.write(b"\n")
continue continue
# Patch comment based on the Git one (based on comment at end of # Patch comment based on the Git one (based on comment at end of
# https://mercurial-scm.org/wiki/RecordExtension) # https://mercurial-scm.org/wiki/RecordExtension)
phelp = b'---' + _( phelp = b'---' + _(
""" b"""
To remove '-' lines, make them ' ' lines (context). To remove '-' lines, make them ' ' lines (context).
To remove '+' lines, delete them. To remove '+' lines, delete them.
Lines starting with # will be removed from the patch. Lines starting with # will be removed from the patch.
If the patch applies cleanly, the edited hunk will immediately be If the patch applies cleanly, the edited hunk will immediately be
added to the record list. If it does not apply cleanly, a rejects added to the record list. If it does not apply cleanly, a rejects
file will be generated: you can use that when you try again. If file will be generated: you can use that when you try again. If
all lines of the hunk are removed, then the edit is aborted and all lines of the hunk are removed, then the edit is aborted and