This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2265

py3: open files in bytes mode in transplant.py
ClosedPublic

Authored by pulkit on Feb 14 2018, 7:35 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa9d1ac7b91a8: py3: open files in bytes mode in transplant.py
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 14 2018, 7:35 AM
Closed by commit rHGa9d1ac7b91a8: py3: open files in bytes mode in transplant.py (authored by pulkit). · Explain WhyFeb 14 2018, 8:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (4 lines)

Diff 5705

hgext/transplant.py

nodemod.short(node))) nodemod.short(node)))
else: else:
parent = parents[0] parent = parents[0]
if skipmerge: if skipmerge:
patchfile = None patchfile = None
else: else:
fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-')
fp = os.fdopen(fd, pycompat.sysstr('w')) fp = os.fdopen(fd, pycompat.sysstr('wb'))
gen = patch.diff(source, parent, node, opts=diffopts) gen = patch.diff(source, parent, node, opts=diffopts)
for chunk in gen: for chunk in gen:
fp.write(chunk) fp.write(chunk)
fp.close() fp.close()
del revmap[rev] del revmap[rev]
if patchfile or domerge: if patchfile or domerge:
try: try:
lock.release() lock.release()
def filter(self, filter, node, changelog, patchfile): def filter(self, filter, node, changelog, patchfile):
'''arbitrarily rewrite changeset before applying it''' '''arbitrarily rewrite changeset before applying it'''
self.ui.status(_('filtering %s\n') % patchfile) self.ui.status(_('filtering %s\n') % patchfile)
user, date, msg = (changelog[1], changelog[2], changelog[4]) user, date, msg = (changelog[1], changelog[2], changelog[4])
fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-')
fp = os.fdopen(fd, pycompat.sysstr('w')) fp = os.fdopen(fd, pycompat.sysstr('wb'))
fp.write("# HG changeset patch\n") fp.write("# HG changeset patch\n")
fp.write("# User %s\n" % user) fp.write("# User %s\n" % user)
fp.write("# Date %d %d\n" % date) fp.write("# Date %d %d\n" % date)
fp.write(msg + '\n') fp.write(msg + '\n')
fp.close() fp.close()
try: try:
self.ui.system('%s %s %s' % (filter, util.shellquote(headerfile), self.ui.system('%s %s %s' % (filter, util.shellquote(headerfile),