This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2148

py3: open temporary file in binary mode
ClosedPublic

Authored by indygreg on Feb 11 2018, 5:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa5cf79755eff: py3: open temporary file in binary mode
Summary

Otherwise things fail later when we write bytes to the handle.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 11 2018, 5:57 PM
Closed by commit rHGa5cf79755eff: py3: open temporary file in binary mode (authored by indygreg). · Explain WhyFeb 11 2018, 8:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 5433

mercurial/patch.py

diffre = re.compile(br'^(?:Index:[ \t]|diff[ \t]-|RCS file: |' diffre = re.compile(br'^(?:Index:[ \t]|diff[ \t]-|RCS file: |'
br'retrieving revision [0-9]+(\.[0-9]+)*$|' br'retrieving revision [0-9]+(\.[0-9]+)*$|'
br'---[ \t].*?^\+\+\+[ \t]|' br'---[ \t].*?^\+\+\+[ \t]|'
br'\*\*\*[ \t].*?^---[ \t])', br'\*\*\*[ \t].*?^---[ \t])',
re.MULTILINE | re.DOTALL) re.MULTILINE | re.DOTALL)
data = {} data = {}
fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
tmpfp = os.fdopen(fd, pycompat.sysstr('w')) tmpfp = os.fdopen(fd, pycompat.sysstr('wb'))
try: try:
msg = pycompat.emailparser().parse(fileobj) msg = pycompat.emailparser().parse(fileobj)
subject = msg['Subject'] and mail.headdecode(msg['Subject']) subject = msg['Subject'] and mail.headdecode(msg['Subject'])
data['user'] = msg['From'] and mail.headdecode(msg['From']) data['user'] = msg['From'] and mail.headdecode(msg['From'])
if not subject and not data['user']: if not subject and not data['user']:
# Not an email, restore parsed headers if any # Not an email, restore parsed headers if any
subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n' subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n'