Mercurial > hg
comparison hgext/transplant.py @ 36835:5bc7ff103081
py3: use r'' instead of sysstr('') to get around code transformer
Fewer function calls should be better.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 10 Mar 2018 15:57:16 +0900 |
| parents | 7b74afec6772 |
| children | f0b6fbea00cf |
comparison
equal
deleted
inserted
replaced
| 36834:1527f40de3b3 | 36835:5bc7ff103081 |
|---|---|
| 210 | 210 |
| 211 if skipmerge: | 211 if skipmerge: |
| 212 patchfile = None | 212 patchfile = None |
| 213 else: | 213 else: |
| 214 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') | 214 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') |
| 215 fp = os.fdopen(fd, pycompat.sysstr('wb')) | 215 fp = os.fdopen(fd, r'wb') |
| 216 gen = patch.diff(source, parent, node, opts=diffopts) | 216 gen = patch.diff(source, parent, node, opts=diffopts) |
| 217 for chunk in gen: | 217 for chunk in gen: |
| 218 fp.write(chunk) | 218 fp.write(chunk) |
| 219 fp.close() | 219 fp.close() |
| 220 | 220 |
| 258 '''arbitrarily rewrite changeset before applying it''' | 258 '''arbitrarily rewrite changeset before applying it''' |
| 259 | 259 |
| 260 self.ui.status(_('filtering %s\n') % patchfile) | 260 self.ui.status(_('filtering %s\n') % patchfile) |
| 261 user, date, msg = (changelog[1], changelog[2], changelog[4]) | 261 user, date, msg = (changelog[1], changelog[2], changelog[4]) |
| 262 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') | 262 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') |
| 263 fp = os.fdopen(fd, pycompat.sysstr('wb')) | 263 fp = os.fdopen(fd, r'wb') |
| 264 fp.write("# HG changeset patch\n") | 264 fp.write("# HG changeset patch\n") |
| 265 fp.write("# User %s\n" % user) | 265 fp.write("# User %s\n" % user) |
| 266 fp.write("# Date %d %d\n" % date) | 266 fp.write("# Date %d %d\n" % date) |
| 267 fp.write(msg + '\n') | 267 fp.write(msg + '\n') |
| 268 fp.close() | 268 fp.close() |