This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2613

cmdutil: ensure PatchError messages are coerded to bytes, not str
ClosedPublic

Authored by durin42 on Mar 3 2018, 5:54 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2dce0049176c: cmdutil: ensure PatchError messages are coerded to bytes, not str
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 3 2018, 5:54 PM
indygreg accepted this revision.Mar 3 2018, 5:57 PM
This revision is now accepted and ready to land.Mar 3 2018, 5:57 PM
Closed by commit rHG2dce0049176c: cmdutil: ensure PatchError messages are coerded to bytes, not str (authored by durin42). · Explain WhyMar 3 2018, 6:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 6491

mercurial/cmdutil.py

branch = p1.branch() branch = p1.branch()
store = patch.filestore() store = patch.filestore()
try: try:
files = set() files = set()
try: try:
patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
files, eolmode=None) files, eolmode=None)
except error.PatchError as e: except error.PatchError as e:
raise error.Abort(str(e)) raise error.Abort(util.forcebytestr(e))
if opts.get('exact'): if opts.get('exact'):
editor = None editor = None
else: else:
editor = getcommiteditor(editform='import.bypass') editor = getcommiteditor(editform='import.bypass')
memctx = context.memctx(repo, (p1.node(), p2.node()), memctx = context.memctx(repo, (p1.node(), p2.node()),
message, message,
files=files, files=files,
filectxfn=store, filectxfn=store,