Mercurial > hg
comparison hgext/transplant.py @ 30925:82f1ef8b4477
py3: convert the mode argument of os.fdopen to unicodes (2 of 2)
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 13 Feb 2017 22:15:28 +0530 |
parents | d5883fd055c6 |
children | aea06029919e |
comparison
equal
deleted
inserted
replaced
30924:48dea083f66d | 30925:82f1ef8b4477 |
---|---|
26 hg, | 26 hg, |
27 match, | 27 match, |
28 merge, | 28 merge, |
29 node as nodemod, | 29 node as nodemod, |
30 patch, | 30 patch, |
31 pycompat, | |
31 registrar, | 32 registrar, |
32 revlog, | 33 revlog, |
33 revset, | 34 revset, |
34 scmutil, | 35 scmutil, |
35 util, | 36 util, |
195 | 196 |
196 if skipmerge: | 197 if skipmerge: |
197 patchfile = None | 198 patchfile = None |
198 else: | 199 else: |
199 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') | 200 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') |
200 fp = os.fdopen(fd, 'w') | 201 fp = os.fdopen(fd, pycompat.sysstr('w')) |
201 gen = patch.diff(source, parent, node, opts=diffopts) | 202 gen = patch.diff(source, parent, node, opts=diffopts) |
202 for chunk in gen: | 203 for chunk in gen: |
203 fp.write(chunk) | 204 fp.write(chunk) |
204 fp.close() | 205 fp.close() |
205 | 206 |
243 '''arbitrarily rewrite changeset before applying it''' | 244 '''arbitrarily rewrite changeset before applying it''' |
244 | 245 |
245 self.ui.status(_('filtering %s\n') % patchfile) | 246 self.ui.status(_('filtering %s\n') % patchfile) |
246 user, date, msg = (changelog[1], changelog[2], changelog[4]) | 247 user, date, msg = (changelog[1], changelog[2], changelog[4]) |
247 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') | 248 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') |
248 fp = os.fdopen(fd, 'w') | 249 fp = os.fdopen(fd, pycompat.sysstr('w')) |
249 fp.write("# HG changeset patch\n") | 250 fp.write("# HG changeset patch\n") |
250 fp.write("# User %s\n" % user) | 251 fp.write("# User %s\n" % user) |
251 fp.write("# Date %d %d\n" % date) | 252 fp.write("# Date %d %d\n" % date) |
252 fp.write(msg + '\n') | 253 fp.write(msg + '\n') |
253 fp.close() | 254 fp.close() |